nGeometryName changed to pszGeometryName for naming convention consis…

…tency and add a missing free(wfsparams->pszGeometryName)
MapServer · Sep 24, 2012 · d351081 · d351081
1 parent 8931146
commit d351081
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/mapwfs.c b/mapwfs.c
@@ -2741,6 +2741,7 @@ void msWFSFreeParamsObj(wfsParamsObj *wfsparams)
     free(wfsparams->pszTypeName);
     free(wfsparams->pszFilter);
     free(wfsparams->pszBbox);
+    free(wfsparams->pszGeometryName);
     free(wfsparams->pszOutputFormat);
     free(wfsparams->pszFeatureId);
     free(wfsparams->pszSrs);

diff --git a/mapwfslayer.c b/mapwfslayer.c
@@ -218,7 +218,7 @@ static char *msBuildWFSLayerPostRequest(mapObj *map, layerObj *lp,
 {
   char *pszPostReq = NULL;
   char *pszFilter = NULL;
-  char *nGeometryName = "Geometry";
+  char *pszGeometryName = "Geometry";
   size_t bufferSize = 0;
 
   if (psParams->pszVersion == NULL ||
@@ -237,7 +237,7 @@ static char *msBuildWFSLayerPostRequest(mapObj *map, layerObj *lp,
 
 
   if (psParams->pszGeometryName) {
-    nGeometryName = psParams->pszGeometryName;
+    pszGeometryName = psParams->pszGeometryName;
   }
 
   if (psParams->pszFilter)
@@ -252,7 +252,7 @@ static char *msBuildWFSLayerPostRequest(mapObj *map, layerObj *lp,
              "<gml:coordinates>%f,%f %f,%f</gml:coordinates>\n"
              "</gml:Box>\n"
              "</ogc:BBOX>\n"
-             "</ogc:Filter>", nGeometryName, bbox->minx, bbox->miny, bbox->maxx, bbox->maxy);
+             "</ogc:Filter>", pszGeometryName, bbox->minx, bbox->miny, bbox->maxx, bbox->maxy);
   }
 
   bufferSize = strlen(pszFilter)+500;