From 3567c7b2a79cbc0992f0257f1dc958bf5d4b0c28 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sat, 27 Aug 2005 08:47:35 +0000 Subject: r9677: Don't generate duplicate function names when processing structure elements that are bitmaps or enums. (This used to be commit 1b0e65359cc9caee56a63690af142e8599ea6926) --- source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm') diff --git a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm index 016a95e01b..92199e13f1 100644 --- a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm @@ -115,7 +115,8 @@ sub Enum($$$) { my ($e,$name,$ifname) = @_; my $valsstring = "$ifname\_$name\_vals"; - my $dissectorname = "$ifname\_dissect\_".StripPrefixes($name); + my $dissectorname = "$ifname\_dissect\_".StripPrefixes($name)."_enum"; + return if (defined($conformance->{noemit}->{$dissectorname})); foreach (@{$e->{ELEMENTS}}) { @@ -153,11 +154,10 @@ sub Enum($$$) sub Bitmap($$$) { my ($e,$name,$ifname) = @_; - my $dissectorname = "$ifname\_dissect\_".StripPrefixes($name); + my $dissectorname = "$ifname\_dissect\_".StripPrefixes($name)."_bitmap"; register_ett("ett_$ifname\_$name"); - pidl_hdr "int $dissectorname(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int hf_index, guint32 param);"; pidl_code "int"; -- cgit