Branch: Tag:

2000-12-05

2000-12-05 21:08:57 by Per Hedbor <ph@opera.com>

Pike_error -> error fixes.

Rev: .how_to_build_from_scratch:1.7
Rev: src/backend.c:1.62
Rev: src/block_alloc.h:1.27
Rev: src/builtin_functions.c:1.319
Rev: src/cpp.c:1.79
Rev: src/docode.c:1.89
Rev: src/dynamic_load.c:1.48
Rev: src/encode.c:1.79
Rev: src/error.c:1.67
Rev: src/fd_control.c:1.35
Rev: src/interpret.c:1.178
Rev: src/interpret_functions.h:1.35
Rev: src/interpreter.h:1.53
Rev: src/las.c:1.229
Rev: src/lexer.h:1.26
Rev: src/modules/Gz/gz_test.c:1.5
Rev: src/modules/HTTPLoop/accept_and_parse.c:1.22
Rev: src/modules/Image/colors.c:1.42
Rev: src/modules/Image/colortable.c:1.102
Rev: src/modules/Image/colortable.h:1.24
Rev: src/modules/Image/encodings/_xpm.c:1.16
Rev: src/modules/Image/encodings/pcx.c:1.15
Rev: src/modules/Image/encodings/png.c:1.41
Rev: src/modules/Image/encodings/psd.c:1.27
Rev: src/modules/Image/encodings/tga.c:1.26
Rev: src/modules/Image/encodings/xbm.c:1.13
Rev: src/modules/Image/encodings/xcf.c:1.35
Rev: src/modules/Image/image.c:1.184
Rev: src/modules/Image/image.h:1.46
Rev: src/modules/Image/layers.c:1.59
Rev: src/modules/Image/match.h:1.12
Rev: src/modules/Image/operator.c:1.35
Rev: src/modules/Image/poly.c:1.12
Rev: src/modules/Java/jvm.c:1.31
Rev: src/modules/Math/math_matrix.c:1.20
Rev: src/modules/Msql/msqlmod.c:1.16
Rev: src/modules/Mysql/mysql.c:1.39
Rev: src/modules/Mysql/precompiled_mysql.h:1.11
Rev: src/modules/Mysql/result.c:1.18
Rev: src/modules/Odbc/odbc.c:1.24
Rev: src/modules/Oracle/oracle.c:1.52
Rev: src/modules/Perl/perlmod.c:1.23
Rev: src/modules/Pipe/pipe.c:1.45
Rev: src/modules/Postgres/postgres.c:1.21
Rev: src/modules/Yp/yp.c:1.21
Rev: src/modules/_Charset/charsetmod.c:1.26
Rev: src/modules/_Crypto/crypto.c:1.41
Rev: src/modules/_Crypto/des.c:1.19
Rev: src/modules/_Image_GIF/image_gif.c:1.3
Rev: src/modules/_Image_JPEG/image_jpeg.c:1.37
Rev: src/modules/_Image_TIFF/image_tiff.c:1.23
Rev: src/modules/_Image_TTF/image_ttf.c:1.38
Rev: src/modules/_math/math.c:1.35
Rev: src/modules/files/efuns.c:1.89
Rev: src/modules/files/file.c:1.205
Rev: src/modules/files/sendfile.c:1.53
Rev: src/modules/files/termios.c:1.11
Rev: src/modules/files/udp.c:1.19
Rev: src/modules/spider/xml.c:1.30
Rev: src/modules/sybase/sybase.c:1.6
Rev: src/modules/sybase/sybase.h:1.3
Rev: src/modules/system/nt.c:1.29
Rev: src/modules/system/system.c:1.95
Rev: src/object.c:1.155
Rev: src/opcodes.c:1.96
Rev: src/peep.c:1.45
Rev: src/pike_error.h:1.4
Rev: src/pike_types.c:1.145
Rev: src/port.c:1.35
Rev: src/post_modules/GL/auto.c.in:1.17
Rev: src/post_modules/GTK/build_pgtk.pike:1.38
Rev: src/post_modules/GTK/dependencies:1.6
Rev: src/post_modules/GTK/pgtk.h:1.19
Rev: src/post_modules/GTK/source/gdkbitmap.pre:1.8
Rev: src/post_modules/GTK/source/gdkcolor.pre:1.8
Rev: src/post_modules/GTK/source/gdkdragcontext.pre:1.8
Rev: src/post_modules/GTK/source/gdkevent.pre:1.5
Rev: src/post_modules/GTK/source/gdkfont.pre:1.7
Rev: src/post_modules/GTK/source/gdkimage.pre:1.9
Rev: src/post_modules/GTK/source/gdkpixmap.pre:1.10
Rev: src/post_modules/GTK/source/gdkrectangle.pre:1.7
Rev: src/post_modules/GTK/source/gdkregion.pre:1.8
Rev: src/post_modules/GTK/source/gdkwindow.pre:1.14
Rev: src/post_modules/GTK/source/gladexml.pre:1.10
Rev: src/post_modules/GTK/source/global.pre:1.17
Rev: src/post_modules/GTK/source/gnomeapp.pre:1.9
Rev: src/post_modules/GTK/source/gnomedialog.pre:1.6
Rev: src/post_modules/GTK/source/gnomemessagebox.pre:1.5
Rev: src/post_modules/GTK/source/gtkadjustment.pre:1.7
Rev: src/post_modules/GTK/source/gtkcalendar.pre:1.5
Rev: src/post_modules/GTK/source/gtkclist.pre:1.9
Rev: src/post_modules/GTK/source/gtkcombo.pre:1.5
Rev: src/post_modules/GTK/source/gtkctree.pre:1.7
Rev: src/post_modules/GTK/source/gtkdatabox.pre:1.3
Rev: src/post_modules/GTK/source/gtkobject.pre:1.6
Rev: src/post_modules/GTK/source/gtkpixmap.pre:1.7
Rev: src/post_modules/GTK/source/gtksocket.pre:1.8
Rev: src/post_modules/GTK/source/gtkwidget.pre:1.12
Rev: src/post_modules/GTK/source/support.c:1.20
Rev: src/preprocessor.h:1.36
Rev: src/program.c:1.286
Rev: src/signal_handler.c:1.186
Rev: src/smartlink.c:1.12
Rev: src/stralloc.c:1.112
Rev: src/svalue.h:1.72
Rev: src/threads.c:1.149
Rev: src/threads.h:1.108

25:   #include "version.h"   #include "bignum.h"    - RCSID("$Id: encode.c,v 1.78 2000/12/01 08:09:46 hubbe Exp $"); + RCSID("$Id: encode.c,v 1.79 2000/12/05 21:08:17 per Exp $");      /* #define ENCODE_DEBUG */   
271:    switch(EXTRACT_UCHAR(t++))    {    default: -  fatal("Pike_error in type string.\n"); +  fatal("error in type string.\n");    /*NOTREACHED*/       break;
797:   static int my_extract_char(struct decode_data *data)   {    if(data->ptr >= data->len) -  Pike_error("Format Pike_error, not enough data in string.\n"); +  Pike_error("Format error, not enough data in string.\n");    return data->data [ data->ptr++ ];   }   
847:      #define getdata2(S,L) do { \    if(data->ptr + (ptrdiff_t)(sizeof(S[0])*(L)) > data->len) \ -  Pike_error("Failed to decode string. (string range Pike_error)\n"); \ +  Pike_error("Failed to decode string. (string range error)\n"); \    MEMCPY((S),(data->data + data->ptr), sizeof(S[0])*(L)); \    data->ptr+=sizeof(S[0])*(L); \    }while(0)
870:    DECODE("get_string_data"); \    what &= TAG_MASK; \    if(data->ptr + num > data->len || num <0) \ -  Pike_error("Failed to decode string. (string range Pike_error)\n"); \ +  Pike_error("Failed to decode string. (string range error)\n"); \    if(what<0 || what>2) \    Pike_error("Failed to decode string. (Illegal size shift)\n"); \    STR=begin_wide_shared_string(num, what); \
880:    STR=end_shared_string(STR); \    }else{ \    if(data->ptr + (LEN) > data->len || (LEN) <0) \ -  Pike_error("Failed to decode string. (string range Pike_error)\n"); \ +  Pike_error("Failed to decode string. (string range error)\n"); \    STR=make_shared_binary_string((char *)(data->data + data->ptr), (LEN)); \    data->ptr+=(LEN); \    } \
963:    switch(tmp)    {    default: -  fatal("Pike_error in type string.\n"); +  fatal("error in type string.\n");    /*NOTREACHED*/    break;   
1358:    data->counter.u.integer++;    decode_value2(data);    -  /* Keep the value so that we can make a good Pike_error-message. */ +  /* Keep the value so that we can make a good error-message. */    prog_code = Pike_sp-1;    stack_dup();   
1410:    decode_value2(data);    f_version(0);    if(!is_eq(Pike_sp-1,Pike_sp-2)) -  Pike_error("Cannot decode programs encoded with other driver version.\n"); +  Pike_error("Cannot decode programs encoded with other pike version.\n");    pop_n_elems(2);       decode_number(p->flags,data);
1668:      static unsigned char extract_char(char **v, ptrdiff_t *l)   { -  if(!*l) Pike_error("Format Pike_error, not enough place for char.\n"); +  if(!*l) Pike_error("Format error, not enough place for char.\n");    else (*l)--;    (*v)++;    return ((unsigned char *)(*v))[-1];
1683:    if(j & 0x80) return (j & 0x7f);       if((j & ~8) > 4) -  Pike_error("Format Error: Error in format string, invalid integer.\n"); +  Pike_error("Format error: Error in format string, invalid integer.\n");    i=0;    while(j & 7) { i=(i<<8) | extract_char(v,l); j--; }    if(j & 8) return -i;
1710:    return;       case TAG_TYPE: -  Pike_error("Format Pike_error:decoding of the type type not supported yet.\n"); +  Pike_error("Format error: decoding of the type type not supported yet.\n");    return;       case TAG_STRING: -  if(t<0) Pike_error("Format Pike_error, length of string is negative.\n"); -  if(*l < t) Pike_error("Format Pike_error, string to short\n"); +  if(t<0) Pike_error("Format error: length of string is negative.\n"); +  if(*l < t) Pike_error("Format error: string to short\n");    push_string(make_shared_binary_string(*v, t));    (*l)-= t;    (*v)+= t;    return;       case TAG_ARRAY: -  if(t<0) Pike_error("Format Pike_error, length of array is negative.\n"); +  if(t<0) Pike_error("Format error: length of array is negative.\n");    check_stack(t);    for(i=0;i<t;i++) rec_restore_value(v,l);    f_aggregate(DO_NOT_WARN(t));    return;       case TAG_MULTISET: -  if(t<0) Pike_error("Format Pike_error, length of multiset is negative.\n"); +  if(t<0) Pike_error("Format error: length of multiset is negative.\n");    check_stack(t);    for(i=0;i<t;i++) rec_restore_value(v,l);    f_aggregate_multiset(DO_NOT_WARN(t));    return;       case TAG_MAPPING: -  if(t<0) Pike_error("Format Pike_error, length of mapping is negative.\n"); +  if(t<0) Pike_error("Format error: length of mapping is negative.\n");    check_stack(t*2);    for(i=0;i<t;i++)    {
1747:    return;       case TAG_OBJECT: -  if(t<0) Pike_error("Format Pike_error, length of object is negative.\n"); -  if(*l < t) Pike_error("Format Pike_error, string to short\n"); +  if(t<0) Pike_error("Format error: length of object is negative.\n"); +  if(*l < t) Pike_error("Format error: string to short\n");    push_string(make_shared_binary_string(*v, t));    (*l) -= t; (*v) += t;    APPLY_MASTER("objectof", 1);    return;       case TAG_FUNCTION: -  if(t<0) Pike_error("Format Pike_error, length of function is negative.\n"); -  if(*l < t) Pike_error("Format Pike_error, string to short\n"); +  if(t<0) Pike_error("Format error: length of function is negative.\n"); +  if(*l < t) Pike_error("Format error: string to short\n");    push_string(make_shared_binary_string(*v, t));    (*l) -= t; (*v) += t;    APPLY_MASTER("functionof", 1);    return;       case TAG_PROGRAM: -  if(t<0) Pike_error("Format Pike_error, length of program is negative.\n"); -  if(*l < t) Pike_error("Format Pike_error, string to short\n"); +  if(t<0) Pike_error("Format error: length of program is negative.\n"); +  if(*l < t) Pike_error("Format error: string to short\n");    push_string(make_shared_binary_string(*v, t));    (*l) -= t; (*v) += t;    APPLY_MASTER("programof", 1);    return;       default: -  Pike_error("Format Pike_error. Unknown type tag %ld:%ld\n", +  Pike_error("Format error: Unknown type tag %ld:%ld\n",    PTRDIFF_T_TO_LONG(i), PTRDIFF_T_TO_LONG(t));    }   }