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

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

@@ -127 +127 @@
     maps* tmpConf=createMaps("main");
     tmpConf->content=createMap("memory","load");
-    hInternet=InternetOpen("ZooWPSClient\0",
+    static char PROC_NAME[] = "ZooWPSClient";
+    hInternet=InternetOpen(PROC_NAME,
                            INTERNET_OPEN_TYPE_PRECONFIG,
                            NULL,NULL, 0);
@@ -435 +436 @@
       maps* curs=inputs;
       dumpMaps(curs);
-      char *keys[11][2]={
+      const char *keys[11][2]={
         {
           "xlink:href",
@@ -614 +615 @@
       maps* curs=outputs;
       dumpMaps(curs);
-      char *keys[10][2]={
+      const char *keys[10][2]={
         {
           "Reference",
@@ -656 +657 @@
         }       
       };
-      char* specifics[5][2]={
+      const char* specifics[5][2]={
         {
           "download_link",
@@ -767 +768 @@
     case 6: {
       // Finalize HPC
-      char *keys[6][2]={
+      const char *keys[6][2]={
         {
           //"SubmitTime",