Changeset: 8ec9508aa08c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ec9508aa08c
Modified Files:
geom/monetdb5/geom.c
Branch: geo
Log Message:
wkbAsText() rename inner-scope variable "len" to "len2",
as it otherwise hides the outer scope variable of same name (but different type)
diffs (32 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -1205,7 +1205,7 @@ str wkbAsText(char **txt, wkb **geomWKB,
} else {
char* sridTxt = "SRID:";
char* sridIntToString = NULL;
- size_t len = 0;
+ size_t len2 = 0;
//count the number of digits in srid
int tmp = (*geomWKB)->srid;
@@ -1222,8 +1222,8 @@ str wkbAsText(char **txt, wkb **geomWKB,
}
sprintf(sridIntToString, "%d", (*geomWKB)->srid);
- len =
strlen(wkt)+strlen(sridIntToString)+strlen(sridTxt)+2;
- *txt = GDKmalloc(len);
+ len2 =
strlen(wkt)+strlen(sridIntToString)+strlen(sridTxt)+2;
+ *txt = GDKmalloc(len2);
if(*txt == NULL) {
GDKfree(wkt);
GDKfree(sridIntToString);
@@ -1234,7 +1234,7 @@ str wkbAsText(char **txt, wkb **geomWKB,
memcpy(*txt+strlen(sridTxt), sridIntToString,
strlen(sridIntToString));
(*txt)[strlen(sridTxt)+strlen(sridIntToString)] = ';';
memcpy(*txt+strlen(sridTxt)+strlen(sridIntToString)+1,
wkt, strlen(wkt));
- (*txt)[len-1] = '\0';
+ (*txt)[len2-1] = '\0';
GDKfree(sridIntToString);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
