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

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

@@ -32 +32 @@
 #include <assert.h>
 #include <ctype.h>
-#include "fcgi_stdio.h"
 
 /**
@@ -270 +269 @@
 char* getProvenance(maps* conf,const char* url){
   map* sharedCache=getMapFromMaps(conf,"security","shared");
-  char *res="OTHER";
-  char *paths[2]={
+  //char *res="OTHER"; 
+  static char OTHER[] = "OTHER"; 
+  static char SHARED[] = "SHARED";
+  static char LOCAL[] = "LOCAL";
+  const char *paths[2]={ 
     "mapserverAddress",
     "tmpUrl"
@@ -280 +282 @@
     while(curs!=NULL){
       if(strstr(url,curs)==NULL){
-        return "SHARED";
+        return SHARED;
       }
       curs=strtok(NULL,",");
@@ -289 +291 @@
     if(sharedCache!=NULL){
       if(strstr(url,sharedCache->value)!=NULL){
-        return "LOCAL";
-      }
-    }
-  }
-  return res;
+        return LOCAL;
+      }
+    }
+  }
+  //return res;
+  return OTHER;
 }