From 837d2a8ad902052d20e2729e7e505d95a593f3b8 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 05 Jan 2019 10:53:01 -0500
Subject: ob_parse_control(): Pass field name and value as args

---
(limited to 'lib/package')

diff --git a/lib/package/2.sh b/lib/package/2.sh
index c1c37d5..4ca7346 100644
--- a/lib/package/2.sh
+++ b/lib/package/2.sh
@@ -69,7 +69,11 @@ _ob_get_binary_packages_2()
 
 _ob_srcfield_2()
 {
-	_ob_set_source_parameter "${OB_CONTROL_NAME}" "${OB_CONTROL_VALUE}"
+	local name="${1}"
+	local value="${2}"
+	shift 2
+
+	_ob_set_source_parameter "${name}" "${value}"
 
 	return 0
 }
@@ -89,8 +93,11 @@ _ob_change_2()
 
 _ob_binfield_2()
 {
-	_ob_set_binary_parameter "${_OB_CURRENT_PACKAGE_2}" "${OB_CONTROL_NAME}" \
-		"${OB_CONTROL_VALUE}"
+	local name="${1}"
+	local value="${2}"
+	shift 2
+
+	_ob_set_binary_parameter "${_OB_CURRENT_PACKAGE_2}" "${name}" "${value}"
 
 	return 0
 }
@@ -163,7 +170,11 @@ _ob_set_package_substvars_2()
 
 _ob_substvar_2()
 {
-	ob_set_substvar "${OB_CONTROL_NAME}" "${OB_CONTROL_VALUE}"
+	local name="${1}"
+	local value="${2}"
+	shift 2
+
+	ob_set_substvar "${name}" "${value}"
 
 	return 0
 }
--
cgit v0.9.1