Make sure all the public function names and arguments are aligned.

MapServer · Feb 10, 2017 · 47c55e0 · 47c55e0
1 parent 3d62e1c
commit 47c55e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/mapmvt.c b/mapmvt.c
@@ -312,14 +312,14 @@ static void freeMvtTile( VectorTile__Tile *mvt_tile ) {
   free(mvt_tile->layers);
 }
 
-int msMVTSetup(mapObj *map)
+int msMVTSetup( mapObj *map )
 {
   /* Ensure all the LAYERs have a projection. */
   if( msMapSetLayerProjections(map) != 0 ) return(MS_FAILURE);
 
   /* Set output projection to spherical Mercator. */
   if( msLoadProjectionString(&(map->projection), SPHEREMERC_PROJ4) != 0 ) {
-    msSetError(MS_CGIERR, "Unable to load projection string.", "msMVTSetup()");
+    msSetError(MS_MISCERR, "Unable to load projection string.", "msMVTSetup()");
     return MS_FAILURE;
   }
 
@@ -500,16 +500,18 @@ int msPopulateRendererVTableMVT(rendererVTableObj * renderer) {
   return MS_SUCCESS;
 }
 #else
-
 int msPopulateRendererVTableMVT(rendererVTableObj * renderer) {
-  msSetError(MS_MISCERR, "Vector Tile Driver requested but support is not compiled in",
-             "msPopulateRendererVTableMVT()");
+  msSetError(MS_MISCERR, "Vector Tile Driver requested but support is not compiled in", "msPopulateRendererVTableMVT()");
+  return MS_FAILURE;
+}
+
+int msMVTSetup( mapObj *map ) {
+  msSetError(MS_MISCERR, "Vector Tile support is not available.", "msMVTSetup()");
   return MS_FAILURE;
 }
 
 int msMVTWriteTile( mapObj *map, int sendheaders ) {
-  msSetError(MS_MISCERR, "Vector Tile support is not available.",
-             "msMVTWriteTile()");
+  msSetError(MS_MISCERR, "Vector Tile support is not available.", "msMVTWriteTile()");
   return MS_FAILURE;
 }
 #endif
diff --git a/mapserver.h b/mapserver.h
@@ -3022,7 +3022,9 @@ void msPopulateTextSymbolForLabelAndString(textSymbolObj *ts, labelObj *l, char
   MS_DLL_EXPORT int msPopulateRendererVTableKML( rendererVTableObj *renderer );
   MS_DLL_EXPORT int msPopulateRendererVTableOGR( rendererVTableObj *renderer );
   MS_DLL_EXPORT int msPopulateRendererVTableMVT( rendererVTableObj *renderer );
-  MS_DLL_EXPORT int msMVTWriteFromQuery( mapObj *map, outputFormatObj *format, int sendheaders );
+
+  MS_DLL_EXPORT int msMVTSetup( mapObj *map );
+  MS_DLL_EXPORT int msMVTWriteTile( mapObj *map, int sendheaders );
 
 #ifdef USE_CAIRO
   MS_DLL_EXPORT void msCairoCleanup(void);