Changeset 854 for branches/prototype-v0/zoo-project/zoo-kernel/service.c
- Timestamp:
- Nov 21, 2017, 10:24:14 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/prototype-v0/zoo-project/zoo-kernel/service.c
r850 r854 1172 1172 tmp->name=zStrdup(cursor->name); 1173 1173 tmp->content=NULL; 1174 addMapToMap(&tmp->content, e->content);1174 addMapToMap(&tmp->content,cursor->content); 1175 1175 tmp->metadata=NULL; 1176 addMapToMap(&tmp->metadata, e->metadata);1176 addMapToMap(&tmp->metadata,cursor->metadata); 1177 1177 tmp->additional_parameters=NULL; 1178 addMapToMap(&tmp->additional_parameters, e->additional_parameters);1179 if( e->format!=NULL)1180 tmp->format=zStrdup( e->format);1178 addMapToMap(&tmp->additional_parameters,cursor->additional_parameters); 1179 if(cursor->format!=NULL) 1180 tmp->format=zStrdup(cursor->format); 1181 1181 else 1182 1182 tmp->format=NULL; 1183 if( e->defaults!=NULL){1183 if(cursor->defaults!=NULL){ 1184 1184 tmp->defaults=(iotype*)malloc(IOTYPE_SIZE); 1185 1185 tmp->defaults->content=NULL; 1186 addMapToMap(&tmp->defaults->content, e->defaults->content);1186 addMapToMap(&tmp->defaults->content,cursor->defaults->content); 1187 1187 tmp->defaults->next=NULL; 1188 1188 #ifdef DEBUG … … 1192 1192 }else 1193 1193 tmp->defaults=NULL; 1194 if( e->supported!=NULL){1194 if(cursor->supported!=NULL && cursor->supported->content!=NULL){ 1195 1195 tmp->supported=(iotype*)malloc(IOTYPE_SIZE); 1196 1196 tmp->supported->content=NULL; 1197 addMapToMap(&tmp->supported->content, e->supported->content);1197 addMapToMap(&tmp->supported->content,cursor->supported->content); 1198 1198 tmp->supported->next=NULL; 1199 iotype *tmp2= e->supported->next;1199 iotype *tmp2=cursor->supported->next; 1200 1200 while(tmp2!=NULL){ 1201 1201 addMapToIoType(&tmp->supported,tmp2->content);
Note: See TracChangeset
for help on using the changeset viewer.