Changeset 933 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c

Timestamp:

May 31, 2019, 3:03:21 PM (5 years ago)

Author:

knut

Message:

Resolve certain string-related type conflicts, e.g., char* vs. const char* or char[N], that may cause errors in some build environments. Resolve a problem with the include order of fcgi_stdio.h (note: should verify that this harmonizes with resolution of same problem in trunk).

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c (modified) (1 diff)

branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c

@@ -1288 +1288 @@
    * First store the value on disk
    */
+  static char DATA[] = "data";
+  static char JSON[] = "json";
   int imyIndex=getPublishedId(outputs);
   map* mime=getMapArray(outputs->content,"mimeType",imyIndex);
   map* msUrl=getMapFromMaps(conf,"main","mapserverAddress");
   map* dataPath=getMapFromMaps(conf,"main","dataPath");
-  char *ext="data";
-  if(mime!=NULL)
-    if(strncasecmp(mime->value,"application/json",16)==0)
-      ext="json";
+  char *ext = DATA;
+  if (mime != NULL)
+    if (strncasecmp(mime->value, "application/json", 16) == 0)
+      ext = JSON;
 
   map* storage=getMapArray(outputs->content,"storage",imyIndex);