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

Timestamp:

May 10, 2014, 4:23:03 PM (10 years ago)

Author:

djay

Message:

Remove leaks from DescribeProcess? and JavaScript? support. Fix wrong ulinet update on previous commit. Use the new updateStatus/setOutputValue functions as described in #88 from longProcess. Add default value for QREncode service in ZCFG. Fix name of profile service in the ZCFG file.

File:

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

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

@@ -423 +423 @@
     if(hasKey(m,n)==false){
       map* _cursor=m;
-      while(_cursor->next!=NULL)
-        _cursor=_cursor->next;
-      _cursor->next=createMap(n,v);
+      if(_cursor->next!=NULL){
+        addToMap(_cursor->next,n,v);
+      }else
+        _cursor->next=createMap(n,v);
     }
     else{
@@ -455 +456 @@
         }
         else{
-          if(tmp1->value!=NULL)
-            free(tmp1->value);
-          tmp1->value=zStrdup(tmp->value);
+          addToMap(*mo,tmp->name,tmp->value);
         }
       }
@@ -480 +479 @@
   }
 
-  static map* getMapOrFill(map* m,const char *key,char* value){
-    map* tmp=m;
+  static map* getMapOrFill(map** m,const char *key,char* value){
+    map* tmp=*m;
     map* tmpMap=getMap(tmp,key);
     if(tmpMap==NULL){
       if(tmp!=NULL)
-        addToMap(tmp,key,value);
+        addToMap(*m,key,value);
       else
-        tmp=createMap(key,value);
-      tmpMap=getMap(tmp,key);
+        (*m)=createMap(key,value);
+      tmpMap=getMap(*m,key);
     }
     return tmpMap;
@@ -611 +610 @@
       fprintf(stderr,"%s\n",tmpSize->value);
 #endif
-      map* ptr=getMapOrFill(m,tmp,(char *)"");
+      map* ptr=getMapOrFill(&m,tmp,(char *)"");
       free(ptr->value);
       ptr->value=(char*)malloc((atoi(tmpSize->value)+1)*sizeof(char));