diff options
| author | John Crispin <blogic@openwrt.org> | 2014-06-05 08:19:59 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-06-05 08:19:59 +0000 |
| commit | 70241385812665b815616cc97e2cb8ceb3119924 (patch) | |
| tree | 363510b9761da43f49e65b64b13d26b59d3fe664 | |
| parent | 7beffd41f747cbd23ba6355050ccf6a0ffda7ebe (diff) | |
| download | master-187ad058-70241385812665b815616cc97e2cb8ceb3119924.tar.gz master-187ad058-70241385812665b815616cc97e2cb8ceb3119924.tar.bz2 master-187ad058-70241385812665b815616cc97e2cb8ceb3119924.zip | |
procd: rename local variable in uci_validate_section
Allow to use "package", "type", "name", "error" and "result"
as config option names:
package some_service
config section 'foo'
option name 'bar'
option type 'unknown'
Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41006 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/system/procd/files/procd.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index c5dc3c65cb..d83c067fd0 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -219,16 +219,16 @@ _procd_kill() { uci_validate_section() { - local package="$1" - local type="$2" - local name="$3" - local error + local _package="$1" + local _type="$2" + local _name="$3" + local _error shift; shift; shift - local result=`/sbin/validate_data "$package" "$type" "$name" "$@" 2> /dev/null` - error=$? - eval "$result" - [ "$error" = "0" ] || `/sbin/validate_data "$package" "$type" "$name" "$@" 1> /dev/null` - return $error + local _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null` + _error=$? + eval "$_result" + [ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null` + return $_error } _procd_wrapper \ |