Changeset 490 for trunk/zoo-project/zoo-kernel/service.h

Timestamp:

Jun 27, 2014, 1:14:39 AM (10 years ago)

Author:

djay

Message:

Remove memory leaks from ZOO-Kernel. Fix issue #99.

File:

• trunk/zoo-project/zoo-kernel/service.h (modified) (7 diffs)

trunk/zoo-project/zoo-kernel/service.h

@@ -61 +61 @@
 #include <string.h>
 #ifndef WIN32
+#ifndef bool
 #define bool int
+#endif
+#ifndef true
 #define true 1
 #define false -1
+#endif
 #else
   //#include <stdbool.h>
@@ -422 +426 @@
     if(hasKey(m,n)==false){
       map* _cursor=m;
-      if(_cursor->next!=NULL){
-        addToMap(_cursor->next,n,v);
-      }else
-        _cursor->next=createMap(n,v);
+      while(_cursor->next!=NULL){
+        _cursor=_cursor->next;
+      }
+      _cursor->next=createMap(n,v);
     }
     else{
@@ -478 +482 @@
   }
 
-  static map* getMapOrFill(map** m,const char *key,char* value){
+  static map* getMapOrFill(map** m,const char *key,const char* value){
     map* tmp=*m;
     map* tmpMap=getMap(tmp,key);
     if(tmpMap==NULL){
-      if(tmp!=NULL)
-        addToMap(*m,key,value);
+      if(tmp!=NULL){
+        addToMap((*m),key,value);
+      }
       else
         (*m)=createMap(key,value);
@@ -580 +585 @@
   }
 
-  static map* getMapArray(map* m,char* key,int index){
+  static map* getMapArray(map* m,const char* key,int index){
     char tmp[1024];
     if(index>0)
@@ -659 +664 @@
     addToMap(_cursor->content,"length",tmpLen);
     int i=0;
-    map* tmpSizeI=getMap(tmp->content,tmpV[i]);
     for(i=0;i<8;i++){
       map* tmpVI=getMap(tmp->content,tmpV[i]);
@@ -887 +891 @@
 
   static void dumpServiceAsYAML(service* s){
-    int level=0;
     int i;
     fprintf(stderr,"# %s\n\n",s->name);
@@ -905 +908 @@
     }
     if(s->inputs!=NULL){
-      fprintf(stderr,"\ninputs:\n",s->name);
+      fprintf(stderr,"\ninputs:\n");
       dumpElementsAsYAML(s->inputs);
     }
     if(s->outputs!=NULL){
-      fprintf(stderr,"\noutputs:\n",s->name);
+      fprintf(stderr,"\noutputs:\n");
       dumpElementsAsYAML(s->outputs);
     }