MonetDB: Apr2011 - Don't use variables with the same name as types.

[Sjoerd Mullender]

Changeset: 44c0d93a9a09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44c0d93a9a09
Modified Files:
        geom/monetdb5/geom.mx
Branch: Apr2011
Log Message:

Don't use variables with the same name as types.


diffs (39 lines):

diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -629,8 +629,8 @@
 )
 {
        GEOSGeom geosGeometry = NULL; /* The geometry object that is parsed 
from the src string. */
-       unsigned char* wkb = NULL; /* The "well known binary" serialization of 
the geometry object. */
-       size_t wkbLen = 0; /* The length of the wkb string. */
+       unsigned char* wkbSer = NULL; /* The "well known binary" serialization 
of the geometry object. */
+       size_t wkbLen = 0; /* The length of the wkbSer string. */
        int nil = 0;
 
        if (strcmp(src, str_nil) == 0) 
@@ -646,20 +646,20 @@
        }
 
        if (!nil) {
-               wkb = GEOSGeomToWKB_buf(geosGeometry, &wkbLen);
+               wkbSer = GEOSGeomToWKB_buf(geosGeometry, &wkbLen);
                GEOSGeom_destroy(geosGeometry);
        }
        if (*len < (int)wkb_size(wkbLen)) {
                if (*atom) GDKfree(*atom);
                *atom = GDKmalloc(*len = (int)wkb_size(wkbLen));
        }
-       if (!wkb) {
+       if (!wkbSer) {
                **atom = *wkbNULL();
        } else {
                assert(wkbLen <= GDK_int_max);
                (*atom)->len = (int) wkbLen;
-               memcpy(&(*atom)->data, wkb, wkbLen);
-               free(wkb);
+               memcpy(&(*atom)->data, wkbSer, wkbLen);
+               free(wkbSer);
        }
        wkbLen = strlen(src);
        assert(wkbLen <= GDK_int_max);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list