From a20b130b5f275a264cfdd59adcb25987fba97fc2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 12 Nov 2004 02:00:58 +0000
Subject: r3691: Use packages (This used to be commit
 975f06b626a3cc25e69bbe95dcfa04dc78e3dc92)

---
 source4/build/smb_build/config_mk.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'source4/build/smb_build/config_mk.pm')

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index eaf7079352..f852e345ac 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -6,6 +6,11 @@
 ###  Released under the GNU GPL				###
 ###########################################################
 
+package config_mk;
+use input;
+
+use strict;
+
 ###########################################################
 # The parsing function which parses the file
 #
@@ -188,9 +193,9 @@ sub _fetch_var_from_config_mk($$$)
 	}
 
 	if (defined($result->{$section}{$key})) {
-		$val = strtrim($result->{$section}{$key}{VAL});
+		$val = input::strtrim($result->{$section}{$key}{VAL});
 	} elsif (defined($result->{DEFAULT}{$key})) {
-		$val = strtrim($result->{DEFAULT}{$key}{VAL});
+		$val = input::strtrim($result->{DEFAULT}{$key}{VAL});
 	}
 
 	return $val;
@@ -225,9 +230,9 @@ sub _fetch_array_from_config_mk($$$)
 	}
 
 	if (defined($result->{$section}{$key})) {
-		@val = str2array($result->{$section}{$key}{VAL});
+		@val = input::str2array($result->{$section}{$key}{VAL});
 	} elsif (defined($result->{DEFAULT}{$key})) {
-		@val = str2array($result->{DEFAULT}{$key}{VAL});
+		@val = input::str2array($result->{DEFAULT}{$key}{VAL});
 	}	
 
 	return @val;
-- 
cgit