Changeset 60


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-kernel/service.h

    r59 r60  
    290290      }
    291291      freeElements(&tmp->next);
     292      if(tmp->next!=NULL)
     293        free(tmp->next);
    292294    }
    293295  }
     
    552554
    553555  static void addToElements(elements** m,elements* e){
    554     elements* _cursor=*m;
    555556    elements* tmp=e;
    556     if(_cursor==NULL){
     557    if(*m==NULL){
    557558      *m=dupElements(tmp);
    558559    }else{
  • trunk/zoo-kernel/service_conf.y

    r58 r60  
    176176      freeElements(&current_element);
    177177      free(current_element);
    178       current_element=NULL;
    179178#ifdef DEBUG_SERVICE_CONF
    180179      fprintf(stderr,"(DATAINPUTS - 186) ALLOCATE current_element\n");
     
    505504  }
    506505  }
    507 | SPAIR  { curr_key=strdup($1);/*free($1);*/if(debug) fprintf(stderr,"SPAIR FOUND !!\n"); }
     506| SPAIR  { curr_key=strdup($1);if(debug) fprintf(stderr,"SPAIR FOUND !!\n"); }
    508507 ;
    509508
     
    698697#endif
    699698  freeElements(&current_element);
     699  free(current_element);
    700700  current_element=NULL;
    701 #ifdef DEBUG_SERVICE_CONF
    702   fprintf(stderr,"(STARTING)FREE my_service\n");
    703 #endif
    704   //freeService(&my_service);
    705   //free(my_service);
    706 #ifdef DEBUG_SERVICE_CONF
    707   fprintf(stderr,"(STARTING)FREE my_service done\n");
    708 #endif
    709701  my_service=NULL;
    710702  scontent=NULL;
     
    726718  srin = fopen(file,"r");
    727719  if (srin==NULL){
    728     fprintf(stderr,"error : le fichier specifie n'existe pas ou n'est pas accessible en lecture\n") ;
     720    fprintf(stderr,"error : file not found\n") ;
    729721    return -1;
    730722  }
  • trunk/zoo-kernel/zoo_service_loader.c

    r59 r60  
    424424    freeMaps(&m);
    425425    free(m);
     426    freeMap(&request_inputs);
     427    free(request_inputs);
     428    free(REQUEST);
    426429    return 1;
    427430  }
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png