diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-04-21 20:34:45 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-04-21 20:34:45 +0000 |
commit | d8d2b5d324c64c2744c617bb1d501e195a631461 (patch) | |
tree | b3dfb0f69d07d335b9ea011b8395fc4be1d52f2f | |
parent | fe7e861b0670ec3fafb59b85fbce81e292cd2887 (diff) | |
download | upstream-d8d2b5d324c64c2744c617bb1d501e195a631461.tar.gz upstream-d8d2b5d324c64c2744c617bb1d501e195a631461.tar.bz2 upstream-d8d2b5d324c64c2744c617bb1d501e195a631461.zip |
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
-rwxr-xr-x | package/base-files/files/lib/functions.sh | 8 |
1 files 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 } |