r9677: Don't generate duplicate function names when processing structure elements

that are bitmaps or enums.
(This used to be commit 1b0e65359cc9caee56a63690af142e8599ea6926)

diff --git a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
index 016a95e01b6f637c6215a1121378d53f01cac3e5..92199e13f108e40fa99027a9231d1db20588ace2 100644 (file)
--- 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";