Changeset 890 for branches/prototype-v0/zoo-project/zoo-kernel/server_internal.c

Timestamp:

Jan 9, 2019, 4:11:59 PM (5 years ago)

Author:

djay

Message:

Make this ZOO-Kernel working properly on windows platform again.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/server_internal.c (modified) (7 diffs)

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

@@ -367 +367 @@
  */
 void readGeneratedFile(maps* m,map* content,char* filename){
+  char rsize[1024];
   FILE * file=fopen(filename,"rb");
   if(file==NULL){
@@ -374 +375 @@
   fseek(file, 0, SEEK_END);
   long count = ftell(file);
+  sprintf(rsize,"%lld",ftell(file));
   rewind(file);
-  struct stat file_status; 
-  stat(filename, &file_status);
   if(getMap(content,"storage")==NULL){
     map* tmpMap1=getMap(content,"value");
@@ -391 +391 @@
     tmpMap1->value[count]=0;
   }
-  fclose(file);
-  char rsize[1000];
-  sprintf(rsize,"%ld",count);
+  fclose(file);  
   addToMap(content,"size",rsize);
 }
@@ -760 +758 @@
               map* tmpV=getMap(tmpI->content,"value");
               if(tmpV!=NULL){
-                char *tmpVS=strdup(tmpV->value);
+                char *tmpVS=zStrdup(tmpV->value);
                 map* tmp=parseBoundingBox(tmpVS);
                 free(tmpVS);
@@ -797 +795 @@
               map* length=getMap(tmpMaps->content,"length");
               int i;
-              char *tcn=strdup(tmpContent->name);
+              char *tcn=zStrdup(tmpContent->name);
               for(i=1;i<atoi(length->value);i++){
 #ifdef DEBUG
@@ -1007 +1005 @@
           char* tmpStr=_getStatus(conf,pid);
           if(tmpStr!=NULL && strncmp(tmpStr,"-1",2)!=0){
-            char *tmpStr1=strdup(tmpStr);
-            char *tmpStr0=strdup(strstr(tmpStr,"|")+1);
+            char *tmpStr1=zStrdup(tmpStr);
+            char *tmpStr0=zStrdup(strstr(tmpStr,"|")+1);
             free(tmpStr);
             tmpStr1[strlen(tmpStr1)-strlen(tmpStr0)-1]='\0';
@@ -1043 +1041 @@
           char* tmpStr=_getStatus(conf,pid);
           if(tmpStr!=NULL && strncmp(tmpStr,"-1",2)!=0){
-            char *tmpStr1=strdup(tmpStr);
-            char *tmpStr0=strdup(strstr(tmpStr,"|")+1);
+            char *tmpStr1=zStrdup(tmpStr);
+            char *tmpStr0=zStrdup(strstr(tmpStr,"|")+1);
             free(tmpStr);
             tmpStr1[strlen(tmpStr1)-strlen(tmpStr0)-1]='\0';