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

Timestamp:

Feb 5, 2015, 7:17:31 PM (8 years ago)

Author:

knut

Message:

Changed the WIN32 version of function zGettimeofday. Changed return type for getShmLockId (WIN32). Changed type of _HINTERNET.mimeType from unsigned char* to char*. Fixed interconnected memory issues in functions getKeyValue and getShmLockId (WIN32). Added code to transfer the correct unique process identifier (usid) to background processes (applies to WIN32 version).

File:

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

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

@@ -124 +124 @@
 #define SHMEMSIZE 4096
 
-char* getKeyValue(maps* conf){
-  if(conf==NULL)
-     return "700666";
+size_t getKeyValue(maps* conf, char* key, size_t length){
+  
+  if(conf==NULL) {
+         strncpy(key, "700666", length);
+         return strlen(key);
+  }
+  
   map *tmpMap=getMapFromMaps(conf,"lenv","lid");
   if(tmpMap==NULL)
-    tmpMap=getMapFromMaps(conf,"lenv","usid");
-  char* key="-1";
+        tmpMap=getMapFromMaps(conf,"lenv","usid");
+
   if(tmpMap!=NULL){
-    key=(char*)malloc((strlen(tmpMap->value)+9)*sizeof(char));
-    sprintf(key,"zoo_sem_%s",tmpMap->value);
-  }
-  return key;
-}
-
-
+        snprintf(key, length, "zoo_sem_%s", tmpMap->value);      
+  }
+  else {
+        strncpy(key, "-1", length);  
+  }
+  return strlen(key);
+} 
 semid getShmLockId(maps* conf, int nsems){
     semid sem_id;
-    char* key=getKeyValue(conf);
+        char key[MAX_PATH];
+        getKeyValue(conf, key, MAX_PATH);
     
     sem_id = CreateSemaphore( NULL, nsems, nsems+1, key);
     if(sem_id==NULL){
-      if(strncmp(key,"-1",2)!=0)
-        free(key);
+
 #ifdef DEBUG
       fprintf(stderr,"Semaphore failed to create ! %s\n",GetLastError());
@@ -155 +159 @@
     fprintf(stderr,"%s Accessed !\n",key);
 #endif
-    if(strncmp(key,"-1",2)!=0)
-      free(key);
+
     return sem_id;
 }
@@ -3335 +3338 @@
               mimeType=strdup("none");
             else
-              mimeType=strdup((char*)hInternet->ihandle[index].mimeType);
+                  mimeType=strdup(hInternet->ihandle[index].mimeType);        
             
             map* tmpMap=getMapOrFill(&content->content,vname,"");