From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <linux-media-owner@vger.kernel.org>
Received: from smtp-vbr11.xs4all.nl ([194.109.24.31]:4920 "EHLO
	smtp-vbr11.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752812Ab3KWNt4 (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Sat, 23 Nov 2013 08:49:56 -0500
Message-ID: <5290B270.2070404@xs4all.nl>
Date: Sat, 23 Nov 2013 14:49:36 +0100
From: Hans Verkuil <hverkuil@xs4all.nl>
MIME-Version: 1.0
To: Linux Media Mailing List <linux-media@vger.kernel.org>,
	Michael Krufky <mkrufky@linuxtv.org>, abraham.manu@gmail.com
Subject: [PATCHv3 dvb-apps] Silence last warnings in dvbscan.c
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Sender: linux-media-owner@vger.kernel.org
List-ID: <linux-media.vger.kernel.org>

Hi Manu, Mike,

This is the third version of this patch with the #if 0 stuff removed in order to
silence the last warnings in dvb-apps. Mike, I like this better as well: after all,
that's why you have a revision control system in order resurrect old deleted code
should that be necessary.

Regards,

	Hans

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

diff -r 7161fa4a3e33 util/dvbscan/dvbscan.c
--- a/util/dvbscan/dvbscan.c	Thu Nov 14 16:45:24 2013 -0500
+++ b/util/dvbscan/dvbscan.c	Sat Nov 23 14:45:24 2013 +0100
@@ -74,8 +74,8 @@
 		"						Dual LO, H:5150MHz, V:5750MHz.\n"
 		"			 * One of the sec definitions from the secfile if supplied\n"
 		" -satpos <position>	Specify DISEQC switch position for DVB-S.\n"
-		" -inversion <on|off|auto> Specify inversion (default: auto).\n"
-		" -uk-ordering 		Use UK DVB-T channel ordering if present.\n"
+		" -inversion <on|off|auto> Specify inversion (default: auto) (note: this option is ignored).\n"
+		" -uk-ordering 		Use UK DVB-T channel ordering if present (note: this option is ignored).\n"
 		" -timeout <secs>	Specify filter timeout to use (standard specced values will be used by default)\n"
 		" -filter <filter>	Specify service filter, a comma seperated list of the following tokens:\n"
 		" 			 (If no filter is supplied, all services will be output)\n"
@@ -83,10 +83,11 @@
 		"			 * radio - Output radio channels\n"
 		"			 * other - Output other channels\n"
 		"			 * encrypted - Output encrypted channels\n"
-		" -out raw <filename>|-	 Output in raw format to <filename> or stdout\n"
+		" -out raw <filename>|-	Output in raw format to <filename> or stdout\n"
 		"      channels <filename>|-  Output in channels.conf format to <filename> or stdout.\n"
 		"      vdr12 <filename>|- Output in vdr 1.2.x format to <filename> or stdout.\n"
 		"      vdr13 <filename>|- Output in vdr 1.3.x format to <filename> or stdout.\n"
+		"			Note: this option is ignored.\n"
 		" <initial scan file>\n";
 	fprintf(stderr, "%s\n", _usage);
 
@@ -121,12 +122,8 @@
 	char *secfile = NULL;
 	char *secid = NULL;
 	int satpos = 0;
-	enum dvbfe_spectral_inversion inversion = DVBFE_INVERSION_AUTO;
 	int service_filter = -1;
-	int uk_ordering = 0;
 	int timeout = 5;
-	int output_type = OUTPUT_TYPE_RAW;
-	char *output_filename = NULL;
 	char *scan_filename = NULL;
 	struct dvbsec_config sec;
 	int valid_sec = 0;
@@ -171,20 +168,10 @@
 		} else if (!strcmp(argv[argpos], "-inversion")) {
 			if ((argc - argpos) < 2)
 				usage();
-			if (!strcmp(argv[argpos+1], "off")) {
-				inversion = DVBFE_INVERSION_OFF;
-			} else if (!strcmp(argv[argpos+1], "on")) {
-				inversion = DVBFE_INVERSION_ON;
-			} else if (!strcmp(argv[argpos+1], "auto")) {
-				inversion = DVBFE_INVERSION_AUTO;
-			} else {
-				usage();
-			}
 			argpos+=2;
 		} else if (!strcmp(argv[argpos], "-uk-ordering")) {
 			if ((argc - argpos) < 1)
 				usage();
-			uk_ordering = 1;
 		} else if (!strcmp(argv[argpos], "-timeout")) {
 			if ((argc - argpos) < 2)
 				usage();
@@ -211,20 +198,6 @@
 		} else if (!strcmp(argv[argpos], "-out")) {
 			if ((argc - argpos) < 3)
 				usage();
-			if (!strcmp(argv[argpos+1], "raw")) {
-				output_type = OUTPUT_TYPE_RAW;
-			} else if (!strcmp(argv[argpos+1], "channels")) {
-				output_type = OUTPUT_TYPE_CHANNELS;
-			} else if (!strcmp(argv[argpos+1], "vdr12")) {
-				output_type = OUTPUT_TYPE_VDR12;
-			} else if (!strcmp(argv[argpos+1], "vdr13")) {
-				output_type = OUTPUT_TYPE_VDR13;
-			} else {
-				usage();
-			}
-			output_filename = argv[argpos+2];
-			if (!strcmp(output_filename, "-"))
-				output_filename = NULL;
 		} else {
 			if ((argc - argpos) != 1)
 				usage();