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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:08:56 -0700 (Fri, 26 Aug 2011)
New Revision: 12228

Modified:
   trunk/mapserver/mapcache/include/util.h
   trunk/mapserver/mapcache/src/tileset.c
   trunk/mapserver/mapcache/src/util.c
Log:
use apr_pvsprintf instead of vasprintf
thomas.bonfort | 2011-01-10 10:56:11 +0100 (Mon, 10 Jan 2011)

Modified: trunk/mapserver/mapcache/include/util.h
===================================================================
--- trunk/mapserver/mapcache/include/util.h	2011-08-26 11:08:51 UTC (rev 12227)
+++ trunk/mapserver/mapcache/include/util.h	2011-08-26 11:08:56 UTC (rev 12228)
@@ -24,13 +24,6 @@
 #if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 3
 
 
-/**
- * Create a hard link to the specified file.
- * @param from_path The full path to the original file (using / on all systems)
- * @param to_path The full path to the new file (using / on all systems)
- * @remark Both files must reside on the same device.
- */
-APR_DECLARE(apr_status_t) apr_file_link(const char *from_path, const char *to_path);
 
 /**
  * Create a new table whose contents are deep copied from the given
@@ -46,6 +39,17 @@
 
 #endif
 
+#if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 4
 
+/**
+ * Create a hard link to the specified file.
+ * @param from_path The full path to the original file (using / on all systems)
+ * @param to_path The full path to the new file (using / on all systems)
+ * @remark Both files must reside on the same device.
+ */
+APR_DECLARE(apr_status_t) apr_file_link(const char *from_path, const char *to_path);
 
+#endif
+
+
 #endif /* UTIL_H_ */

Modified: trunk/mapserver/mapcache/src/tileset.c
===================================================================
--- trunk/mapserver/mapcache/src/tileset.c	2011-08-26 11:08:51 UTC (rev 12227)
+++ trunk/mapserver/mapcache/src/tileset.c	2011-08-26 11:08:56 UTC (rev 12228)
@@ -294,7 +294,7 @@
       /* the previous step has successfully finished, we can now query the cache to return the tile content */
       ret = tile->tileset->cache->tile_get(ctx, tile);
       if(ret != GEOCACHE_SUCCESS) {
-         ctx->set_error(ctx, GEOCACHE_TILESET_ERROR, "tileset %s: failed to re-get tile from cache after set", tile->tileset->name);
+         ctx->set_error(ctx, GEOCACHE_TILESET_ERROR, "tileset %s: failed to re-get tile %d %d %d from cache after set", tile->tileset->name,tile->x,tile->y,tile->z);
       }
    }
 }

Modified: trunk/mapserver/mapcache/src/util.c
===================================================================
--- trunk/mapserver/mapcache/src/util.c	2011-08-26 11:08:51 UTC (rev 12227)
+++ trunk/mapserver/mapcache/src/util.c	2011-08-26 11:08:56 UTC (rev 12228)
@@ -76,8 +76,8 @@
 }
 
 
-#if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 3
 
+#if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 4
 APR_DECLARE(apr_status_t) apr_file_link(const char *from_path, 
                                           const char *to_path)
 {
@@ -86,7 +86,9 @@
     }
     return APR_SUCCESS;
 }
+#endif
 
+#if APR_MAJOR_VERSION < 2 && APR_MINOR_VERSION < 3
 APR_DECLARE(apr_table_t *) apr_table_clone(apr_pool_t *p, const apr_table_t *t)
 {
     const apr_array_header_t *array = apr_table_elts(t);