Branch: Tag:

2000-12-01

2000-12-01 08:10:41 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

renamed error (and error.h) to Pike_error

Rev: src/array.c:1.97
Rev: src/backend.c:1.61
Rev: src/bignum.c:1.19
Rev: src/block_alloc.h:1.26
Rev: src/builtin_functions.c:1.318
Rev: src/callback.c:1.21
Rev: src/constants.c:1.24
Rev: src/cpp.c:1.78
Rev: src/cyclic.h:1.5
Rev: src/docode.c:1.86
Rev: src/dynamic_buffer.c:1.13
Rev: src/dynamic_load.c:1.47
Rev: src/encode.c:1.78
Rev: src/error.c:1.65
Rev: src/fd_control.c:1.34
Rev: src/fdlib.c:1.47
Rev: src/fsort.c:1.15
Rev: src/gc.c:1.143
Rev: src/hashtable.c:1.8
Rev: src/interpret.c:1.176
Rev: src/interpret.h:1.69
Rev: src/interpret_functions.h:1.34
Rev: src/interpreter.h:1.52
Rev: src/las.c:1.226
Rev: src/lex.c:1.85
Rev: src/lexer.h:1.24
Rev: src/main.c:1.108
Rev: src/mapping.c:1.112
Rev: src/module.c:1.12
Rev: src/module_support.c:1.38
Rev: src/modules/CommonLog/clf.c:1.5
Rev: src/modules/Gdbm/gdbmmod.c:1.12
Rev: src/modules/Gettext/gettext.c:1.6
Rev: src/modules/Gmp/mpz_glue.c:1.83
Rev: src/modules/Gz/gz_test.c:1.4
Rev: src/modules/Gz/zlibmod.c:1.32
Rev: src/modules/HTTPLoop/accept_and_parse.c:1.21
Rev: src/modules/HTTPLoop/log.c:1.9
Rev: src/modules/HTTPLoop/requestobject.c:1.16
Rev: src/modules/Image/blit.c:1.49
Rev: src/modules/Image/colors.c:1.41
Rev: src/modules/Image/colortable.c:1.101
Rev: src/modules/Image/colortable.h:1.23
Rev: src/modules/Image/colortable_lookup.h:1.15
Rev: src/modules/Image/dct.c:1.17
Rev: src/modules/Image/encodings/_xpm.c:1.15
Rev: src/modules/Image/encodings/any.c:1.20
Rev: src/modules/Image/encodings/avs.c:1.12
Rev: src/modules/Image/encodings/bmp.c:1.30
Rev: src/modules/Image/encodings/dsi.c:1.3
Rev: src/modules/Image/encodings/gd.c:1.5
Rev: src/modules/Image/encodings/hrz.c:1.6
Rev: src/modules/Image/encodings/iff.c:1.9
Rev: src/modules/Image/encodings/ilbm.c:1.21
Rev: src/modules/Image/encodings/pcx.c:1.14
Rev: src/modules/Image/encodings/png.c:1.40
Rev: src/modules/Image/encodings/pnm.c:1.24
Rev: src/modules/Image/encodings/psd.c:1.26
Rev: src/modules/Image/encodings/pvr.c:1.12
Rev: src/modules/Image/encodings/ras.c:1.13
Rev: src/modules/Image/encodings/tga.c:1.25
Rev: src/modules/Image/encodings/tim.c:1.11
Rev: src/modules/Image/encodings/wbf.c:1.7
Rev: src/modules/Image/encodings/x.c:1.35
Rev: src/modules/Image/encodings/xbm.c:1.12
Rev: src/modules/Image/encodings/xcf.c:1.34
Rev: src/modules/Image/encodings/xwd.c:1.19
Rev: src/modules/Image/font.c:1.66
Rev: src/modules/Image/image.c:1.182
Rev: src/modules/Image/image.h:1.45
Rev: src/modules/Image/image_module.c:1.9
Rev: src/modules/Image/layers.c:1.58
Rev: src/modules/Image/match.h:1.11
Rev: src/modules/Image/matrix.c:1.30
Rev: src/modules/Image/operator.c:1.34
Rev: src/modules/Image/orient.c:1.18
Rev: src/modules/Image/pattern.c:1.23
Rev: src/modules/Image/phase.h:1.3
Rev: src/modules/Image/poly.c:1.11
Rev: src/modules/Image/polyfill.c:1.36
Rev: src/modules/Image/search.c:1.19
Rev: src/modules/Java/jvm.c:1.30
Rev: src/modules/MIME/mime.c:1.27
Rev: src/modules/Math/math_matrix.c:1.19
Rev: src/modules/Mird/mird_glue.c:1.10
Rev: src/modules/Msql/msqlmod.c:1.15
Rev: src/modules/Mysql/mysql.c:1.38
Rev: src/modules/Mysql/precompiled_mysql.h:1.10
Rev: src/modules/Mysql/result.c:1.17
Rev: src/modules/Odbc/odbc.c:1.23
Rev: src/modules/Odbc/odbc_result.c:1.24
Rev: src/modules/Oracle/oracle.c:1.51
Rev: src/modules/Parser/html.c:1.120
Rev: src/modules/Parser/parser.c:1.11
Rev: src/modules/Perl/perlmod.c:1.22
Rev: src/modules/Pipe/pipe.c:1.44
Rev: src/modules/Postgres/pgresult.c:1.15
Rev: src/modules/Postgres/postgres.c:1.20
Rev: src/modules/Regexp/glue.c:1.19
Rev: src/modules/Regexp/pike_regexp.c:1.20
Rev: src/modules/SANE/sane.c:1.8
Rev: src/modules/Ssleay/ssleay.c:1.13
Rev: src/modules/Yp/yp.c:1.20
Rev: src/modules/_Charset/charsetmod.c:1.25
Rev: src/modules/_Charset/iso2022.c:1.20
Rev: src/modules/_Crypto/arcfour.c:1.13
Rev: src/modules/_Crypto/cast.c:1.9
Rev: src/modules/_Crypto/cbc.c:1.18
Rev: src/modules/_Crypto/crypto.c:1.40
Rev: src/modules/_Crypto/des.c:1.18
Rev: src/modules/_Crypto/idea.c:1.16
Rev: src/modules/_Crypto/invert.c:1.11
Rev: src/modules/_Crypto/md2.c:1.10
Rev: src/modules/_Crypto/md5.c:1.15
Rev: src/modules/_Crypto/nt.c:1.7
Rev: src/modules/_Crypto/pipe.c:1.19
Rev: src/modules/_Crypto/rijndael.c:1.4
Rev: src/modules/_Crypto/rsa.c:1.24
Rev: src/modules/_Crypto/sha.c:1.18
Rev: src/modules/_Image_GIF/image_gif.c:1.2
Rev: src/modules/_Image_JPEG/image_jpeg.c:1.36
Rev: src/modules/_Image_TIFF/image_tiff.c:1.22
Rev: src/modules/_Image_TTF/image_ttf.c:1.37
Rev: src/modules/_Image_XFace/image_xface.c:1.14
Rev: src/modules/_Roxen/roxen.c:1.7
Rev: src/modules/_math/math.c:1.34
Rev: src/modules/call_out/call_out.c:1.40
Rev: src/modules/files/efuns.c:1.88
Rev: src/modules/files/file.c:1.204
Rev: src/modules/files/sendfile.c:1.50
Rev: src/modules/files/socket.c:1.52
Rev: src/modules/files/stat.c:1.15
Rev: src/modules/files/termios.c:1.10
Rev: src/modules/files/udp.c:1.18
Rev: src/modules/spider/discdate.c:1.8
Rev: src/modules/spider/spider.c:1.101
Rev: src/modules/spider/stardate.c:1.11
Rev: src/modules/spider/xml.c:1.29
Rev: src/modules/sprintf/sprintf.c:1.74
Rev: src/modules/sybase/sybase.c:1.5
Rev: src/modules/sybase/sybase.h:1.2
Rev: src/modules/system/nt.c:1.28
Rev: src/modules/system/syslog.c:1.10
Rev: src/modules/system/system.c:1.94
Rev: src/multiset.c:1.30
Rev: src/object.c:1.154
Rev: src/opcodes.c:1.95
Rev: src/operators.c:1.113
Rev: src/peep.c:1.42
Rev: src/pike_memory.c:1.93
Rev: src/pike_search.c:1.4
Rev: src/pike_types.c:1.143
Rev: src/port.c:1.34
Rev: src/post_modules/GL/auto.c.in:1.16
Rev: src/post_modules/GL/top.c:1.13
Rev: src/post_modules/GLUT/auto.c.in:1.3
Rev: src/post_modules/GLUT/top.c:1.4
Rev: src/post_modules/GTK/source/encode_truecolor.c:1.4
Rev: src/post_modules/GTK/source/support.c:1.19
Rev: src/preprocessor.h:1.35
Rev: src/program.c:1.283
Rev: src/queue.c:1.7
Rev: src/security.c:1.28
Rev: src/security.h:1.12
Rev: src/signal_handler.c:1.185
Rev: src/smartlink.c:1.11
Rev: src/stralloc.c:1.109
Rev: src/svalue.c:1.89
Rev: src/svalue.h:1.71
Rev: src/threads.c:1.147
Rev: src/threads.h:1.107

1:   #include "global.h" - RCSID("$Id: xcf.c,v 1.33 2000/11/29 21:31:04 hubbe Exp $"); + RCSID("$Id: xcf.c,v 1.34 2000/12/01 08:10:08 hubbe Exp $");      #include "image_machine.h"   
15:   #include "interpret.h"   #include "svalue.h"   #include "mapping.h" - #include "error.h" + #include "pike_error.h"   #include "stralloc.h"   #include "builtin_functions.h"   #include "operators.h"
83:       if( i < 0 ) i = s->len + i;    if( i >= s->len ) { -  error("Index out of bounds, %d > %ld\n", i, +  Pike_error("Index out of bounds, %d > %ld\n", i,    DO_NOT_WARN((long)s->len-1) );    }    push_int( ((unsigned char *)s->s->str)[s->offset+i] );
129:    unsigned char *p;    int x = sp[-1].u.integer;    if( x > s->len>>2 ) -  error("Index %d out of range", x ); +  Pike_error("Index %d out of range", x );       p = s->s->str + s->offset + x*4;    res = (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
144:    unsigned char *p;    int x = sp[-1].u.integer;    if( x > s->len>>2 ) -  error("Index %d out of range", x ); +  Pike_error("Index %d out of range", x );       p = s->s->str + s->offset + x*4;    res = (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
158:    unsigned char *p;    int x = sp[-1].u.integer;    if( x > s->len>>1 ) -  error("Index %d out of range", x ); +  Pike_error("Index %d out of range", x );       p = s->s->str + s->offset + x*2;    res = (p[2]<<8) | p[3];
172:    unsigned char *p;    int x = sp[-1].u.integer;    if( x > s->len>>1 ) -  error("Index %d out of range", x ); +  Pike_error("Index %d out of range", x );       p = s->s->str + s->offset + x*2;    res = (p[2]<<8) | p[3];
301:   {    unsigned int res;    if(from->len < 4) -  error("Not enough space for 4 bytes (uint32)\n"); +  Pike_error("Not enough space for 4 bytes (uint32)\n");    res = (from->str[0]<<24)|(from->str[1]<<16)|(from->str[2]<<8)|from->str[3];    from->str += 4;    from->len -= 4;
317:   {    char *res;    if( from->len < len ) -  error("Not enough space for %lu bytes\n", +  Pike_error("Not enough space for %lu bytes\n",    DO_NOT_WARN((unsigned long)len));    res = (char *)from->str;    from->str += len;
334:    if(res.len > 0) res.len--; /* len includes ending \0 */    res.base_len = res.len;    if(!res.str) -  error("String read failed\n"); +  Pike_error("String read failed\n");    return res;   }   
699:    MEMSET(&res, 0, sizeof(res));    initial = *data;    if(data->len < 34) -  error("This is not an xcf file (to little data)\n"); +  Pike_error("This is not an xcf file (to little data)\n");    if(!(data->str[0] == 'g' &&    data->str[1] == 'i' &&    data->str[2] == 'm' &&
707:    data->str[4] == ' '))    {    if(strlen((char *)data->str) == 13) -  error("This is not an xcf file (%s)\n", data->str); +  Pike_error("This is not an xcf file (%s)\n", data->str);    else -  error("This is not an xcf file\n"); +  Pike_error("This is not an xcf file\n");    }    data->str+=14; data->len-=14;   
794:    struct svalue *osp = sp, *tsp;    if(h->level.width != h->width ||    h->level.height != h->height) -  error("Illegal hierarchy level sizes!\n"); +  Pike_error("Illegal hierarchy level sizes!\n");       ref_push_string( s_width ); push_int( h->width );    ref_push_string( s_height ); push_int( h->height );
900:    ONERROR err;    get_all_args( "___decode", args, "%S", &s );    if(args > 1) -  error("Too many arguments to Image.XCF.___decode()\n"); +  Pike_error("Too many arguments to Image.XCF.___decode()\n");       b.s = s;    b.base_offset = 0;
946:   **! Decodes a XCF image to a single image object.   **!   **! note - **! Throws upon error in data, you will loose quite a lot of + **! Throws upon Pike_error in data, you will loose quite a lot of   **! information by doing this. See Image.XCF._decode and Image.XCF.__decode   */   
983:   **! ])</pre>   **!   **! note - **! Throws upon error in data. For more information, see Image.XCF.__decode + **! Throws upon Pike_error in data. For more information, see Image.XCF.__decode   */      /*
1194:          if( !(i = (struct image *)get_storage( io, image_program ))) -  error("Wrong type object argument 1 (image)\n"); +  Pike_error("Wrong type object argument 1 (image)\n");       if(ao && !(a = (struct image *)get_storage( ao, image_program ))) -  error("Wrong type object argument 2 (image)\n"); +  Pike_error("Wrong type object argument 2 (image)\n");       if( cmapo &&    !(cmap=(struct neo_colortable *)get_storage(cmapo,    image_colortable_program))) -  error("Wrong type object argument 4 (colortable)\n"); +  Pike_error("Wrong type object argument 4 (colortable)\n");       for(l=0; l<(unsigned int)tiles->size; l++)    if(tiles->item[l].type != T_OBJECT) -  error("Wrong type array argument 3 (tiles)\n"); +  Pike_error("Wrong type array argument 3 (tiles)\n");       if(a && ((i->xsize != a->xsize) || (i->ysize != a->ysize))) -  error("Image and alpha objects are not identically sized.\n"); +  Pike_error("Image and alpha objects are not identically sized.\n");       if(cmap)    {