Changeset 490 for trunk/zoo-project/zoo-kernel/service_yaml.c
- Timestamp:
- Jun 27, 2014, 1:14:39 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/service_yaml.c
r465 r490 144 144 case YAML_SCALAR_TOKEN: 145 145 if(ttype==0){ 146 cur_key=zStrdup( token.data.scalar.value);146 cur_key=zStrdup((char *)token.data.scalar.value); 147 147 } 148 148 if(ttype==1){ 149 149 if(current_content==NULL){ 150 current_content=createMap(cur_key, token.data.scalar.value);150 current_content=createMap(cur_key,(char *)token.data.scalar.value); 151 151 }else{ 152 addToMap(current_content,cur_key, token.data.scalar.value);152 addToMap(current_content,cur_key,(char *)token.data.scalar.value); 153 153 } 154 154 free(cur_key); … … 156 156 } 157 157 158 if(ttype==0 && blevel==0 && level==0 && strcasecmp( token.data.scalar.value,"MetaData")==0 && blevel==0){158 if(ttype==0 && blevel==0 && level==0 && strcasecmp((char *)token.data.scalar.value,"MetaData")==0 && blevel==0){ 159 159 addMapToMap(&my_service->content,current_content); 160 160 #ifdef DEBUG_YAML … … 166 166 wait_metadata=1; 167 167 } 168 if(ttype==0 && blevel>0 && level>0 && strcasecmp( token.data.scalar.value,"MetaData")==0){168 if(ttype==0 && blevel>0 && level>0 && strcasecmp((char *)token.data.scalar.value,"MetaData")==0){ 169 169 if(current_element->content==NULL && current_content!=NULL) 170 170 addMapToMap(¤t_element->content,current_content); … … 178 178 wait_metadata=1; 179 179 } 180 if(ttype==0 && strcasecmp( token.data.scalar.value,"inputs")==0 && blevel==0){180 if(ttype==0 && strcasecmp((char *)token.data.scalar.value,"inputs")==0 && blevel==0){ 181 181 if(wait_metadata>0){ 182 182 addMapToMap(&my_service->metadata,current_content); … … 196 196 level++; 197 197 } 198 if(ttype==0 && strcasecmp( token.data.scalar.value,"outputs")==0 && blevel==1){198 if(ttype==0 && strcasecmp((char *)token.data.scalar.value,"outputs")==0 && blevel==1){ 199 199 level++; 200 200 #ifdef DEBUG_YAML … … 229 229 } 230 230 } 231 if(level==1 && strcasecmp( token.data.scalar.value,"default")==0){231 if(level==1 && strcasecmp((char *)token.data.scalar.value,"default")==0){ 232 232 ilevel=0; 233 233 } 234 if(level==1 && strcasecmp( token.data.scalar.value,"supported")==0){234 if(level==1 && strcasecmp((char *)token.data.scalar.value,"supported")==0){ 235 235 #ifdef DEBUG_YAML 236 236 dumpMap(current_content); … … 271 271 272 272 273 if(strncasecmp(token.data.scalar.value,"ComplexData",11)==0 || strncasecmp(token.data.scalar.value,"LiteralData",10)==0 274 || strncasecmp(token.data.scalar.value,"ComplexOutput",13)==0 || strncasecmp(token.data.scalar.value,"LiteralOutput",12)==0 275 || strncasecmp(token.data.scalar.value,"BoundingBoxOutput",13)==0 || strncasecmp(token.data.scalar.value,"BoundingBoxData",12)==0){ 276 current_element->format=zStrdup(token.data.scalar.value); 273 if(strncasecmp((char *)token.data.scalar.value,"ComplexData",11)==0 || 274 strncasecmp((char *)token.data.scalar.value,"LiteralData",10)==0 || 275 strncasecmp((char *)token.data.scalar.value,"ComplexOutput",13)==0 || 276 strncasecmp((char *)token.data.scalar.value,"LiteralOutput",12)==0 || 277 strncasecmp((char *)token.data.scalar.value,"BoundingBoxOutput",13)==0 || 278 strncasecmp((char *)token.data.scalar.value,"BoundingBoxData",12)==0){ 279 current_element->format=zStrdup((char *)token.data.scalar.value); 277 280 free(cur_key); 278 281 cur_key=NULL; … … 324 327 plevel=level; 325 328 current_element=(elements*)malloc(ELEMENTS_SIZE); 326 current_element->name= strdup(token.data.scalar.value);329 current_element->name=zStrdup((char *)token.data.scalar.value); 327 330 current_element->content=NULL; 328 331 current_element->metadata=NULL; … … 367 370 plevel=level; 368 371 current_element=(elements*)malloc(ELEMENTS_SIZE); 369 current_element->name= strdup(token.data.scalar.value);372 current_element->name=zStrdup((char *)token.data.scalar.value); 370 373 current_element->content=NULL; 371 374 current_element->metadata=NULL;
Note: See TracChangeset
for help on using the changeset viewer.