From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 4 Jan 2012 11:42:48 +0000 (-0200)
Subject: utils/dvb: fix a few warnings
X-Git-Tag: v4l-utils-0.9.0-test1~124
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e5e45d24a9ab20ea7c3c4542e6783365759f50d;p=platform%2Fupstream%2Fv4l-utils.git

utils/dvb: fix a few warnings

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/utils/dvb/dvbv5-scan.c b/utils/dvb/dvbv5-scan.c
index ef6e07d..2cfbc7d 100644
--- a/utils/dvb/dvbv5-scan.c
+++ b/utils/dvb/dvbv5-scan.c
@@ -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);
diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c
index e3751b4..75e42ef 100644
--- a/utils/dvb/dvbv5-zap.c
+++ b/utils/dvb/dvbv5-zap.c
@@ -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;