sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

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

Browse Source 
that are bitmaps or enums.
(This used to be commit 1b0e65359cc9caee56a63690af142e8599ea6926)
This commit is contained in:
Tim Potter 2005-08-27 08:47:35 +00:00 committed by Gerald (Jerry) Carter
parent 0a579e4ae5
commit 3567c7b2a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
View File

@ -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";