MonetDB: geo - Add some casting.

[Sjoerd Mullender]

Changeset: 4f8b822516a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4f8b822516a0
Modified Files:
        geom/monetdb5/geom.c
Branch: geo
Log Message:

Add some casting.


diffs (22 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -5218,7 +5218,7 @@ int wkbaTOSTR(char **toStr, int *len, wk
        dataSize += 2*sizeof(char)*items;
 
        //copy all partial strings to a single one
-       if (*len < dataSize + 3 || *toStr == NULL) {
+       if (*len < (int) dataSize + 3 || *toStr == NULL) {
                GDKfree(*toStr);
                *toStr = GDKmalloc(*len = (int) dataSize + 3); /* plus quotes + 
termination character */
        }
@@ -5247,8 +5247,8 @@ int wkbaTOSTR(char **toStr, int *len, wk
        GDKfree(partialStrs);
        GDKfree(itemsNumStr);
 
+       assert(strlen(*toStr) + 1 < (size_t) GDK_int_max);
        *len = (int) strlen(*toStr)+1;
-       assert(*len < (size_t) GDK_int_max);
        return (int)(toStrPtr-*toStr);
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list