[mapserver-commits] r8194 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-12-04 13:36:59 -0500 (Thu, 04 Dec 2008)
New Revision: 8194

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwms.c
Log:
cleanup warnings with recent gcc versions (#2822)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-12-04 18:04:34 UTC (rev 8193)
+++ trunk/mapserver/HISTORY.TXT	2008-12-04 18:36:59 UTC (rev 8194)
@@ -12,6 +12,8 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- mapwms.c: cleanup warnings with recent gcc versions (#2822)
+
 - mapogcsos.c: Cleanup warning and error messages
 
 - mapagg.cpp: Fix center of rotation for truetype marker symbols 

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2008-12-04 18:04:34 UTC (rev 8193)
+++ trunk/mapserver/mapwms.c	2008-12-04 18:36:59 UTC (rev 8194)
@@ -648,7 +648,7 @@
   ** Validate first against epsg in the map and if no matching srs is found
   ** validate all layers requested.
   */
-  if (epsgbuf && strlen(epsgbuf) > 1)
+  if (epsgbuf != NULL && strlen(epsgbuf) > 1)
   {
       epsgvalid = MS_FALSE;
       projstring = msOWSGetEPSGProj(&(map->projection), &(map->web.metadata),
@@ -747,7 +747,7 @@
   ** have a projection. This will prevent problems when users forget to 
   ** explicitly set a projection on all layers in a WMS mapfile.
   */
-  if ((srsbuffer && strlen(srsbuffer) > 1) || nonsquare_enabled)
+  if ((srsbuffer != NULL && strlen(srsbuffer) > 1) || nonsquare_enabled)
   {
       projectionObj newProj;
 
@@ -761,7 +761,7 @@
       }
       
       msInitProjection(&newProj);
-      if (srsbuffer && strlen(srsbuffer) > 1 && 
+      if (srsbuffer != NULL && strlen(srsbuffer) > 1 && 
           msLoadProjectionString(&newProj, srsbuffer) != 0)
       {
           msFreeProjection(&newProj);
@@ -803,7 +803,7 @@
 
   /* apply the srs to the map file. This is only done after validating */
   /* that the srs given as parameter is valid for all layers */
-  if (srsbuffer && strlen(srsbuffer) > 1)
+  if (srsbuffer != NULL && strlen(srsbuffer) > 1)
   {
       if (msLoadProjectionString(&(map->projection), srsbuffer) != 0)
           return msWMSException(map, nVersion, NULL);