From: John Crispin <john@openwrt.org>
Date: Thu, 5 Jun 2014 08:19:59 +0000 (+0000)
Subject: procd: rename local variable in uci_validate_section
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=59c8b70839f69acf4a087b02c441bfe49f593462;p=openwrt%2Fstaging%2Fmkresin.git

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>

SVN-Revision: 41006
---

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 \