Changeset 921 for trunk

Timestamp:

May 27, 2019, 3:03:29 PM (6 years ago)

Author:

djay

Message:

Fix issue building with gcc 7.3.0

Location:

trunk/zoo-project/zoo-kernel

Files:

• caching.c (modified) (1 diff)
• mimetypes.h (modified) (2 diffs)
• response_print.c (modified) (2 diffs)
• response_print.h (modified) (4 diffs)
• server_internal.c (modified) (1 diff)
• server_internal.h (modified) (2 diffs)
• service_internal.c (modified) (1 diff)
• service_internal_ms.c (modified) (2 diffs)
• service_internal_ms.h (modified) (2 diffs)
• service_internal_python.c (modified) (1 diff)
• sqlapi.c (modified) (1 diff)
• sqlapi.h (modified) (1 diff)
• ulinet.h (modified) (1 diff)
• zoo_service_loader.c (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/caching.c

@@ -759 +759 @@
   
   char ltmp1[256];
-  sprintf(ltmp1,"%ld",fsize);
+  sprintf(ltmp1,"%lld",fsize);
   addToMap(*content,"size",ltmp1);
   if(cached==NULL){

trunk/zoo-project/zoo-kernel/mimetypes.h

@@ -839 +839 @@
 
 static int isGeographic(const char* mimeType){
-  char* imageMimeType[4]={
+  const char* imageMimeType[4]={
     "image/tiff",
     "image/png",
@@ -845 +845 @@
     "application/vnd.google-earth.kmz"
   };
-  char* vectorMimeType[5]={
+  const char* vectorMimeType[5]={
     "text/xml",
     "application/json",

trunk/zoo-project/zoo-kernel/response_print.c

@@ -24 +24 @@
 
 #include "service.h"
+#include "service_internal.h"
+#include "server_internal.h"
 #include "response_print.h"
-#include "request_parser.h"
-#include "server_internal.h"
-#include "service_internal.h"
 #ifdef USE_MS
 #include "service_internal_ms.h"
@@ -35 +34 @@
 #ifdef USE_CALLBACK
 #include "service_callback.h"
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE -1
 #endif
 

trunk/zoo-project/zoo-kernel/response_print.h

@@ -64 +64 @@
 #include <sys/stat.h>
 #include <sys/types.h>
+//#include "cgic.h"
 #ifndef WIN32
 #include <sys/ipc.h>
@@ -83 +84 @@
 #include <locale.h> // knut: this appears to be a non-standard header file that has been removed in newer versions of glibc; it may be sufficient to include <locale.h> (see above) 
 #endif
-#include "ulinet.h"
 
 #include "service.h"
@@ -96 +96 @@
 #include <libxml/xpath.h>
 
-#include "cgic.h"
-
 #ifdef __cplusplus
 extern "C" {
@@ -173 +171 @@
    * Definitions of root node for response depending on the request and the WPS version
    */
-  static const char root_nodes[2][4][20]={
+  static const char* root_nodes[2][4]={
     {"ProcessOfferings","ProcessDescriptions","ExecuteResponse",NULL},
     {"Contents","ProcessOfferings","Result",NULL}

trunk/zoo-project/zoo-kernel/server_internal.c

@@ -738 +738 @@
            * content map.
            */
-          char* keys[4]={
+          const char* keys[4]={
             "minOccurs",
             "maxOccurs",

trunk/zoo-project/zoo-kernel/server_internal.h

@@ -29 +29 @@
 #ifndef IMPORTSERVICE
 #define IMPORTSERVICE "include" // default name of [include] block in main.cfg
-#endif
 
-#include "ulinet.h"
 #include "service.h"
 #include <openssl/sha.h>
@@ -79 +77 @@
 }
 #endif
+
+#endif

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -874 +874 @@
     VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
     VSIStatBufL file_status;
-    VSIStatL(dataSource, &file_status);
-    if(fichier==NULL){
+    int res=VSIStatL(dataSource, &file_status);
+    if(fichier==NULL || res<0){
       char tmp[1024];
-      sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %lld.",
+      sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %ld.",
               dataSource,file_status.st_size);
       setMapInMaps(conf,"lenv","message",tmp);

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -860 +860 @@
       char extent[1024];
       memset(&extent,0,1024);
-      sprintf(extent,"%d,%d,%d,%d",oExt.MinX, oExt.MinY, oExt.MaxX, oExt.MaxY);
+      sprintf(extent,"%f,%f,%f,%f",oExt.MinX, oExt.MinY, oExt.MaxX, oExt.MaxY);
       setMapArray(output->content,"boundingbox",imyIndex,extent);
     }
@@ -1090 +1090 @@
       char extent[1024];
       memset(&extent,0,1024);
-      sprintf(extent,"%d,%d,%d,%d",minX,minY,maxX,maxY);
+      sprintf(extent,"%f,%f,%f,%f",minX,minY,maxX,maxY);
       setMapArray(output->content,"boundingbox",imyIndex,extent);
     }

trunk/zoo-project/zoo-kernel/service_internal_ms.h

@@ -26 +26 @@
 
 #include <sys/stat.h>
-#include "service_internal.h"
 #include "service.h"
 #include "cpl_conv.h"
@@ -33 +32 @@
 #include "gdal.h"
 #include "ogr_srs_api.h"
-#include "ulinet.h"
 #ifdef WIN32
 #include <unistd.h>

trunk/zoo-project/zoo-kernel/service_internal_python.c

@@ -151 +151 @@
 
 #ifdef WIN32
-  char* os_pathsep = ";";
+  const char* os_pathsep = ";";
 #else
-  char* os_pathsep = ":";
+  const char* os_pathsep = ":";
 #endif
 

trunk/zoo-project/zoo-kernel/sqlapi.c

@@ -58 +58 @@
  * @return the OGR connection string
  */
-char* _createInitString(maps* conf,const char* key){
+const char* _createInitString(maps* conf,const char* key){
   char* res=NULL;
   char keywords[6][14]={

trunk/zoo-project/zoo-kernel/sqlapi.h

@@ -53 +53 @@
   
 #ifdef META_DB
-  ZOO_DLL_EXPORT char* _createInitString(maps*,const char*);
+  ZOO_DLL_EXPORT const char* _createInitString(maps*,const char*);
   ZOO_DLL_EXPORT int _init_sql(maps*,const char*);
   ZOO_DLL_EXPORT OGRLayer *fetchSql(maps*,int,const char*);

trunk/zoo-project/zoo-kernel/ulinet.h

@@ -24 +24 @@
 
 #ifndef _ULINET_H
-#define _ULINET_H
+#define _ULINET_H 1
 
+#include "fcgi_stdio.h"
 #include <stdlib.h>
 #include <fcntl.h>

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -45 +45 @@
 #endif
 
+#ifdef USE_PYTHON
+#include "service_internal_python.h"
+#endif
+
 #include "cgic.h"
 
@@ -72 +76 @@
 #ifdef META_DB
 #include "meta_sql.h"
-#endif
-
-#ifdef USE_PYTHON
-#include "service_internal_python.h"
 #endif