pike.git/ src/ stralloc.c

2000-02-03

2000-02-03 19:09:13 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 01a9575f1f4c3d3b365d9519757690064ab5fc1e (23 lines) (+12/-11) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed lots of warnings.

Rev: src/builtin_functions.c:1.235
Rev: src/cpp.c:1.59
Rev: src/dynamic_load.c:1.37
Rev: src/las.c:1.160
Rev: src/lexer.h:1.15
Rev: src/modules/Image/colors.c:1.30
Rev: src/modules/Image/default_font.c:1.2
Rev: src/modules/Image/encodings/avs.c:1.8
Rev: src/modules/Image/encodings/iff.c:1.4
Rev: src/modules/Image/encodings/ilbm.c:1.13
Rev: src/modules/Image/encodings/pcx.c:1.9
Rev: src/modules/Image/encodings/psd.c:1.14
Rev: src/modules/Image/encodings/ras.c:1.5
Rev: src/modules/Image/encodings/tga.c:1.9
Rev: src/modules/Image/encodings/wbf.c:1.4
Rev: src/modules/Image/encodings/xcf.c:1.12
Rev: src/modules/Image/image.c:1.158
Rev: src/modules/Image/layers.c:1.41
Rev: src/modules/_Charset/charsetmod.c:1.18
Rev: src/modules/_Crypto/rsa.c:1.10
Rev: src/modules/files/file.h:1.15
Rev: src/modules/files/file_functions.h:1.15
Rev: src/modules/files/socket.c:1.47
Rev: src/modules/spider/xml.c:1.16
Rev: src/operators.c:1.85
Rev: src/pike_memory.c:1.52
Rev: src/pike_types.c:1.121
Rev: src/preprocessor.h:1.17
Rev: src/stralloc.c:1.78
Rev: src/svalue.c:1.62

25:   #define HUGE HUGE_VAL   #endif /*!HUGE*/    - RCSID("$Id: stralloc.c,v 1.77 1999/11/24 13:53:44 noring Exp $"); + RCSID("$Id: stralloc.c,v 1.78 2000/02/03 19:09:13 grubba Exp $");      #define BEGIN_HASH_SIZE 997   #define MAX_AVG_LINK_LENGTH 3
588:    switch(str.shift)    {    case 0: -  return make_shared_binary_string((p_wchar0 *)(str.ptr), len); +  return make_shared_binary_string((char *)(str.ptr), len);    case 1:    return make_shared_binary_string1((p_wchar1 *)(str.ptr), len);    case 2:
1188:    {    case TWO_SIZES(1,0):    b=begin_wide_shared_string(a->len,1); -  convert_0_to_1(STR1(b),a->str,a->len); +  convert_0_to_1(STR1(b),(p_wchar0 *)a->str,a->len);    STR1(b)[index]=c;    free_string(a);    return end_shared_string(b);       case TWO_SIZES(2,0):    b=begin_wide_shared_string(a->len,2); -  convert_0_to_2(STR2(b),a->str,a->len); +  convert_0_to_2(STR2(b),(p_wchar0 *)a->str,a->len);    STR2(b)[index]=c;    free_string(a);    return end_shared_string(b);
1237:    break;       b=begin_shared_string(a->len); -  convert_1_to_0(b->str,STR1(a),a->len); +  convert_1_to_0((p_wchar0 *)b->str,STR1(a),a->len);    b->str[index]=c;    free_string(a);    return end_shared_string(b);
1254:    {    case 0:    b=begin_shared_string(a->len); -  convert_2_to_0(b->str,STR2(a),a->len); +  convert_2_to_0((p_wchar0 *)b->str,STR2(a),a->len);    b->str[index]=c;    free_string(a);    return end_shared_string(b);       case 1:    b=begin_wide_shared_string(a->len,1); -  convert_2_to_1((unsigned INT16 *)b->str,STR2(a),a->len); +  convert_2_to_1((p_wchar1 *)b->str,STR2(a),a->len);    STR1(b)[index]=c;    free_string(a);    return end_shared_string(b);
1377:    switch(s->size_shift)    {    case 0: -  return make_shared_binary_string(STR0(s)+start,len); +  return make_shared_binary_string((char *)STR0(s)+start,len);       case 1:    return make_shared_binary_string1(STR1(s)+start,len);
1636:    string_build_mkspace(s,len,0);    switch(s->s->size_shift)    { -  case 0: convert_0_to_0(STR0(s->s)+s->s->len,str,len); break; -  case 1: convert_0_to_1(STR1(s->s)+s->s->len,str,len); break; -  case 2: convert_0_to_2(STR2(s->s)+s->s->len,str,len); break; +  case 0: convert_0_to_0(STR0(s->s)+s->s->len,(p_wchar0 *)str,len); break; +  case 1: convert_0_to_1(STR1(s->s)+s->s->len,(p_wchar0 *)str,len); break; +  case 2: convert_0_to_2(STR2(s->s)+s->s->len,(p_wchar0 *)str,len); break;    default:    fatal("Illegal magnitude!\n");    }