Changeset 4331
- Timestamp:
- 03/16/10 17:42:57 (6 months ago)
- Files:
-
- 1 modified
-
trunk/tvheadend/src/epg.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/tvheadend/src/epg.c
r4272 r4331 156 156 void epg_event_set_ext_desc(event_t *e, int ext_dn, const char *desc) 157 157 { 158 if (e->e_ext_desc == NULL && ext_dn != 0)159 return; 160 if (e->e_ext_desc != NULL && strstr(e->e_ext_desc, desc))158 if(e->e_ext_desc == NULL && ext_dn != 0) 159 return; 160 if(e->e_ext_desc != NULL && strstr(e->e_ext_desc, desc)) 161 161 return; 162 162 … … 164 164 char *tmp = (char*)malloc(len); 165 165 166 if (e->e_ext_desc)166 if(e->e_ext_desc) 167 167 { 168 168 strcpy(tmp, e->e_ext_desc); … … 182 182 void epg_event_set_ext_item(event_t *e, int ext_dn, const char *item) 183 183 { 184 if (e->e_ext_item == NULL && ext_dn != 0)185 return; 186 if (e->e_ext_item != NULL && strstr(e->e_ext_item, item))184 if(e->e_ext_item == NULL && ext_dn != 0) 185 return; 186 if(e->e_ext_item != NULL && strstr(e->e_ext_item, item)) 187 187 return; 188 188 … … 190 190 char *tmp = (char*)malloc(len); 191 191 192 if (e->e_ext_item) 193 { 192 if(e->e_ext_item) { 194 193 strcpy(tmp, e->e_ext_item); 195 194 strcat(tmp, item); 196 195 free(e->e_ext_item); 197 } 198 else 196 } else 199 197 strcpy(tmp, item); 200 198 … … 208 206 void epg_event_set_ext_text(event_t *e, int ext_dn, const char *text) 209 207 { 210 if (e->e_ext_text == NULL && ext_dn != 0)211 return; 212 if (e->e_ext_text != NULL && strstr(e->e_ext_text, text))208 if(e->e_ext_text == NULL && ext_dn != 0) 209 return; 210 if(e->e_ext_text != NULL && strstr(e->e_ext_text, text)) 213 211 return; 214 212 … … 216 214 char *tmp = (char*)malloc(len); 217 215 218 if (e->e_ext_text) 219 { 216 if(e->e_ext_text) { 220 217 strcpy(tmp, e->e_ext_text); 221 218 strcat(tmp, text); 222 219 free(e->e_ext_text); 223 } 224 else 220 } else 225 221 strcpy(tmp, text); 226 222