Simplify pciparm init code based partially on old suggestions from Uberlord and also from SteveL, causes no changes in end result.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 23 insertions, 21 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index d8a31053ed06..6404a56b0e78 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.146 2008/10/07 11:07:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.147 2008/10/08 21:04:16 robbat2 Exp $
+
+  08 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> files/init.d-pciparm:
+  Simplify pciparm init code based partially on old suggestions from
+  Uberlord and also from SteveL, causes no changes in end result.
 
   07 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> +files/conf.d-pciparm,
   +files/init.d-pciparm, pciutils-3.0.2.ebuild:
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index a2f8e30b69cc..0186b7823e9e 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,5 +1,5 @@
 AUX conf.d-pciparm 988 RMD160 47d31ca9710c1be47e060e235394784b7831a6e0 SHA1 740ff1012c2fa2211357f707d17875c8d1ca66a5 SHA256 ffdec7d6c510a502d212129d31a9b37c3b9c75393a48a8b1ee6010b7d4aa1887
-AUX init.d-pciparm 1742 RMD160 7bb8ff462ae0b314a565652b1aac949389220c15 SHA1 7f18c35aa06ec7fcb151e7faa6fb02ddd9ca154c SHA256 921f9dfe5851763b90a76e668ea94dc449e4209ddc1d1553977404642dd90bad
+AUX init.d-pciparm 1609 RMD160 2950b33167888ad79d339c4a6796b467814fb457 SHA1 cff2c7c3024b02984d71e15971997af8e6507b75 SHA256 f838da5b9256a7a39a623a768315d7615c0471ce83901d122a2fe08ba2c51efa
 AUX pcimodules-pciutils-2.2.6.patch 10096 RMD160 5a89bed94911789ed99e52f5b6fade90027ea050 SHA1 fef276e0b650dd66aab821941a6f433667c53e8b SHA256 993eca5530ac3b9a1f210b9f8d5df7cc37a2a1958f391554aabb1fb9a26c2f5b
 AUX pcimodules-pciutils-3.0.0.patch 9041 RMD160 ab4a9d7cc3df5f3492a72d1ce54013891223730f SHA1 a22d0eb22a8042bcb6efc1face16fa9987ca1c7d SHA256 a18b6e41c1e0c4b295ecba923541ae1206889f82893c7edddc588c091ee8164c
 AUX pciutils-2.2.7-build.patch 716 RMD160 f142d0fbfaed97d4b75d479ac295757befd9935a SHA1 33f5b05c97dd0e74a6cd08ebf8495c55fb4eca81 SHA256 43c963ac3af01878a4a2303a657a3fbecc0c9a1cc545cc724ba2edaa3a14bf45
@@ -14,5 +14,5 @@ DIST pciutils-3.0.2.tar.gz 270474 RMD160 bab0a8261267dd7be50c29984c1d813174c4a0f
 EBUILD pciutils-2.2.10.ebuild 1489 RMD160 e526319da981149203c7de5f11fddb743a08a33b SHA1 703e8af045ea0b1b00e83b33bf284a4f465e70f5 SHA256 7571bcaa536bf6b68905f1b8c8259ab6279dfeb4ce181ecb2ee88db28dac5b38
 EBUILD pciutils-3.0.0.ebuild 1808 RMD160 fde67a9da9a2b664e3a789100d3d0af0e6f23d64 SHA1 bc9d0b1d73a8ed78c0acff8869ef4662db31d8bd SHA256 88be7fc27de6b5aeb4af9b6fdf1a3b7fa93c78e5bde9d2a1d0be72c3db240221
 EBUILD pciutils-3.0.2.ebuild 1976 RMD160 6812c5d2fc0416957657441cfefb25eeb939d8ef SHA1 808de6f1bc35440124c0be27fb83fce104aa7f97 SHA256 fc2f120c5110c813b29ea44eb0a6fa9c5f48fb03aa88a483e4ea35f2f91982ad
-MISC ChangeLog 19206 RMD160 209586f7f6fb43c85891a808895b4f1cbbecee7f SHA1 c0276b7b3d94cb500781704784541fa449d8aee2 SHA256 83523a0522a9e350a5c9ec44f761c3b3503a4d4339b8f4dd5b2ed876217f2adb
+MISC ChangeLog 19417 RMD160 ceb03b736b8ef26881b6cd28d3295993dd33273d SHA1 077c1efc07ded72ef27ed0f1d8c7a03abf436c2e SHA256 2a3285123f0a89fc31bad0d62b5ad37013f8fa9e1e7a9bdeb78f41d17b1004c2
 MISC metadata.xml 257 RMD160 bda78cd844850cace7d31b3bff6de2d1a7a298d5 SHA1 d754bc91dd7fc7496f5c3aa307879ae74ce3b465 SHA256 665e73270ac904a5c3989d16be4ad8e3d3b492049adebb76621f772d60647a97
diff --git a/sys-apps/pciutils/files/init.d-pciparm b/sys-apps/pciutils/files/init.d-pciparm
index d31eefdeeb9e..56dd3b7e65be 100644
--- a/sys-apps/pciutils/files/init.d-pciparm
+++ b/sys-apps/pciutils/files/init.d-pciparm
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 1.1 2008/10/07 11:07:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 1.2 2008/10/08 21:04:16 robbat2 Exp $
 
 depend() {
 	before bootmisc hdparm
@@ -46,6 +46,18 @@ do_setpci() {
 	SPEC_ID=""
 }
 
+do_setpci_array() {
+	name=$1
+	shift
+	i=0
+	while true; do
+		eval opt="\$${name}_$i"
+		[[ -z "$opt" ]] && break
+		do_setpci "$*" $opt
+		i=$(($i+1))
+	done
+}
+
 start() {
 	if get_bootparam "nopciparm" ; then
 		ewarn "Skipping pciparm init as requested in kernel cmdline"
@@ -54,23 +66,9 @@ start() {
 
 	checkconfig || return 1
 	
-	if [ -n "$PCIPARM_ALL" ]; then
+	[[ -n "$PCIPARM_ALL" ]] && \
 		do_setpci -d '*:*' $PCIPARM_ALL
-	fi
 
-	SEQ_BUS=0
-	while true; do
-		BUS_OPT=`eval echo '$'PCIPARM_BUS_${SEQ_BUS}`
-		[[ -z "$BUS_OPT" ]] && break
-		do_setpci -s $BUS_OPT
-		SEQ_BUS=$(($SEQ_BUS+1))
-	done
-
-	SEQ_VENDOR=0
-	while true; do
-		VENDOR_OPT=`eval echo '$'PCIPARM_VENDOR_${SEQ_VENDOR}`
-		[[ -z "$VENDOR_OPT" ]] && break
-		do_setpci -d $VENDOR_OPT
-		SEQ_VENDOR=$(($SEQ_VENDOR+1))
-	done
+	do_setpci_array PCIPARM_BUS -s
+	do_setpci_array PCIPARM_VENDOR -d
 }