svn commit: samba r9677 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal: .

[tpot at samba.org]

Author: tpot
Date: 2005-08-27 08:47:35 +0000 (Sat, 27 Aug 2005)
New Revision: 9677

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9677

Log:
Don't generate duplicate function names when processing structure elements
that are bitmaps or enums.

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm	2005-08-27 08:28:32 UTC (rev 9676)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm	2005-08-27 08:47:35 UTC (rev 9677)
@@ -115,7 +115,8 @@
 {
 	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 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";