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

[tpot at samba.org]

Author: tpot
Date: 2005-08-29 12:22:48 +0000 (Mon, 29 Aug 2005)
New Revision: 9734

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

Log:
The ethereal parser generator was generating duplicate functions for
fields in structures with the same name as a structure (i.e
security_ace.object and security_ace_object).  I've twiddled the naming
scheme a bit and things are a bit more unique but there is still may be
some naming conflicts in other IDL files.

We are now getting confused over fields with the same name in unions
(e.g security_ace_object_ctr.object) plus some other union weirdness.

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-29 12:16:49 UTC (rev 9733)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm	2005-08-29 12:22:48 UTC (rev 9734)
@@ -115,7 +115,7 @@
 {
 	my ($e,$name,$ifname) = @_;
 	my $valsstring = "$ifname\_$name\_vals";
-	my $dissectorname = "$ifname\_dissect\_".StripPrefixes($name)."_enum";
+	my $dissectorname = "$ifname\_dissect\_enum\_".StripPrefixes($name);
 
 	return if (defined($conformance->{noemit}->{$dissectorname}));
 
@@ -154,7 +154,7 @@
 sub Bitmap($$$)
 {
 	my ($e,$name,$ifname) = @_;
-	my $dissectorname = "$ifname\_dissect\_".StripPrefixes($name)."_bitmap";
+	my $dissectorname = "$ifname\_dissect\_bitmap\_".StripPrefixes($name);
 
 	register_ett("ett_$ifname\_$name");
 
@@ -313,7 +313,7 @@
 {
 	my ($e,$pn,$ifname) = @_;
 
-	my $dissectorname = "$ifname\_dissect\_".StripPrefixes($pn)."\_".StripPrefixes($e->{NAME});
+	my $dissectorname = "$ifname\_dissect\_element\_".StripPrefixes($pn)."\_".StripPrefixes($e->{NAME});
 
 	my $call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, drep);";
 
@@ -402,7 +402,7 @@
 sub Struct($$$)
 {
 	my ($e,$name,$ifname) = @_;
-	my $dissectorname = "$ifname\_dissect\_".StripPrefixes($name);
+	my $dissectorname = "$ifname\_dissect\_struct\_".StripPrefixes($name);
 
 	return if (defined($conformance->{noemit}->{$dissectorname}));