Changeset 933 for branches/prototype-v0/zoo-project/zoo-kernel/server_internal.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/server_internal.c (modified) (4 diffs)

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

@@ -601 +601 @@
  */
 char* addDefaultValues(maps** out,elements* in,maps* m,int type,map** err){
+  static char EMPTY[] = "";
   map *res=*err;
   elements* tmpInputs=in;
@@ -738 +739 @@
            * content map.
            */
-          char* keys[4]={
+          const char* keys[4]={
             "minOccurs",
             "maxOccurs",
@@ -882 +883 @@
     return result;
   }
-  return "";
+  return EMPTY;
 }
 
@@ -1133 +1134 @@
     map* statusInfo=createMap("JobID",pid);
     addToMap(statusInfo,"Status","Dismissed");
-    printStatusInfo(conf,statusInfo,"Dismiss");
+    printStatusInfo(conf,statusInfo, (char*) "Dismiss");
     free(statusInfo);
   }