[mapserver-commits] r11724 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-18 12:06:50 -0700 (Wed, 18 May 2011)
New Revision: 11724

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapunion.c
Log:
Fix for the warnings in mapunion.c (#3880)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-05-18 15:51:25 UTC (rev 11723)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-05-18 19:06:50 UTC (rev 11724)
@@ -15,6 +15,8 @@
 Version 6.0.1 (SVN branch-6-0):
 ---------------------------
 
+- Fix for the warnings in mapunion.c (#3880)
+
 - Fixed the build problem in mapunion.c (#3877)
 
 - Union layer: Fixed the crash when styling source layers using attributes (#3870)

Modified: branches/branch-6-0/mapserver/mapunion.c
===================================================================
--- branches/branch-6-0/mapserver/mapunion.c	2011-05-18 15:51:25 UTC (rev 11723)
+++ branches/branch-6-0/mapserver/mapunion.c	2011-05-18 19:06:50 UTC (rev 11724)
@@ -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));