MonetDB: Oct2012 - json: BUNfndOID returns a BUN, not an oid

[Fabian Groffen]

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

json: BUNfndOID returns a BUN, not an oid


diffs (34 lines):

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
@@ -1112,7 +1112,7 @@ JSONdrop(int *ret, str *name)
 static oid
 json_copy_entry(BATiter bik, BATiter bis, BATiter bii, BATiter bid, BATiter 
bia, BATiter bio, BATiter bin, oid start, oid v, jsonbat *jb, jsonbat *jbr)
 {
-       oid w, x;
+       BUN w, x;
        bte k;
 
        BUNfndOID(w, bik, &v);
@@ -1139,8 +1139,8 @@ json_copy_entry(BATiter bik, BATiter bis
                        /* nothing to do here */
                        break;
                case 'o': {
-                       BUN p, q;
-                       oid y, z;
+                       BUN p, q, y;
+                       oid z;
                        BATloop (jb->object, p, q) {
                                if (*(oid *)BUNhead(bio, p) != v)
                                        continue;
@@ -1369,8 +1369,8 @@ JSONunwrap(Client cntxt, MalBlkPtr mb, M
        jsonbat jb;
        BATiter bi, bis, bii, bid, ci;
        BAT *b, *c, *r = NULL;
-       BUN p, q, t, u;
-       oid v = 0, x;
+       BUN p, q, t, u, x;
+       oid v = 0;
        lng l;
        dbl d;
        str s;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list