utils/dvb: fix a few warnings
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 4 Jan 2012 11:42:48 +0000 (09:42 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Jan 2012 13:12:15 +0000 (11:12 -0200)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
utils/dvb/dvbv5-scan.c
utils/dvb/dvbv5-zap.c

index ef6e07d..2cfbc7d 100644 (file)
@@ -106,28 +106,7 @@ static int run_scan(const char *fname, struct dvb_v5_fe_parms *parms)
        struct dvb_file *dvb_file, *dvb_file_new = NULL;
        struct dvb_entry *entry;
        int i, rc, count = 0;
-       uint32_t sys, freq;
-
-       switch (parms->current_sys) {
-       case SYS_DVBT:
-       case SYS_DVBS:
-       case SYS_DVBC_ANNEX_A:
-       case SYS_ATSC:
-               sys = parms->current_sys;
-               break;
-       case SYS_DVBC_ANNEX_C:
-               sys = SYS_DVBC_ANNEX_A;
-               break;
-       case SYS_DVBC_ANNEX_B:
-               sys = SYS_ATSC;
-               break;
-       case SYS_ISDBT:
-               sys = SYS_DVBT;
-               break;
-       default:
-               ERROR("Doesn't know how to emulate the delivery system");
-               return -1;
-       }
+       uint32_t freq;
 
        dvb_file = parse_format_oneline(fname, " \n", SYS_UNDEFINED,
                                        channel_formats);
index e3751b4..75e42ef 100644 (file)
@@ -330,7 +330,7 @@ int main(int argc, char **argv)
        char *confname = NULL;
        char *channel = NULL;
        int adapter = 0, frontend = 0, demux = 0, dvr = 0;
-       uint32_t vpid, apid = -1, sid = -1;
+       uint32_t vpid = -1, apid = -1, sid = -1;
        int pmtpid = 0;
        int pat_fd = -1, pmt_fd = -1;
        int audio_fd = 0, video_fd = 0;