Changeset 587 for trunk/zoo-project/zoo-kernel/zoo_loader.c
- Timestamp:
- Feb 18, 2015, 1:31:59 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/zoo_loader.c
r554 r587 173 173 fprintf(stderr,"(( \n %s \n %s \n ))",*arrayStep,value); 174 174 #endif 175 #ifdef WIN32 176 char* tmp = url_decode(value); 177 if(tmpMap!=NULL) 178 addToMap(tmpMap,*arrayStep,tmp); 179 else 180 tmpMap=createMap(*arrayStep,tmp); 181 free(tmp); 182 #else 175 183 if(tmpMap!=NULL) 176 184 addToMap(tmpMap,*arrayStep,value); 177 185 else 178 tmpMap=createMap(*arrayStep,value); 186 tmpMap=createMap(*arrayStep,value); 187 #endif 179 188 arrayStep++; 180 189 delete[]value; … … 330 339 token1=strtok_r(token,"=",&saveptr1); 331 340 while(token1!=NULL){ 332 if(name==NULL) 333 name=zStrdup(token1); 334 else 335 value=zStrdup(token1); 336 token1=strtok_r(NULL,"=",&saveptr1); 337 } 338 addToMap(tmpMap,name,value); 341 if(name==NULL) 342 name=zStrdup(token1); 343 else 344 value=zStrdup(token1); 345 token1=strtok_r(NULL,"=",&saveptr1); 346 } 347 //addToMap(tmpMap,name,value); 348 /* knut: strtok(_r) ignores delimiter bytes at start and end of string; 349 * it will return non-empty string or NULL, e.g. "metapath=" yields value=NULL. 350 * This modification sets value="" instead of NULL. 351 */ 352 addToMap(tmpMap,name, value != NULL ? value : ""); 353 339 354 free(name); 340 355 free(value);
Note: See TracChangeset
for help on using the changeset viewer.