MonetDB: default - Fix some types.

[Sjoerd Mullender]

Changeset: 50d364de468c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50d364de468c
Modified Files:
        monetdb5/modules/mal/sysmon.c
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_statement.c
Branch: default
Log Message:

Fix some types.


diffs (44 lines):

diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -31,13 +31,14 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb, 
        bat *w = getArgReference_bat(stk,pci,7);
        bat *m = getArgReference_bat(stk,pci,8);
        lng qtag;
-       int wrk, mem, sz;
+       int wrk, mem;
+       BUN sz;
        timestamp tsn;
        str msg = MAL_SUCCEED;
 
        (void) cntxt;
        (void) mb;
-       sz = qsize;     // reserve space for all tuples in QRYqueue
+       sz = (BUN) qsize;       // reserve space for all tuples in QRYqueue
        tag = COLnew(0, TYPE_lng, sz, TRANSIENT);
        sessionid = COLnew(0, TYPE_int, sz, TRANSIENT);
        user = COLnew(0, TYPE_str, sz, TRANSIENT);
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -774,7 +774,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
                }
                assert(!e->r);
                if (exps) {
-                       int nrcols = 0;
+                       unsigned nrcols = 0;
                        int push_cond_exec = 0, coalesce = 0;
                        stmt *ncond = NULL, *ocond = cond;
 
diff --git a/sql/backends/monet5/sql_statement.c 
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -2610,7 +2610,7 @@ stmt_catalog(backend *be, int type, stmt
 void
 stmt_set_nrcols(stmt *s)
 {
-       int nrcols = 0;
+       unsigned nrcols = 0;
        int key = 1;
        node *n;
        list *l = s->op4.lval;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list