From 5288a7a5f14e8c0f80dd0868499e3477ca17be6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Thu, 25 Mar 2010 21:05:15 +0000 Subject: [PATCH] Avoid unnecessary memory allocation --- src/dvb/dvb_tables.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/dvb/dvb_tables.c b/src/dvb/dvb_tables.c index 91b3baec..375d8608 100644 --- a/src/dvb/dvb_tables.c +++ b/src/dvb/dvb_tables.c @@ -826,13 +826,6 @@ dvb_pat_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, } -typedef struct ca_stream { - th_dvb_table_t tdt; - int cs_caid; -} ca_stream_t; - - - /** * CA - Conditional Access */ @@ -854,7 +847,6 @@ dvb_cat_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, int tag, tlen; uint16_t caid; uint16_t pid; - ca_stream_t *cs; if((ptr[2] & 1) == 0) { /* current_next_indicator == next, skip this */ @@ -876,10 +868,8 @@ dvb_cat_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, if(pid == 0) break; - cs = calloc(1, sizeof(ca_stream_t)); - cs->cs_caid = caid; - tdt_add(tdmi, NULL, dvb_ca_callback, cs, "CA", - TDT_INC_TABLE_HDR, pid, &cs->tdt); + tdt_add(tdmi, NULL, dvb_ca_callback, NULL, "CA", + TDT_INC_TABLE_HDR, pid, NULL); break; default: