Changeset 887 for branches/prototype-v0/zoo-project/zoo-kernel

Timestamp:

Oct 15, 2018, 1:09:48 PM (6 years ago)

Author:

djay

Message:

Fix double definition of the m maps pointer.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c (modified) (2 diffs)

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

@@ -906 +906 @@
         char *filePath=(char*)malloc((strlen(tmpPath->value)+strlen(jobid->value)+15)*sizeof(char));
         sprintf(filePath,"%s/exec_status_%s",tmpPath->value,jobid->value);
-        maps* m = (maps *) malloc (MAPS_SIZE);
-        m->child=NULL;
-        m->next=NULL;
+        maps* lm = (maps *) malloc (MAPS_SIZE);
+        lm->child=NULL;
+        lm->next=NULL;
         int saved_stdout = dup (fileno (stdout));
         dup2 (fileno (stderr), fileno (stdout));
-        conf_read(filePath,m);
+        conf_read(filePath,lm);
         //dumpMaps(m);
         fflush(stdout);
@@ -918 +918 @@
         unlink(filePath);
         free(filePath);
-        addMapsToMaps(main_conf,m);
-        freeMaps(&m);
-        free(m);
+        addMapsToMaps(main_conf,lm);
+        freeMaps(&lm);
+        free(lm);
 
         input=*real_outputs;