procd: rename local variable in uci_validate_section
authorJohn Crispin <john@openwrt.org>
Thu, 5 Jun 2014 08:19:59 +0000 (08:19 +0000)
committerJohn Crispin <john@openwrt.org>
Thu, 5 Jun 2014 08:19:59 +0000 (08:19 +0000)
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>
SVN-Revision: 41006

package/system/procd/files/procd.sh

index c5dc3c65cb00ec8592fed7f59a15769b189e1490..d83c067fd0e97a815173e0bb59a757f1c6beab89 100644 (file)
@@ -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 \