r8270: Export some symbols, making the code more readable.

(This used to be commit d64bffa17ea1c46d917e362d51741148b85fb97f)

3 files changed, 11 insertions, 8 deletions

diff --git a/source4/build/pidl/Parse/Pidl/Samba/COM/Header.pm b/source4/build/pidl/Parse/Pidl/Samba/COM/Header.pm
index 4f5e0d68ad..7b6c4db212 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/COM/Header.pm
+++ b/source4/build/pidl/Parse/Pidl/Samba/COM/Header.pm
@@ -4,6 +4,7 @@
 package Parse::Pidl::Samba::COM::Header;
 
 use Parse::Pidl::Typelist;
+use Parse::Pidl::Util qw(has_property);
 
 use strict;
 
@@ -109,7 +110,7 @@ sub ParseCoClass($)
 	my $c = shift;
 	my $res = "";
 	$res .= "#define CLSID_" . uc($c->{NAME}) . " $c->{PROPERTIES}->{uuid}\n";
-	if (Parse::Pidl::Util::has_property($c, "progid")) {
+	if (has_property($c, "progid")) {
 		$res .= "#define PROGID_" . uc($c->{NAME}) . " $c->{PROPERTIES}->{progid}\n";
 	}
 	$res .= "\n";
@@ -123,7 +124,7 @@ sub Parse($)
 
 	foreach my $x (@{$idl})
 	{
-		if ($x->{TYPE} eq "INTERFACE" && Parse::Pidl::Util::has_property($x, "object")) {
+		if ($x->{TYPE} eq "INTERFACE" && has_property($x, "object")) {
 			$res.=ParseInterface($x);
 		} 
 
diff --git a/source4/build/pidl/Parse/Pidl/Samba/COM/Proxy.pm b/source4/build/pidl/Parse/Pidl/Samba/COM/Proxy.pm
index f4c23e1d9b..c94ef59ae9 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/COM/Proxy.pm
+++ b/source4/build/pidl/Parse/Pidl/Samba/COM/Proxy.pm
@@ -7,6 +7,7 @@
 package Parse::Pidl::Samba::COM::Proxy;
 
 use Parse::Pidl::Samba::COM::Header;
+use Parse::Pidl::Util qw(has_property);
 
 use strict;
 
@@ -103,7 +104,7 @@ static $fn->{RETURN_TYPE} dcom_proxy_$interface->{NAME}_$name(struct $interface-
 	
 	# Put arguments into r
 	foreach my $a (@{$fn->{ELEMENTS}}) {
-		next unless (Parse::Pidl::Util::has_property($a, "in"));
+		next unless (has_property($a, "in"));
 		if (Parse::Pidl::Typelist::typeIs($a->{TYPE}, "INTERFACE")) {
 			$res .="\tNDR_CHECK(dcom_OBJREF_from_IUnknown(&r.in.$a->{NAME}.obj, $a->{NAME}));\n";
 		} else {
@@ -126,7 +127,7 @@ static $fn->{RETURN_TYPE} dcom_proxy_$interface->{NAME}_$name(struct $interface-
 
 	# Put r info back into arguments
 	foreach my $a (@{$fn->{ELEMENTS}}) {
-		next unless (Parse::Pidl::Util::has_property($a, "out"));
+		next unless (has_property($a, "out"));
 
 		if (Parse::Pidl::Typelist::typeIs($a->{TYPE}, "INTERFACE")) {
 			$res .="\tNDR_CHECK(dcom_IUnknown_from_OBJREF(d->ctx, &$a->{NAME}, r.out.$a->{NAME}.obj));\n";
@@ -171,7 +172,7 @@ sub RegistrationFunction($$)
 	$res .="\tNTSTATUS status = NT_STATUS_OK;\n";
 	foreach my $interface (@{$idl}) {
 		next if $interface->{TYPE} ne "INTERFACE";
-		next if not Parse::Pidl::Util::has_property($interface, "object");
+		next if not has_property($interface, "object");
 
 		my $data = $interface->{DATA};
 		my $count = 0;
@@ -199,8 +200,8 @@ sub Parse($)
 
 	foreach my $x (@{$pidl}) {
 		next if ($x->{TYPE} ne "INTERFACE");
-		next if Parse::Pidl::Util::has_property($x, "local");
-		next unless Parse::Pidl::Util::has_property($x, "object");
+		next if has_property($x, "local");
+		next unless has_property($x, "object");
 
 		$res .= ParseInterface($x);
 	}
diff --git a/source4/build/pidl/Parse/Pidl/Samba/COM/Stub.pm b/source4/build/pidl/Parse/Pidl/Samba/COM/Stub.pm
index a06671e76d..785c34fc77 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/COM/Stub.pm
+++ b/source4/build/pidl/Parse/Pidl/Samba/COM/Stub.pm
@@ -7,6 +7,7 @@
 
 package Parse::Pidl::Samba::COM::Stub;
 
+use Parse::Pidl::Util qw(has_property);
 use strict;
 
 my($res);
@@ -290,7 +291,7 @@ sub ParseInterface($)
 {
 	my($interface) = shift;
 	
-	return "" if Parse::Pidl::Util::has_property($interface, "local");
+	return "" if has_property($interface, "local");
 	
 	my($data) = $interface->{DATA};
 	my $count = 0;