From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 21 Apr 2012 20:34:45 +0000 (+0000)
Subject: base-files: rename internal variables in config_foreach to make namespace conflicts... 
X-Git-Tag: reboot~14186
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3678ba60ca41c590fffcef23e06ed73c944a5042;p=oweals%2Fopenwrt.git

base-files: rename internal variables in config_foreach to make namespace conflicts more unlikely

SVN-Revision: 31431
---

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index b3e406cba2..02048eab12 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -173,17 +173,17 @@ config_set() {
 }
 
 config_foreach() {
-	local function="$1"
+	local ___function="$1"
 	[ "$#" -ge 1 ] && shift
-	local type="$1"
+	local ___type="$1"
 	[ "$#" -ge 1 ] && shift
 	local section cfgtype
 
 	[ -z "$CONFIG_SECTIONS" ] && return 0
 	for section in ${CONFIG_SECTIONS}; do
 		config_get cfgtype "$section" TYPE
-		[ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
-		eval "$function \"\$section\" \"\$@\""
+		[ -n "$___type" -a "x$cfgtype" != "x$___type" ] && continue
+		eval "$___function \"\$section\" \"\$@\""
 	done
 }