MonetDB: Jun2016 - Don't misuse bn.

[Sjoerd Mullender]

Changeset: 6d19febbe8f9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d19febbe8f9
Modified Files:
        gdk/gdk_select.c
Branch: Jun2016
Log Message:

Don't misuse bn.


diffs (36 lines):

diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1211,7 +1211,7 @@ BATselect(BAT *b, BAT *s, const void *tl
        int hval, lval, equi, t, lnil, hash;
        bat parent;
        const void *nil;
-       BAT *bn;
+       BAT *bn, *tmp;
        BUN estimate = BUN_NONE, maximum = BUN_NONE;
        union {
                bte v_bte;
@@ -1634,9 +1634,8 @@ BATselect(BAT *b, BAT *s, const void *tl
                (((b->batPersistence == PERSISTENT
 #ifndef DISABLE_PARENT_HASH
                   || (parent != 0 &&
-                      /* temporarily misuse bn */
-                      (bn = BBPquickdesc(abs(parent),0)) != NULL &&
-                      bn->batPersistence == PERSISTENT)
+                      (tmp = BBPquickdesc(abs(parent),0)) != NULL &&
+                      tmp->batPersistence == PERSISTENT)
 #endif
                          ) &&
                 (size_t) ATOMsize(b->ttype) >= sizeof(BUN) / 4 &&
@@ -1723,9 +1722,8 @@ BATselect(BAT *b, BAT *s, const void *tl
                    !b->tvarsized &&
                    (b->batPersistence == PERSISTENT ||
                     (parent != 0 &&
-                     /* temporarily misuse bn */
-                     (bn = BBPquickdesc(abs(parent),0)) != NULL &&
-                     bn->batPersistence == PERSISTENT))) {
+                     (tmp = BBPquickdesc(abs(parent),0)) != NULL &&
+                     tmp->batPersistence == PERSISTENT))) {
                        /* use imprints if
                         *   i) bat is persistent, or parent is persistent
                         *  ii) it is not an equi-select, and
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list