MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

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

Merge with Oct2014 branch.


diffs (70 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -139,15 +139,12 @@ mbr_isnil(mbr *m)
 /* NULL: generic nil mbr. */
 /* returns a pointer to a nil-mbr. */
 
+static mbr mbrNIL = {GDK_flt_min, GDK_flt_min, GDK_flt_min, GDK_flt_min};
+
 mbr *
 mbrNULL(void)
 {
-       static mbr mbrNIL;
-       mbrNIL.xmin = flt_nil;
-       mbrNIL.ymin = flt_nil;
-       mbrNIL.xmax = flt_nil;
-       mbrNIL.ymax = flt_nil;
-       return (&mbrNIL);
+       return &mbrNIL;
 }
 
 /* FROMSTR: parse string to mbr. */
@@ -218,14 +215,16 @@ mbrFROMSTR(const char *src, int *len, mb
 int
 mbrTOSTR(char **dst, int *len, mbr *atom)
 {
-       static char tempWkt[MBR_WKTLEN];
-       size_t dstStrLen = 3;
+       char tempWkt[MBR_WKTLEN];
+       size_t dstStrLen;
 
        if (!mbr_isnil(atom)) {
-               snprintf(tempWkt, MBR_WKTLEN, "BOX (%f %f, %f %f)",
+               snprintf(tempWkt, MBR_WKTLEN, "\"BOX (%f %f, %f %f)\"",
                         atom->xmin, atom->ymin, atom->xmax, atom->ymax);
-               dstStrLen = strlen(tempWkt) + 2;
-               assert(dstStrLen < GDK_int_max);
+               dstStrLen = strlen(tempWkt);
+       } else {
+               strcpy(tempWkt, "nil");
+               dstStrLen = 3;
        }
 
        if (*len < (int) dstStrLen + 1) {
@@ -235,7 +234,7 @@ mbrTOSTR(char **dst, int *len, mbr *atom
        }
 
        if (dstStrLen > 3)
-               snprintf(*dst, *len, "\"%s\"", tempWkt);
+               snprintf(*dst, *len, "%s", tempWkt);
        else
                strcpy(*dst, "nil");
        return (int) dstStrLen;
@@ -544,13 +543,12 @@ wkbCOMP(wkb *l, wkb *r)
        return memcmp(l->data, r->data, len);
 }
 
+static wkb nullval = {~0};
+
 wkb *
 wkbNULL(void)
 {
-       static wkb nullval;
-
-       nullval.len = ~0;
-       return (&nullval);
+       return &nullval;
 }
 
 str
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list