MonetDB: linear-hashing - Fix types.

[Sjoerd Mullender]

Changeset: 93f9bf3b18b3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93f9bf3b18b3
Modified Files:
        geom/monetdb5/geom.c
        monetdb5/modules/mal/remote.c
Branch: linear-hashing
Log Message:

Fix types.


diffs (33 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -5551,7 +5551,7 @@ wkbaFROMSTR(const char *fromStr, size_t 
 const wkba *
 wkbaNULL(void)
 {
-       static wkba nullval = {.itemsNum = ~0};
+       static const wkba nullval = {.itemsNum = ~0};
 
        return &nullval;
 }
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -407,7 +407,7 @@ RMTgetId(char *buf, MalBlkPtr mb, InstrP
        char *mod;
        char *var;
        str rt;
-       static int idtag=0;
+       static ATOMIC_TYPE idtag = ATOMIC_VAR_INIT(0);
 
        if( p->retc == 0)
                throw(MAL, "remote.getId", ILLEGAL_ARGUMENT "MAL instruction 
misses retc");
@@ -421,7 +421,7 @@ RMTgetId(char *buf, MalBlkPtr mb, InstrP
        if (rt == NULL)
                throw(MAL, "remote.put", SQLSTATE(HY013) MAL_MALLOC_FAIL);
 
-       snprintf(buf, BUFSIZ, "rmt%d_%s_%s", idtag++, var, rt);
+       snprintf(buf, BUFSIZ, "rmt%u_%s_%s", (unsigned) ATOMIC_ADD(&idtag, 1), 
var, rt);
 
        GDKfree(rt);
        return(MAL_SUCCEED);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list