MonetDB: default - compile: fix various 'may be used uninitializ...

[Fabian Groffen]

Changeset: 5c7e6a290995 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c7e6a290995
Modified Files:
        monetdb5/extras/jaql/jaql.c
        monetdb5/extras/jaql/jaqlgencode.c
        monetdb5/extras/jaql/json.c
Branch: default
Log Message:

compile: fix various 'may be used uninitialized in this function' warnings


diffs (94 lines):

diff --git a/monetdb5/extras/jaql/jaql.c b/monetdb5/extras/jaql/jaql.c
--- a/monetdb5/extras/jaql/jaql.c
+++ b/monetdb5/extras/jaql/jaql.c
@@ -254,7 +254,7 @@ make_jaql_expand(tree *var, tree *expr)
                expr->type = j_var;
                expr->sval = GDKstrdup(var->sval);
        } else {
-               char *v;
+               char *v = NULL;
                if (expr->type == j_var)
                        v = expr->sval;
                if (expr->type == j_unroll && expr->tval1->type == j_var)
diff --git a/monetdb5/extras/jaql/jaqlgencode.c 
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -1029,7 +1029,7 @@ dumppredjoin(MalBlkPtr mb, json_var *js,
        int a, b, c, d, l, r;
        tree *pred;
        json_var *vars, *ljv, *rjv;
-       join_result *jrs = NULL, *jrw, *jrl, *jrr, *jrn, *jrv, *jrp;
+       join_result *jrs = NULL, *jrw = NULL, *jrl, *jrr = NULL, *jrn, *jrv, 
*jrp;
 
        jgvar *jgraph = NULL;
 
@@ -2211,9 +2211,10 @@ dumpvariabletransformation(jc *j, Client
                        return b;
                case j_operation: {
                        int r, s;
-                       int u, v;
-                       int h, i, k, l, m;
+                       int u = -1, v;
+                       int h, i, k = -1, l = -1, m;
                        InstrPtr p;
+                       b = -1;
                        switch (t->tval1->type) {
                                case j_var:
                                case j_operation:
@@ -2240,6 +2241,7 @@ dumpvariabletransformation(jc *j, Client
                                default:
                                        assert(0);
                        }
+                       assert(b != -1);  /* to help the compiler */
                        /* d:int and e:dbl are values from val1 */
 
                        switch (t->tval3->type) {
@@ -3138,6 +3140,7 @@ dumpvariabletransformation(jc *j, Client
                                return a;
                        }
 
+                       b = -1;
                        for (i = 0, w = t->tval1; w != NULL; w = w->next, i++) {
                                assert(w->type == j_func_arg);
                                assert(w->tval1 != NULL);
@@ -4231,7 +4234,7 @@ matchfuncsig(jc *j, Client cntxt, tree *
        Symbol s;
        InstrPtr f;
        tree *w;
-       int i, funcretc;
+       int i, funcretc = 0;
 
        /* lookup the function we need */
        s = findSymbol(cntxt->nspace,
@@ -4289,8 +4292,8 @@ matchfuncsig(jc *j, Client cntxt, tree *
                        char match = 0;
                        int itype;
                        int argoff = 0;
-                       int orgoff, odyn1, odyn2, odyn3;
-                       enum treetype ocoltype;
+                       int orgoff, odyn1 = -1, odyn2 = -1, odyn3 = -1;
+                       enum treetype ocoltype = j_invalid;
 
                        /* Function resolution is done based on the
                         * input arguments only; we cannot consider the
diff --git a/monetdb5/extras/jaql/json.c b/monetdb5/extras/jaql/json.c
--- a/monetdb5/extras/jaql/json.c
+++ b/monetdb5/extras/jaql/json.c
@@ -642,7 +642,7 @@ JSONprint(int *ret, stream **s, int *kin
                 * going to be necessary */
                BAT *elems;
                BUN p, q;
-               size_t esize, fsize;
+               size_t esize = 0, fsize = 0;
                int indent;
                oid *id = (oid *)BUNhead(bi, BUNfirst(jb.kind));
                elems = BATmirror(BATselect(BATmirror(jb.array), id, id));
@@ -1145,7 +1145,7 @@ JSONunwrap(Client cntxt, MalBlkPtr mb, M
        int *object = (int *)getArgReference(stk, pci, 6);
        int *name = (int *)getArgReference(stk, pci, 7);
        oid *arrid = (oid *)getArgReference(stk, pci, 8);
-       ValPtr tpe;
+       ValPtr tpe = NULL;
        jsonbat jb;
        BATiter bi, bis, bii, bid, ci;
        BAT *b, *c, *r = NULL;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list