MonetDB: candidate-exceptions - Use already existing variable.

[Sjoerd Mullender]

Changeset: 942ab8df3022 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=942ab8df3022
Modified Files:
        gdk/gdk_calc.c
Branch: candidate-exceptions
Log Message:

Use already existing variable.


diffs (36 lines):

diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -14266,12 +14266,12 @@ BATconvert(BAT *b, BAT *s, int tp, bool 
                return COLcopy(b, tp, false, TRANSIENT);
        }
 
-       bn = COLnew(b->hseqbase, tp, b->batCount, TRANSIENT);
+       bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
        if (bn == NULL)
                return NULL;
 
        if (b->ttype == TYPE_void)
-               nils = convert_void_any(b->tseqbase, b->batCount, bn,
+               nils = convert_void_any(b->tseqbase, cnt, bn,
                                        &ci, b->hseqbase,
                                        abort_on_error, &reduce);
        else if (tp == TYPE_str)
@@ -14284,7 +14284,7 @@ BATconvert(BAT *b, BAT *s, int tp, bool 
        } else
                nils = convert_typeswitchloop(Tloc(b, 0), b->ttype,
                                              Tloc(bn, 0), tp,
-                                             b->batCount, &ci, b->hseqbase,
+                                             cnt, &ci, b->hseqbase,
                                              abort_on_error, &reduce);
 
        if (nils >= BUN_NONE) {
@@ -14299,7 +14299,7 @@ BATconvert(BAT *b, BAT *s, int tp, bool 
                return NULL;
        }
 
-       BATsetcount(bn, b->batCount);
+       BATsetcount(bn, cnt);
 
        bn->tnil = nils != 0;
        bn->tnonil = nils == 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list