Changeset 59 for trunk/zoo-kernel/zoo_service_loader.c

Timestamp:

Jan 6, 2011, 10:50:56 PM (13 years ago)

Author:

djay

Message:

Small fix for binary string support in dupMaps function to ensure that the binary value willbe passed to various laguages correctly. Memory cleanup.

File:

• trunk/zoo-kernel/zoo_service_loader.c (modified) (4 diffs)

trunk/zoo-kernel/zoo_service_loader.c

@@ -954 +954 @@
                 map* tmpMap=getMap(tmpmaps->content,"value");
                 if(tmpMap!=NULL){
+                  free(tmpMap->value);
                   tmpMap->value=(char*)malloc((res.nDataLen+1)*sizeof(char));
                   memmove(tmpMap->value,tmpContent,(res.nDataLen)*sizeof(char));
                   tmpMap->value[res.nDataLen]=0;
-                  fprintf(stderr,"%d = %d ?\n",res.nDataLen/sizeof(char),strlen(tmpContent));
-                  if(strlen(tmpContent)!=res.nDataLen/sizeof(char)){
+                  if(strlen(tmpContent)!=res.nDataLen){
                     char tmp[256];
-                    sprintf(tmp,"%d",res.nDataLen);
+                    sprintf(tmp,"%d",res.nDataLen*sizeof(char));
                     addToMap(tmpmaps->content,"size",tmp);
                   }
-                  /*FILE* fd=fopen("/tmp/test.png","w");
-                  fwrite(tmpContent,1,(res.nDataLen)*sizeof(char),fd);
-                  fclose(fd);
-                  dumpMap(tmpMap);*/
                 }
                 free(tmpContent);
@@ -982 +978 @@
         else
           addMapsToMaps(&request_input_real_format,tmpmaps);
-        /*freeMap(&tmpmaps->content);
-        free(tmpmaps->content);
-        tmpmaps->content=NULL;*/
         freeMaps(&tmpmaps);
         free(tmpmaps);
-          //}
         tmpmaps=NULL;
         free(tmp);
@@ -1805 +1797 @@
   freeService(&s1);
   free(s1);
-  //For Python language support only
-  //freeMaps(&m);
+  freeMaps(&m);
   free(m);
   
@@ -1812 +1803 @@
   free(request_input_real_format);
   
-  /* The following is requested but get issue using with Python support :/ */
-  /* freeMaps(&request_output_real_format);
-     free(request_output_real_format);*/
+  freeMaps(&request_output_real_format);
+  free(request_output_real_format);
   
   free(REQUEST);