diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c index cce153dc..77140d48 100644 --- a/src/dvr/dvr_autorec.c +++ b/src/dvr/dvr_autorec.c @@ -551,7 +551,7 @@ static char * dvr_autorec_entry_class_weekdays_rend(void *o) { dvr_autorec_entry_t *dae = (dvr_autorec_entry_t *)o; - static char buf[32]; + char buf[32]; size_t l; int i; if (dae->dae_weekdays == 0x7f) @@ -567,7 +567,7 @@ dvr_autorec_entry_class_weekdays_rend(void *o) val2str(i + 1, dvr_autorec_entry_class_weekdays_tab)); } } - return buf + 1; + return strdup(buf + 1); } static int diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c index 19c81124..e884a68a 100644 --- a/src/dvr/dvr_db.c +++ b/src/dvr/dvr_db.c @@ -1376,24 +1376,6 @@ dvr_entry_class_autorec_get(void *o) return &ret; } -static char * -dvr_entry_class_autorec_rend(void *o) -{ - dvr_entry_t *de = (dvr_entry_t *)o; - const char *s = ""; - if (de->de_autorec) { - if (de->de_autorec->dae_name != NULL && - de->de_autorec->dae_name[0] != '\0') - s = de->de_autorec->dae_name; - else if (de->de_autorec->dae_comment != NULL && - de->de_autorec->dae_comment[0] != '\0') - s = de->de_autorec->dae_comment; - else - s = de->de_autorec->dae_title; - } - return strdup(s); -} - static int dvr_entry_class_broadcast_set(void *o, const void *v) { @@ -1431,16 +1413,6 @@ dvr_entry_class_broadcast_get(void *o) return &id; } -static char * -dvr_entry_class_broadcast_rend(void *o) -{ - dvr_entry_t *de = (dvr_entry_t *)o; - const char *s = ""; - if (de->de_bcast) - s = lang_str_get(de->de_bcast->summary, NULL); - return strdup(s); -} - static int dvr_entry_class_disp_title_set(void *o, const void *v) { @@ -1841,7 +1813,6 @@ const idclass_t dvr_entry_class = { .name = "Auto Record", .set = dvr_entry_class_autorec_set, .get = dvr_entry_class_autorec_get, - .rend = dvr_entry_class_autorec_rend, .opts = PO_RDONLY, }, { @@ -1858,7 +1829,6 @@ const idclass_t dvr_entry_class = { .name = "Broadcast Type", .set = dvr_entry_class_broadcast_set, .get = dvr_entry_class_broadcast_get, - .rend = dvr_entry_class_broadcast_rend, .opts = PO_RDONLY, }, {