[mapserver-commits] r12313 - in trunk/mapserver/mapcache: include src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:16:10 -0700 (Fri, 26 Aug 2011)
New Revision: 12313

Modified:
   trunk/mapserver/mapcache/include/geocache.h
   trunk/mapserver/mapcache/src/service_tms.c
   trunk/mapserver/mapcache/src/service_wmts.c
Log:
add APR_FOPEN_SHARELOCK for older apr versions
thomas.bonfort | 2011-02-28 12:37:33 +0100 (Mon, 28 Feb 2011)

Modified: trunk/mapserver/mapcache/include/geocache.h
===================================================================
--- trunk/mapserver/mapcache/include/geocache.h	2011-08-26 11:16:05 UTC (rev 12312)
+++ trunk/mapserver/mapcache/include/geocache.h	2011-08-26 11:16:10 UTC (rev 12313)
@@ -137,7 +137,7 @@
      * \brief get human readable message for the error
      * \memberof geocache_context
      */
-    char* (*clear_errors)(geocache_context * ctx);
+    void (*clear_errors)(geocache_context * ctx);
 
 
     /**

Modified: trunk/mapserver/mapcache/src/service_tms.c
===================================================================
--- trunk/mapserver/mapcache/src/service_tms.c	2011-08-26 11:16:05 UTC (rev 12312)
+++ trunk/mapserver/mapcache/src/service_tms.c	2011-08-26 11:16:10 UTC (rev 12313)
@@ -140,7 +140,7 @@
    char *last, *key, *endptr;
    geocache_tileset *tileset = NULL;
    geocache_grid_link *grid_link = NULL;
-   char *pathinfo;
+   char *pathinfo = NULL;
    int x=-1,y=-1,z=-1;
   
    if(this->type == GEOCACHE_SERVICE_GMAPS) {

Modified: trunk/mapserver/mapcache/src/service_wmts.c
===================================================================
--- trunk/mapserver/mapcache/src/service_wmts.c	2011-08-26 11:16:05 UTC (rev 12312)
+++ trunk/mapserver/mapcache/src/service_wmts.c	2011-08-26 11:16:10 UTC (rev 12313)
@@ -295,7 +295,7 @@
    const char *str, *service = NULL, *style = NULL, *version = NULL, *layer = NULL, *matrixset = NULL,
                *matrix = NULL, *tilecol = NULL, *tilerow = NULL, *format = NULL, *extension = NULL;
    apr_table_t *dimtable = NULL;
-   geocache_tileset *tileset;
+   geocache_tileset *tileset = NULL;
    int row,col,level;
    service = apr_table_get(params,"SERVICE");
    if(service) {