diff options
| author | Tim Potter <tpot@samba.org> | 2005-08-27 08:47:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:34:39 -0500 |
| commit | 3567c7b2a79cbc0992f0257f1dc958bf5d4b0c28 (patch) | |
| tree | 14c3ec6f07a2164ca2e1f421b233d0d5828b0ffb /source4/pidl/lib/Parse/Pidl | |
| parent | 0a579e4ae578a8c482d611a8252fc24192ae16d5 (diff) | |
| download | samba-3567c7b2a79cbc0992f0257f1dc958bf5d4b0c28.tar.gz samba-3567c7b2a79cbc0992f0257f1dc958bf5d4b0c28.tar.bz2 samba-3567c7b2a79cbc0992f0257f1dc958bf5d4b0c28.zip | |
r9677: Don't generate duplicate function names when processing structure elements
that are bitmaps or enums.
(This used to be commit 1b0e65359cc9caee56a63690af142e8599ea6926)
Diffstat (limited to 'source4/pidl/lib/Parse/Pidl')
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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"; |