MonetDB: Jun2020 - Use right types

[Pedro Ferreira]

Changeset: 6a6fcf0c429b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a6fcf0c429b
Modified Files:
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_user.c
        sql/server/rel_semantic.c
        sql/server/rel_updates.c
        sql/storage/sql_storage.h
Branch: Jun2020
Log Message:

Use right types


diffs (85 lines):

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
@@ -1441,7 +1441,7 @@ rel_parse_value(backend *be, char *query
                *m = o;
                m->session->status = status;
        } else {
-               int label = m->label;
+               unsigned int label = m->label;
 
                while (m->topvars > o.topvars) {
                        if (m->vars[--m->topvars].name)
@@ -3632,7 +3632,7 @@ sql_parse(backend *be, sql_allocator *sa
                sa_destroy(m->sa);
        m->sym = NULL;
        {
-               int label = m->label;
+               unsigned int label = m->label;
                int status = m->session->status;
                int sizevars = m->sizevars, topvars = m->topvars;
                sql_var *vars = m->vars;
diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -448,7 +448,8 @@ SQLescapeString(str s)
 str
 SQLstatementIntern(Client c, str *expr, str nme, bit execute, bit output, 
res_table **result)
 {
-       int status = 0, err = 0, oldvtop, oldstop = 1, inited = 0, label, ac, 
sizevars, topvars;
+       int status = 0, err = 0, oldvtop, oldstop = 1, inited = 0, ac, 
sizevars, topvars;
+       unsigned int label;
        mvc *o, *m;
        sql_var *vars;
        buffer *b;
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -542,9 +542,9 @@ monet5_user_set_def_schema(mvc *m, oid u
        rid = table_funcs.column_find_row(m->session->tr, auths_name, username, 
NULL);
        if (!is_oid_nil(rid)) {
                sql_column *auths_id = find_sql_column(auths, "id");
-               int id;
+               sqlid id;
                p = table_funcs.column_find_value(m->session->tr, auths_id, 
rid);
-               id = *(int *) p;
+               id = *(sqlid *) p;
                _DELETE(p);
 
                m->user_id = m->role_id = id;
diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -98,7 +98,7 @@ rel_parse(mvc *m, sql_schema *s, char *q
                *m = o;
                m->session->status = status;
        } else {
-               int label = m->label;
+               unsigned int label = m->label;
 
                while (m->topvars > o.topvars) {
                        if (m->vars[--m->topvars].name)
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -2049,7 +2049,7 @@ rel_parse_val(mvc *m, char *query, char 
                *m = o;
                m->session->status = status;
        } else {
-               int label = m->label;
+               unsigned int label = m->label;
 
                while (m->topvars > o.topvars) {
                        if (m->vars[--m->topvars].name)
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -392,7 +392,7 @@ extern void idle_manager(void);
 
 extern void store_lock(void);
 extern void store_unlock(void);
-extern int store_next_oid(void);
+extern sqlid store_next_oid(void);
 
 extern sql_trans *sql_trans_create(backend_stack stk, sql_trans *parent, const 
char *name, bool try_spare);
 extern sql_trans *sql_trans_destroy(sql_trans *tr, bool try_spare);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list