diff options
| author | Tim Potter <tpot@samba.org> | 2005-08-29 12:22:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:34:55 -0500 |
| commit | 054f206599e9d74de6429dc8f17d9c58342bcc98 (patch) | |
| tree | 45caf6f5ecba32557b20a64bfb922db5d6a6fb33 /source4 | |
| parent | 4b9411896840bfd8b83f39f0ecfa1f16a28a8dcc (diff) | |
| download | samba-054f206599e9d74de6429dc8f17d9c58342bcc98.tar.gz samba-054f206599e9d74de6429dc8f17d9c58342bcc98.tar.bz2 samba-054f206599e9d74de6429dc8f17d9c58342bcc98.zip | |
r9734: 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.
(This used to be commit c2ad9f49a204d0075a3b460c5ea2ca9741fc7125)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm index 92199e13f1..ad466b246a 100644 --- a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm @@ -115,7 +115,7 @@ sub Enum($$$) { 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 Enum($$$) 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 @@ sub Element($$$) { 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 Function($$$) 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})); |