stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't set tht_provider and tht_svcname to "unknown" if they are not known. Rather set the string to NULL

Browse source
This commit is contained in:
Andreas Öman 2009-11-08 21:32:22 +00:00
parent 142a86e954
commit 43f2066c00
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dvb/dvb_tables.c
View file

@ -655,16 +655,16 @@ dvb_sdt_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len,
if(t->tht_servicetype != stype ||
t->tht_scrambled != free_ca_mode ||
strcmp(t->tht_provider ?: "", provider) ||
strcmp(t->tht_svcname ?: "", chname )) {
strcmp(t->tht_provider ?: "", provider) ||
strcmp(t->tht_svcname ?: "", chname)) {
t->tht_servicetype = stype;
t->tht_scrambled = free_ca_mode;
free((void *)t->tht_provider);
free(t->tht_provider);
t->tht_provider = strdup(provider);
free((void *)t->tht_svcname);
free(t->tht_svcname);
t->tht_svcname = strdup(chname);
t->tht_config_save(t);

8
src/dvb/dvb_transport.c
View file

@ -214,11 +214,11 @@ dvb_transport_load(th_dvb_mux_instance_t *tdmi)
u32 = 0;
t->tht_scrambled = u32;
s = htsmsg_get_str(c, "provider") ?: "unknown";
t->tht_provider = strdup(s);
s = htsmsg_get_str(c, "provider");
t->tht_provider = s ? strdup(s) : NULL;
s = htsmsg_get_str(c, "servicename") ?: "unknown";
t->tht_svcname = strdup(s);
s = htsmsg_get_str(c, "servicename");
t->tht_svcname = s ? strdup(s) : NULL;
pthread_mutex_lock(&t->tht_stream_mutex);
psi_load_transport_settings(c, t);