Changeset 268 for branches/branch-1.2/zoo-kernel/service.h

Timestamp:

Jul 16, 2011, 12:58:47 PM (13 years ago)

Author:

djay

Message:

Merge branch-1.2 to current rev. 267. Tag release-1.2.0-rc2.

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-kernel/service.h (modified) (3 diffs)

branches/branch-1.2/zoo-kernel/service.h

@@ -124 +124 @@
     map* tmp=t;
     while(tmp!=NULL){
-      fprintf(file,"%s = %s\n",t->name,t->value);
+      fprintf(stderr,"%s = %s\n",tmp->name,tmp->value);
+      fprintf(file,"%s = %s\n",tmp->name,tmp->value);
       tmp=tmp->next;
     }
@@ -138 +139 @@
   }
 
-  static void dumpMapsToFile(maps* m,FILE* file){
+  static void dumpMapsToFile(maps* m,char* file_path){
+    FILE* file=fopen(file_path,"w");
     maps* tmp=m;
     if(tmp!=NULL){
       fprintf(file,"[%s]\n",tmp->name);
       dumpMapToFile(tmp->content,file);
-    }
+      fflush(file);
+    }
+    fclose(file);
   }
 
@@ -549 +553 @@
         map* tmpV=getMap(res->content,"value");
         free(tmpV->value);
-        tmpV->value=(char*)malloc(atoi(tmp->value)*sizeof(char));
+        tmpV->value=(char*)malloc((atoi(tmp->value)+1)*sizeof(char));
         memmove(tmpV->value,tmpSized,atoi(tmp->value)*sizeof(char));
+        tmpV->value[atoi(tmp->value)]=0;
         free(tmpSized);
       }