[linux-dvb] s/scan/dvbscan/ Re: Re: prefixing dvb userland tools

[Guido Draheim <guidod-2003-@gmx.de>]

Johannes Stezenbach wrote:
> I don't like that. If there is a reason to rename
> some of the programs, then we should do it in our CVS
> (e.g. scan was renamed to dvbscan recently because there
> was a conflict with some other "scan" [reported by suse]).
just saw it on cvs update - and you missed a few places,
a patch is attached

cheers,
-- guido                                  http://google.de/search?q=guidod
GCS/E/S/P C++/++++$ ULHS L++w- N++@ s+:a d(+-) r+@>+++ y++ 5++X- (geekcode)
? dvb-apps-dvbscan-rename-cleanup.patch
Index: util/scan/README
===================================================================
RCS file: /cvs/linuxtv/dvb-apps/util/scan/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- util/scan/README	12 Feb 2004 12:03:53 -0000	1.2
+++ util/scan/README	14 Feb 2004 22:01:18 -0000
@@ -1,7 +1,7 @@
 Hi,
 
 this is a little channel scan utility to generate szap/tzap/czap compatible 
-channel lists. Scan does not do a frequency scan, however, so you must
+channel lists. A dvbscan does not do a frequency scan, however, so you must
 manually provide the data for tuning to one or more start transponders.
 A number of initial-tuning-data files are provided for various dvb-c, dvb-s
 and dvb-t networks around the world. If you make a new one feel free to
@@ -10,7 +10,7 @@
 Basic usage: ./dvbscan dvb-s/Astra-19.2E | tee mychannels.conf
 
 If you want it to check a specific frequency, tune to that frequency 
-(e.g. using szap/tzap/czap) and then use './scan -c'.
+(e.g. using szap/tzap/czap) and then use './dvbscan -c'.
 
 For more scan options see ./dvbscan -h.
 
Index: util/scan/scan.c
===================================================================
RCS file: /cvs/linuxtv/dvb-apps/util/scan/scan.c,v
retrieving revision 1.5
diff -u -r1.5 scan.c
--- util/scan/scan.c	12 Feb 2004 16:13:19 -0000	1.5
+++ util/scan/scan.c	14 Feb 2004 22:01:21 -0000
@@ -164,7 +164,7 @@
 /* According to the DVB standards, the combination of network_id and
  * transport_stream_id should be unique, but in real life the satellite
  * operators and broadcasters don't care enough to coordinate
- * the numbering. Thus we identify TPs by frequency (scan handles only
+ * the numbering. Thus we identify TPs by frequency (dvbscan handles only
  * one satellite at a time). Further complication: Different NITs on
  * one satellite sometimes list the same TP with slightly different
  * frequencies, so we have to search within some bandwidth.
@@ -1723,7 +1723,7 @@
 
 static const char *usage = "\n"
 	"usage: %s [options...] [-c | initial-tuning-data-file]\n"
-	"	scan doesn't do frequency scans, hence it needs initial\n"
+	"	dvbscan doesn't do frequency scans, hence it needs initial\n"
 	"	tuning data for at least one transponder/channel.\n"
 	"	-c	scan on currently tuned transponder only\n"
 	"	-v 	verbose (repeat for more)\n"