From ee10fb1a12391a76fe81e6e7a92d282ef885bc30 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Dec 2005 02:14:18 +0000
Subject: r12490: Fix --warn-compat (This used to be commit
 ba6a767f1b3a14e076ebd049b4fdcffd64173523)

---
 source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'source4/pidl/lib/Parse/Pidl/Samba4/COM')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm
index b9044078ea..83df9afe88 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm
@@ -3,8 +3,8 @@
 
 package Parse::Pidl::Samba4::COM::Header;
 
-use Parse::Pidl::Typelist;
-use Parse::Pidl::Util qw(has_property);
+use Parse::Pidl::Typelist qw(mapType);
+use Parse::Pidl::Util qw(has_property is_constant);
 
 use vars qw($VERSION);
 $VERSION = '0.01';
@@ -18,7 +18,7 @@ sub GetArgumentProtoList($)
 
 	foreach my $a (@{$f->{ELEMENTS}}) {
 
-		$res .= ", " . Parse::Pidl::Typelist::mapType($a->{TYPE}) . " ";
+		$res .= ", " . mapType($a->{TYPE}) . " ";
 
 		my $l = $a->{POINTERS};
 		$l-- if (Parse::Pidl::Typelist::scalar_is_reference($a->{TYPE}));
@@ -26,13 +26,12 @@ sub GetArgumentProtoList($)
 			$res .= "*";
 		}
 
-		if (defined $a->{ARRAY_LEN}[0] && 
-		!Parse::Pidl::Util::is_constant($a->{ARRAY_LEN}[0]) &&
+		if (defined $a->{ARRAY_LEN}[0] && !is_constant($a->{ARRAY_LEN}[0]) &&
 		!$a->{POINTERS}) {
 			$res .= "*";
 		}
 		$res .= $a->{NAME};
-		if (defined $a->{ARRAY_LEN}[0] && Parse::Pidl::Util::is_constant($a->{ARRAY_LEN}[0])) {
+		if (defined $a->{ARRAY_LEN}[0] && is_constant($a->{ARRAY_LEN}[0])) {
 			$res .= "[$a->{ARRAY_LEN}[0]]";
 		}
 	}
@@ -45,9 +44,7 @@ sub GetArgumentList($)
 	my $f = shift;
 	my $res = "";
 
-	foreach my $a (@{$f->{ELEMENTS}}) {
-		$res .= ", $a->{NAME}";
-	}
+	foreach (@{$f->{ELEMENTS}}) { $res .= ", $_->{NAME}"; }
 
 	return $res;
 }
@@ -65,7 +62,7 @@ sub HeaderVTable($)
 
 	my $data = $interface->{DATA};
 	foreach my $d (@{$data}) {
-		$res .= "\t" . Parse::Pidl::Typelist::mapType($d->{RETURN_TYPE}) . " (*$d->{NAME}) (struct $interface->{NAME} *d, TALLOC_CTX *mem_ctx" . GetArgumentProtoList($d) . ");\\\n" if ($d->{TYPE} eq "FUNCTION");
+		$res .= "\t" . mapType($d->{RETURN_TYPE}) . " (*$d->{NAME}) (struct $interface->{NAME} *d, TALLOC_CTX *mem_ctx" . GetArgumentProtoList($d) . ");\\\n" if ($d->{TYPE} eq "FUNCTION");
 	}
 	$res .= "\n";
 	$res .= "struct $interface->{NAME}_vtable {\n";
-- 
cgit