Changeset 851 for branches/prototype-v0/zoo-project/zoo-kernel/response_print.c

Timestamp:

Aug 31, 2017, 4:14:46 PM (7 years ago)

Author:

djay

Message:

Invoke callback asynchronously. Still the ZOO-Kernel has still to wait for every requests to finish before stoping its execution.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/response_print.c (modified) (6 diffs)

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

@@ -2667 +2667 @@
 #endif
       map *gfile=getMap(tmpI->content,"generated_file");
-      char *file_name;
+      char *file_name=NULL;
       if(gfile!=NULL){
         gfile=getMap(tmpI->content,"expected_generated_file");
@@ -2676 +2676 @@
         file_name=zStrdup((gfile->value)+strlen(tmp1->value));
       }
-
       toto=getMap(tmpI->content,"asReference");
 #ifdef USE_MS
@@ -2714 +2713 @@
               getFileExtension(mtype != NULL ? mtype->value : NULL, file_ext, 32);
             }
-
+            if(file_name!=NULL)
+              free(file_name);
             file_name=(char*)malloc((strlen(s->name)+strlen(usid->value)+strlen(file_ext)+strlen(tmpI->name)+45)*sizeof(char));
             sprintf(file_name,"%s_%s_%s_%d.%s",s->name,tmpI->name,usid->value,itn,file_ext);
@@ -2761 +2761 @@
           free(file_name);
           free(file_url);
-          
+          file_name=NULL;
         }
 #ifdef USE_MS
@@ -2770 +2770 @@
       }
 #endif
+      if(file_name!=NULL){
+        free(file_name);
+        file_name=NULL;
+      }
       tmpI=tmpI->next;
     }
@@ -2777 +2781 @@
       if(tmpI!=NULL)
         goto NESTED0;
-    }
+    }    
 #ifdef DEBUG
     fprintf(stderr,"SERVICE : %s\n",s->name);