[linux-dvb] scan.c: small patch

[Wolfgang Thiel <w-thiel@gmx.net>]

I'll attach a small patch to scan.c to allow a transport_stream_id
of 0 which e.g. is transmitted on 43west Fox ME.
The patch will also create a start file for 43w. Well: the SI there
is a mess, but anyway...



Wolfgang

diff -urNp DVB-orig/apps/scan/dvb-s/PAS-43.0W DVB/apps/scan/dvb-s/PAS-43.0W
--- DVB-orig/apps/scan/dvb-s/PAS-43.0W	1970-01-01 00:00:00.000000000 +0000
+++ DVB/apps/scan/dvb-s/PAS-43.0W	2003-12-12 14:07:03.000000000 +0000
@@ -0,0 +1,6 @@
+# PAS 6/6B/3R at 43.0W
+# freq pol sr fec
+S 12578000 H 19850000 3/4
+S 12584000 V 27500000 3/4
+S 12606000 H  6616000 3/4
+S 12665000 H 19850000 7/8
diff -urNp DVB-orig/apps/scan/scan.c DVB/apps/scan/scan.c
--- DVB-orig/apps/scan/scan.c	2003-11-24 19:50:51.000000000 +0000
+++ DVB/apps/scan/scan.c	2003-12-12 14:06:18.000000000 +0000
@@ -761,8 +761,7 @@ static void parse_nit (const unsigned ch
 
 		descriptors_loop_len = ((buf[4] & 0x0f) << 8) | buf[5];
 
-		if (section_length < descriptors_loop_len + 4 ||
-		    !transport_stream_id)
+		if (section_length < descriptors_loop_len + 4)
 		{
 			warning("section too short: transport_stream_id == 0x%04x, "
 			     "section_length == %i, descriptors_loop_len == %i\n",
@@ -804,11 +803,9 @@ static void parse_sdt (const unsigned ch
 		int descriptors_loop_len = ((buf[3] & 0x0f) << 8) | buf[4];
 		struct service *s;
 
-		if (section_length < descriptors_loop_len ||
-		    !transport_stream_id ||
-		    !descriptors_loop_len)
+		if (section_length < descriptors_loop_len || !descriptors_loop_len)
 		{
-			warning("section too short: service_id == 0x%02x, section_length == %i"
+			warning("section too short: service_id == 0x%02x, section_length == %i, "
 			     "descriptors_loop_len == %i\n",
 			     service_id, section_length,
 			     descriptors_loop_len);