From 1107607295ab68c7759c3c36a0c7674ee893a596 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 25 Jan 2005 23:14:46 +0000
Subject: r4993: Generate nicer name for enum hf.

Start work on supporting bitmaps.
(This used to be commit 6f418f14267291bf8637e5dcd7e8ceca4e430314)
---
 source4/build/pidl/eparser.pm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'source4/build')

diff --git a/source4/build/pidl/eparser.pm b/source4/build/pidl/eparser.pm
index e437e099d9..b334a5c467 100644
--- a/source4/build/pidl/eparser.pm
+++ b/source4/build/pidl/eparser.pm
@@ -288,12 +288,24 @@ sub NeededTypedef($)
 	if ($t->{DATA}->{TYPE} eq "ENUM") {
 
 	    $needed{"hf_$t->{NAME}"} = {
-		'name' => $t->{NAME},
+		'name' => field2name($t->{NAME}),
 		'ft' => 'FT_UINT16',
 		'base' => 'BASE_DEC',
 		'strings' => "VALS($t->{NAME}_vals)"
 		};
 	}
+
+	if ($t->{DATA}->{TYPE} eq "BITMAP") {
+	    foreach my $e (@{$t->{DATA}{ELEMENTS}}) {
+		$e =~ /^(.*?) \( (.*?) \)$/;
+		$needed{"hf_$t->{NAME}_$1"} = {
+		    'name' => "$t->{NAME} $1",
+		    'ft' => "FT_BOOLEAN",
+		    'base' => "32",
+		    'bitmask' => "$2"
+		    };
+	    }
+	}
 }
 
 #####################################################################
@@ -766,7 +778,8 @@ sub RewriteC($$$)
 	next, if !($x =~ /^hf_/);
 	pidl "\t{ &$x,\n";
 	$needed{$x}{strings} = "NULL", if !defined($needed{$x}{strings});
-	pidl "\t  { \"$needed{$x}{name}\", \"$x\", $needed{$x}{ft}, $needed{$x}{base}, $needed{$x}{strings}, 0, \"$x\", HFILL }},\n";
+	$needed{$x}{bitmask} = "0", if !defined($needed{$x}{bitmask});
+	pidl "\t  { \"$needed{$x}{name}\", \"$x\", $needed{$x}{ft}, $needed{$x}{base}, $needed{$x}{strings}, $needed{$x}{bitmask}, \"$x\", HFILL }},\n";
     }
 
     pidl "\t};\n\n";
-- 
cgit