Changeset 490 for trunk/zoo-project/zoo-kernel/service_yaml.c

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_yaml.c (modified) (9 diffs)

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

@@ -144 +144 @@
     case YAML_SCALAR_TOKEN:  
       if(ttype==0){
-        cur_key=zStrdup(token.data.scalar.value);
+        cur_key=zStrdup((char *)token.data.scalar.value);
       }
       if(ttype==1){
         if(current_content==NULL){
-          current_content=createMap(cur_key,token.data.scalar.value);
+          current_content=createMap(cur_key,(char *)token.data.scalar.value);
         }else{
-          addToMap(current_content,cur_key,token.data.scalar.value);
+          addToMap(current_content,cur_key,(char *)token.data.scalar.value);
         }
         free(cur_key);
@@ -156 +156 @@
       }
 
-      if(ttype==0 && blevel==0 && level==0 && strcasecmp(token.data.scalar.value,"MetaData")==0 && blevel==0){
+      if(ttype==0 && blevel==0 && level==0 && strcasecmp((char *)token.data.scalar.value,"MetaData")==0 && blevel==0){
         addMapToMap(&my_service->content,current_content);
 #ifdef DEBUG_YAML
@@ -166 +166 @@
         wait_metadata=1;
       }
-      if(ttype==0 && blevel>0 && level>0 && strcasecmp(token.data.scalar.value,"MetaData")==0){
+      if(ttype==0 && blevel>0 && level>0 && strcasecmp((char *)token.data.scalar.value,"MetaData")==0){
         if(current_element->content==NULL && current_content!=NULL)
           addMapToMap(&current_element->content,current_content);
@@ -178 +178 @@
         wait_metadata=1;
       }
-      if(ttype==0 && strcasecmp(token.data.scalar.value,"inputs")==0 && blevel==0){
+      if(ttype==0 && strcasecmp((char *)token.data.scalar.value,"inputs")==0 && blevel==0){
         if(wait_metadata>0){
           addMapToMap(&my_service->metadata,current_content);
@@ -196 +196 @@
         level++;
       }
-      if(ttype==0 && strcasecmp(token.data.scalar.value,"outputs")==0 && blevel==1){
+      if(ttype==0 && strcasecmp((char *)token.data.scalar.value,"outputs")==0 && blevel==1){
         level++;
 #ifdef DEBUG_YAML
@@ -229 +229 @@
         }
       }
-      if(level==1 && strcasecmp(token.data.scalar.value,"default")==0){
+      if(level==1 && strcasecmp((char *)token.data.scalar.value,"default")==0){
         ilevel=0;
       }
-      if(level==1 && strcasecmp(token.data.scalar.value,"supported")==0){
+      if(level==1 && strcasecmp((char *)token.data.scalar.value,"supported")==0){
 #ifdef DEBUG_YAML
         dumpMap(current_content);
@@ -271 +271 @@
 
 
-      if(strncasecmp(token.data.scalar.value,"ComplexData",11)==0 || strncasecmp(token.data.scalar.value,"LiteralData",10)==0
-         || strncasecmp(token.data.scalar.value,"ComplexOutput",13)==0 || strncasecmp(token.data.scalar.value,"LiteralOutput",12)==0
-         || strncasecmp(token.data.scalar.value,"BoundingBoxOutput",13)==0 || strncasecmp(token.data.scalar.value,"BoundingBoxData",12)==0){
-        current_element->format=zStrdup(token.data.scalar.value);
+      if(strncasecmp((char *)token.data.scalar.value,"ComplexData",11)==0 || 
+         strncasecmp((char *)token.data.scalar.value,"LiteralData",10)==0 || 
+         strncasecmp((char *)token.data.scalar.value,"ComplexOutput",13)==0 || 
+         strncasecmp((char *)token.data.scalar.value,"LiteralOutput",12)==0 || 
+         strncasecmp((char *)token.data.scalar.value,"BoundingBoxOutput",13)==0 || 
+         strncasecmp((char *)token.data.scalar.value,"BoundingBoxData",12)==0){
+        current_element->format=zStrdup((char *)token.data.scalar.value);
         free(cur_key);
         cur_key=NULL;
@@ -324 +327 @@
         plevel=level;
         current_element=(elements*)malloc(ELEMENTS_SIZE);
-        current_element->name=strdup(token.data.scalar.value);
+        current_element->name=zStrdup((char *)token.data.scalar.value);
         current_element->content=NULL;
         current_element->metadata=NULL;
@@ -367 +370 @@
         plevel=level;
         current_element=(elements*)malloc(ELEMENTS_SIZE);
-        current_element->name=strdup(token.data.scalar.value);
+        current_element->name=zStrdup((char *)token.data.scalar.value);
         current_element->content=NULL;
         current_element->metadata=NULL;