From 37b878e34e29e3fe77d54157411d1c7fe65004b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Thu, 2 Nov 2000 00:41:19 +0100 Subject: [PATCH] Fixed a few warnings. Rev: src/builtin.cmod:1.13 Rev: src/mapping.c:1.110 Rev: src/object.c:1.152 Rev: src/opcodes.c:1.91 Rev: src/program.c:1.279 --- src/builtin.cmod | 2 +- src/mapping.c | 6 +++--- src/object.c | 6 +++--- src/opcodes.c | 4 ++-- src/program.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/builtin.cmod b/src/builtin.cmod index ac184153db..fda59fb7ac 100644 --- a/src/builtin.cmod +++ b/src/builtin.cmod @@ -199,7 +199,7 @@ PIKEFUN int get_weak_flag(mixed m) efun; optflags OPT_EXTERNAL_DEPEND; { - int flag; + int flag = 0; switch (m->type) { case T_ARRAY: flag = !!(m->u.array->flags & ARRAY_WEAK_FLAG); diff --git a/src/mapping.c b/src/mapping.c index d83abceb79..7d3368664b 100644 --- a/src/mapping.c +++ b/src/mapping.c @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: mapping.c,v 1.109 2000/10/09 23:58:49 hubbe Exp $"); +RCSID("$Id: mapping.c,v 1.110 2000/11/01 23:30:36 grubba Exp $"); #include "main.h" #include "object.h" #include "mapping.h" @@ -1377,8 +1377,8 @@ PMOD_EXPORT struct mapping *merge_mapping_array_ordered(struct mapping *a, struct array *b, INT32 op) { struct array *ai, *av; - struct array *ci, *cv; - INT32 *zipper; + struct array *ci = NULL, *cv = NULL; + INT32 *zipper = NULL; struct mapping *m; ai=mapping_indices(a); diff --git a/src/object.c b/src/object.c index 35497f30b2..812a45d509 100644 --- a/src/object.c +++ b/src/object.c @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: object.c,v 1.151 2000/10/25 21:55:32 hubbe Exp $"); +RCSID("$Id: object.c,v 1.152 2000/11/01 23:31:28 grubba Exp $"); #include "object.h" #include "dynamic_buffer.h" #include "interpret.h" @@ -842,7 +842,7 @@ PMOD_EXPORT void object_index_no_free2(struct svalue *to, struct svalue *index) { struct program *p; - int f; + int f = -1; if(!o || !(p=o->prog)) { @@ -944,7 +944,7 @@ PMOD_EXPORT void object_set_index2(struct object *o, struct svalue *from) { struct program *p; - int f; + int f = -1; if(!o || !(p=o->prog)) { diff --git a/src/opcodes.c b/src/opcodes.c index 80e76206e3..e73078403b 100644 --- a/src/opcodes.c +++ b/src/opcodes.c @@ -26,7 +26,7 @@ #include "bignum.h" #include "operators.h" -RCSID("$Id: opcodes.c,v 1.90 2000/08/17 19:06:30 grubba Exp $"); +RCSID("$Id: opcodes.c,v 1.91 2000/11/01 23:32:32 grubba Exp $"); void index_no_free(struct svalue *to,struct svalue *what,struct svalue *ind) { @@ -1575,7 +1575,7 @@ void o_sscanf(INT32 args) #ifdef PIKE_DEBUG extern int t_flag; #endif - INT32 e,i; + INT32 e, i=0; int x; ptrdiff_t matched_chars; struct svalue *save_sp=sp; diff --git a/src/program.c b/src/program.c index e1aae81dee..83681d3aef 100644 --- a/src/program.c +++ b/src/program.c @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: program.c,v 1.278 2000/10/25 21:55:33 hubbe Exp $"); +RCSID("$Id: program.c,v 1.279 2000/11/01 23:34:30 grubba Exp $"); #include "program.h" #include "object.h" #include "dynamic_buffer.h" @@ -4445,7 +4445,7 @@ PMOD_EXPORT void *parent_storage(int depth) } } - if(Pike_fp->fun == -1) + if(!~Pike_fp->fun) error("Cannot access parent storage!\n"); loc.parent_identifier=Pike_fp->fun; -- GitLab