From 43f2066c00ab4643f23ae19d3cdada37020a7a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Sun, 8 Nov 2009 21:32:22 +0000 Subject: [PATCH] Don't set tht_provider and tht_svcname to "unknown" if they are not known. Rather set the string to NULL --- src/dvb/dvb_tables.c | 8 ++++---- src/dvb/dvb_transport.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dvb/dvb_tables.c b/src/dvb/dvb_tables.c index 6e66407d..f083389e 100644 --- a/src/dvb/dvb_tables.c +++ b/src/dvb/dvb_tables.c @@ -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); diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c index 715c4472..0865b1f8 100644 --- a/src/dvb/dvb_transport.c +++ b/src/dvb/dvb_transport.c @@ -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);