[mapserver-commits] r9417 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-10-08 12:56:13 -0400 (Thu, 08 Oct 2009)
New Revision: 9417

Modified:
   trunk/mapserver/maplayer.c
Log:
Rolled back r9406 since it's not a necessary change and I'd prefer to leave well enough alone.

Modified: trunk/mapserver/maplayer.c
===================================================================
--- trunk/mapserver/maplayer.c	2009-10-08 16:53:47 UTC (rev 9416)
+++ trunk/mapserver/maplayer.c	2009-10-08 16:56:13 UTC (rev 9417)
@@ -395,12 +395,8 @@
   **   note: if we don't reset then the items array is fully populated will ALL items
   */
   if(!get_all) {    
-    layer->items = (char **) calloc(numitems, sizeof(char *)); /* should be more than enough space */
-    if(!layer->items) {
-      msSetError(MS_MEMERR, NULL, "msLayerWhichItems()");
-      return MS_FAILURE;
-    }
-    layer->numitems = 0;
+    rv = layer->vtable->LayerCreateItems(layer, numitems);
+    if(rv != MS_SUCCESS) return rv;
     freeitems = MS_TRUE;
   }