From 06c4117a5a4c18ea093c5f046eed777f5dbf650e Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 21 Apr 2012 20:34:45 +0000 Subject: [PATCH] base-files: rename internal variables in config_foreach to make namespace conflicts more unlikely git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31431 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/lib/functions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 } -- 2.11.0