[mapserver-commits] r11725 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-18 12:07:05 -0700 (Wed, 18 May 2011)
New Revision: 11725

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapunion.c
Log:
Fix for the warnings in mapunion.c (#3880)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-05-18 19:06:50 UTC (rev 11724)
+++ trunk/mapserver/HISTORY.TXT	2011-05-18 19:07:05 UTC (rev 11725)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 ------------------------------------------------- 
 
+- Fix for the warnings in mapunion.c (#3880)
+
 - SLD: correct when same layer is used with multiple styles (#1602)
 
 - Fixed the build problem in mapunion.c (#3877)

Modified: trunk/mapserver/mapunion.c
===================================================================
--- trunk/mapserver/mapunion.c	2011-05-18 19:06:50 UTC (rev 11724)
+++ trunk/mapserver/mapunion.c	2011-05-18 19:07:05 UTC (rev 11725)
@@ -136,7 +136,7 @@
     layerinfo->layers =(layerObj*)malloc(layerCount * sizeof(layerObj));
     MS_CHECK_ALLOC(layerinfo->layers, layerCount * sizeof(layerObj), MS_FAILURE);
 
-    layerinfo->status =(layerObj*)malloc(layerCount * sizeof(int));
+    layerinfo->status =(int*)malloc(layerCount * sizeof(int));
     MS_CHECK_ALLOC(layerinfo->status, layerCount * sizeof(int), MS_FAILURE);
 
     for(i=0; i < layerCount; i++)
@@ -240,7 +240,7 @@
 }
 
 /* clean up expression tokens */
-int msUnionLayerFreeExpressionTokens(layerObj *layer)
+void msUnionLayerFreeExpressionTokens(layerObj *layer)
 {
     int i,j;
     freeExpressionTokens(&(layer->filter));