Changeset 60 for trunk

Timestamp:

Jan 7, 2011, 1:30:54 AM (14 years ago)

Author:

djay

Message:

Small fixs in freeElements and runRequest.

Location:

trunk/zoo-kernel

Files:

• service.h (modified) (2 diffs)
• service_conf.y (modified) (4 diffs)
• zoo_service_loader.c (modified) (1 diff)

trunk/zoo-kernel/service.h

@@ -290 +290 @@
       }
       freeElements(&tmp->next);
+      if(tmp->next!=NULL)
+        free(tmp->next);
     }
   }
@@ -552 +554 @@
 
   static void addToElements(elements** m,elements* e){
-    elements* _cursor=*m;
     elements* tmp=e;
-    if(_cursor==NULL){
+    if(*m==NULL){
       *m=dupElements(tmp);
     }else{

trunk/zoo-kernel/service_conf.y

@@ -176 +176 @@
       freeElements(&current_element);
       free(current_element);
-      current_element=NULL;
 #ifdef DEBUG_SERVICE_CONF
       fprintf(stderr,"(DATAINPUTS - 186) ALLOCATE current_element\n");
@@ -505 +504 @@
   }
   }
-| SPAIR  { curr_key=strdup($1);/*free($1);*/if(debug) fprintf(stderr,"SPAIR FOUND !!\n"); }
+| SPAIR  { curr_key=strdup($1);if(debug) fprintf(stderr,"SPAIR FOUND !!\n"); }
  ;
 
@@ -698 +697 @@
 #endif
   freeElements(&current_element);
+  free(current_element);
   current_element=NULL;
-#ifdef DEBUG_SERVICE_CONF
-  fprintf(stderr,"(STARTING)FREE my_service\n");
-#endif
-  //freeService(&my_service);
-  //free(my_service);
-#ifdef DEBUG_SERVICE_CONF
-  fprintf(stderr,"(STARTING)FREE my_service done\n");
-#endif
   my_service=NULL;
   scontent=NULL;
@@ -726 +718 @@
   srin = fopen(file,"r");
   if (srin==NULL){
-    fprintf(stderr,"error : le fichier specifie n'existe pas ou n'est pas accessible en lecture\n") ;
+    fprintf(stderr,"error : file not found\n") ;
     return -1;
   }

trunk/zoo-kernel/zoo_service_loader.c

@@ -424 +424 @@
     freeMaps(&m);
     free(m);
+    freeMap(&request_inputs);
+    free(request_inputs);
+    free(REQUEST);
     return 1;
   }