Changeset 653 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Jun 12, 2015, 1:12:32 PM (9 years ago)

Author:

djay

Message:

Small fixes for building on GNU/Linux.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -57 +57 @@
   FILE* f0 = fopen (fbkpid, "r");
   if(f0!=NULL){
+    long flen;
+    char *fcontent;
     fseek (f0, 0, SEEK_END);
-    long flen = ftell (f0);
+    flen = ftell (f0);
     fseek (f0, 0, SEEK_SET);
-    char *tmps1 = (char *) malloc ((flen + 1) * sizeof (char));
-    fread(tmps1,flen,1,f0);
-    tmps1[flen]=0;
+    fcontent = (char *) malloc ((flen + 1) * sizeof (char));
+    fread(fcontent,flen,1,f0);
+    fcontent[flen]=0;
     fclose(f0);
-    return tmps1;
+    return fcontent;
   }else
     return NULL;
@@ -188 +190 @@
   FILE* f0 = fopen (fbkpid, "r");
   if(f0!=NULL){
-    char* stat=getStatusId(conf,lid);
+    semid lockid;
+    char* stat;
+    long flen;
+    stat=getStatusId(conf,lid);
     if(stat!=NULL){
       setMapInMaps(conf,"lenv","lid",stat);
-      semid lockid=acquireLock(conf);
+      lockid=acquireLock(conf);
       if(lockid<0)
         return NULL;
     }
     fseek (f0, 0, SEEK_END);
-    long flen = ftell (f0);
+    flen = ftell (f0);
     if(flen>0){
+      char *fcontent;
       fseek (f0, 0, SEEK_SET);
-      char *tmps1 = (char *) malloc ((flen + 1) * sizeof (char));
-      fread(tmps1,flen,1,f0);
-      tmps1[flen]=0;
+      fcontent = (char *) malloc ((flen + 1) * sizeof (char));
+      fread(fcontent,flen,1,f0);
+      fcontent[flen]=0;
       fclose(f0);
       free(fbkpid);
@@ -208 +214 @@
         free(stat);
       }
-      return tmps1;
+      return fcontent;
     }
     fclose(f0);