From 95d4e550bd66cefe19396387ad52fb3cec5d0b64 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 17 Aug 2007 13:08:00 +0000
Subject: r24520: make use of the new ElementStars() and ArrayBrackets()
 functions

metze
(This used to be commit fad5af2f2069993b7284e74a177b78a4b4798383)
---
 source4/pidl/lib/Parse/Pidl/Samba4.pm        |  2 +-
 source4/pidl/lib/Parse/Pidl/Samba4/Header.pm | 31 +++-------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

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

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/source4/pidl/lib/Parse/Pidl/Samba4.pm
index ebe74d488d..347d288cee 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4.pm
@@ -7,7 +7,7 @@ package Parse::Pidl::Samba4;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(is_intree choose_header DeclLong);
+@EXPORT = qw(is_intree choose_header NumStars ElementStars ArrayBrackets DeclLong);
 
 use Parse::Pidl::Util qw(has_property is_constant);
 use Parse::Pidl::NDR qw(GetNextLevel);
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 9d8b521a49..7deb3ca331 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -10,8 +10,7 @@ use strict;
 use Parse::Pidl qw(fatal);
 use Parse::Pidl::Typelist qw(mapTypeName scalar_is_reference);
 use Parse::Pidl::Util qw(has_property is_constant);
-use Parse::Pidl::NDR qw(GetNextLevel);
-use Parse::Pidl::Samba4 qw(is_intree);
+use Parse::Pidl::Samba4 qw(is_intree ElementStars ArrayBrackets);
 
 use vars qw($VERSION);
 $VERSION = '0.01';
@@ -64,34 +63,10 @@ sub HeaderElement($)
 		} else {
 			HeaderType($element, $element->{TYPE}, "");
 		}
-		pidl " ";
-		my $numstar = 0;
-		foreach my $l (@{$element->{LEVELS}}) {
-			next unless ($l->{TYPE} eq "POINTER");
-
-			my $nl = GetNextLevel($element, $l);
-			next if (defined($nl) and $nl->{TYPE} eq "ARRAY");
-
-			$numstar++;
-		}
-		if ($numstar >= 1) {
-			$numstar-- if (scalar_is_reference($element->{TYPE}));
-		}
-		foreach my $l (@{$element->{LEVELS}}) {
-			next unless ($l->{TYPE} eq "ARRAY");
-			next if ($l->{IS_FIXED}) and
-				not has_property($element, "charset");
-			$numstar++;
-		}
-		pidl "*" foreach (1..$numstar);
+		pidl " ".ElementStars($element);
 	}
 	pidl $element->{NAME};
-	foreach my $l (@{$element->{LEVELS}}) {
-		next unless ($l->{TYPE} eq "ARRAY");
-		next unless ($l->{IS_FIXED} and
-			not has_property($element, "charset"));
-		pidl "[$l->{SIZE_IS}]";
-	}
+	pidl ArrayBrackets($element);
 
 	pidl ";";
 	if (defined $element->{PROPERTIES}) {
-- 
cgit