Branch: Tag:

2005-05-19

2005-05-19 22:35:40 by Martin Stjernholm <mast@lysator.liu.se>

Fixed various type errors for 64 bit architectures and other warnings. (Most
are in harmless debug messages, but anyway..)

Rev: src/array.c:1.181
Rev: src/backend.cmod:1.175
Rev: src/builtin_functions.c:1.599
Rev: src/code/bytecode.h:1.11
Rev: src/encode.c:1.228
Rev: src/gc.c:1.270
Rev: src/interpret_functions.h:1.184
Rev: src/las.c:1.364
Rev: src/modules/Image/image.c:1.222
Rev: src/modules/Parser/html.c:1.177
Rev: src/modules/_Charset/iso2022.c:1.38
Rev: src/modules/files/file.c:1.351
Rev: src/modules/files/sendfile.c:1.72
Rev: src/modules/spider/xml.c:1.75
Rev: src/modules/system/memory.c:1.34
Rev: src/object.c:1.267
Rev: src/peep.c:1.106
Rev: src/pike_types.c:1.247
Rev: src/post_modules/Shuffler/a_source_system_memory.c:1.12
Rev: src/post_modules/Shuffler/b_source_normal_file.c:1.14
Rev: src/program.c:1.588
Rev: src/rbtree.c:1.25
Rev: src/threads.c:1.244

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: program.c,v 1.587 2005/04/08 17:01:02 grubba Exp $ + || $Id: program.c,v 1.588 2005/05/19 22:35:32 mast Exp $   */      #include "global.h"
2666: Inside #if defined(PIKE_DEBUG)
   for (d=0; d < p->num_inherits; d++) {    struct inherit *inh = p->inherits + d;    -  fprintf(stderr, "%*s %4d: %5d %7d %8d %12d %6d %8d %10d %11d\n", +  fprintf(stderr, "%*s %4d: %5d %7d %8d %12"PRINTPTRDIFFT"d %6d %8d %10d %11"PRINTSIZET"d\n",    indent, "",    d, inh->inherit_level,    inh->prog ? inh->prog->id : -1,
2682: Inside #if defined(PIKE_DEBUG)
   for (d=0; d < p->num_identifiers; d++) {    struct identifier *id = p->identifiers + d;    -  fprintf(stderr, "%*s %4d: %5x %6d %4d \"%s\"\n", +  fprintf(stderr, "%*s %4d: %5x %6"PRINTPTRDIFFT"d %4d \"%s\"\n",    indent, "",    d, id->identifier_flags, id->func.offset,    id->run_time_type, id->name->str);
2709: Inside #if defined(PIKE_DEBUG) and #if 0
   d, get_name_of_type (c->sval.type),    c->name?"\"":"",c->name?c->name->str:"NULL",c->name?"\"":"");   #else /* !0 */ -  fprintf(stderr, "%*s %4d: %-15s %d\n", +  fprintf(stderr, "%*s %4d: %-15s %"PRINTPTRDIFFT"d\n",    indent, "",    d, get_name_of_type (c->sval.type),    c->offset);
2922:    if(ID_FROM_INT(p,variable_positions[offset+q])->run_time_type !=    i->run_time_type)    { -  fprintf(stderr, "Storage offset: 0x%08x vs 0x%08x\n" -  "Func offset: 0x%08x vs 0x%08x\n" +  fprintf(stderr, "Storage offset: " +  "0x%08"PRINTPTRDIFFT"x vs 0x%08"PRINTPTRDIFFT"x\n" +  "Func offset: 0x%08"PRINTPTRDIFFT"x vs 0x%08"PRINTPTRDIFFT"x\n"    "Type: %s vs %s\n",    INHERIT_FROM_INT(p, variable_positions[offset+q])->    storage_offset,
2935:    get_name_of_type(i->run_time_type));    if (i->name) {    Pike_fatal("Variable '%s' and '%s' overlap\n" -  "Offset 0x%08x - 0x%08x overlaps with 0x%08x - 0x%08x\n", +  "Offset 0x%08"PRINTPTRDIFFT"x - 0x%08"PRINTPTRDIFFT"x " +  "overlaps with " +  "0x%08"PRINTPTRDIFFT"x - 0x%08"PRINTPTRDIFFT"x\n",    ID_FROM_INT(p, variable_positions[offset+q])->name->str,    i->name->str,    INHERIT_FROM_INT(p, variable_positions[offset+q])->
2949:    offset, offset+size-1);    } else {    Pike_fatal("Variable '%s' and anonymous variable (%d) overlap\n" -  "Offset 0x%08x - 0x%08x overlaps with 0x%08x - 0x%08x\n", +  "Offset 0x%08"PRINTPTRDIFFT"x - 0x%08"PRINTPTRDIFFT"x " +  "overlaps with " +  "0x%08"PRINTPTRDIFFT"x - 0x%08"PRINTPTRDIFFT"x\n",    ID_FROM_INT(p, variable_positions[offset+q])->name->str,    e,    INHERIT_FROM_INT(p, variable_positions[offset+q])->
5611: Inside #if defined(PIKE_DEBUG)
   cnt += len<<shift;    if (a_flag > 100) {    fprintf(stderr, "Filename entry:\n" -  " len: %d, shift: %d\n", +  " len: %"PRINTSIZET"d, shift: %d\n",    len, shift);    }    }
5637: Inside #if defined(PIKE_DEBUG)
   " (line : %d ?= %d)!\n"    " ( pc : %d ?= %d)!\n"    " (shift: %d ?= %d)!\n" -  " (len : %d ?= %d)!\n" +  " (len : %"PRINTSIZET"d ?= %"PRINTSIZET"d)!\n"    " (file : %s ?= %s)!\n",    Pike_compiler->last_line, line,    Pike_compiler->last_pc, off,