2000-08-15
2000-08-15 11:14:37 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
63540de905fb436b86425ad2dde6a7b3970d8800
(20 lines)
(+12/-8)
[
Show
| Annotate
]
Branch: 7.9
Fixed a few warnings.
Rev: src/array.c:1.81
Rev: src/array.h:1.26
Rev: src/builtin_functions.c:1.297
Rev: src/error.h:1.47
Rev: src/program.c:1.260
Rev: src/program.h:1.103
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: program.c,v 1.259 2000/08/14 20:19:20 grubba Exp $");
+ RCSID("$Id: program.c,v 1.260 2000/08/15 11:14:20 grubba Exp $");
#include "program.h"
#include "object.h"
#include "dynamic_buffer.h"
1002: Inside #if defined(PIKE_DEBUG)
fprintf(stderr,"parent_offset: %d\n",p->inherits[e].parent_offset);
for(d=0;d<p->inherits[e].inherit_level;d++) fprintf(stderr," ");
- fprintf(stderr,"storage_offset: %d\n",p->inherits[e].storage_offset);
+ fprintf(stderr,"storage_offset: %ld\n",
+ DO_NOT_WARN((long)p->inherits[e].storage_offset));
for(d=0;d<p->inherits[e].inherit_level;d++) fprintf(stderr," ");
fprintf(stderr,"parent: %p\n",p->inherits[e].parent);
1226: Inside #if defined(PIKE_DEBUG)
if( !(i->identifier_flags & (IDENTIFIER_FUNCTION | IDENTIFIER_CONSTANT)))
{
- unsigned int q, size;
+ size_t q, size;
/* Variable */
- int offset = INHERIT_FROM_INT(p, e)->storage_offset+i->func.offset;
+ ptrdiff_t offset = INHERIT_FROM_INT(p, e)->storage_offset+i->func.offset;
size=sizeof_variable(i->run_time_type);
- if((offset+size > (unsigned int)p->storage_needed) || offset<0)
+ if((offset+size > (size_t)p->storage_needed) || offset<0)
fatal("Variable outside storage! (%s)\n",i->name->str);
for(q=0;q<size;q++)
1434: Inside #if defined(PIKE_DEBUG)
fatal("add_storage failed horribly(2) %ld %ld %ld %ld!\n",
DO_NOT_WARN((long)offset),
(long)0 /* + OFFSETOF(object,storage) */,
- (long)modulo_orig,
+ DO_NOT_WARN((long)modulo_orig),
DO_NOT_WARN((long)alignment));
#endif
3863:
INT32 oid, pid, offset;
} get_storage_cache[GET_STORAGE_CACHE_SIZE];
- int low_get_storage(struct program *o, struct program *p)
+ ptrdiff_t low_get_storage(struct program *o, struct program *p)
{
- INT32 oid,pid, offset;
+ INT32 oid, pid;
+ ptrdiff_t offset;
unsigned INT32 hval;
-
+
if(!o) return 0;
oid=o->id;
pid=p->id;