summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-09-03 02:06:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:36:26 -0500
commit563be66ccbd6473212314708cced9d134e2b5f8f (patch)
tree032f95a738de2e9b2973b047955c53ff1c694c2f /source4
parent7a81e529dc295d9da5980a88257bf903f321519a (diff)
downloadsamba-563be66ccbd6473212314708cced9d134e2b5f8f.tar.gz
samba-563be66ccbd6473212314708cced9d134e2b5f8f.tar.bz2
samba-563be66ccbd6473212314708cced9d134e2b5f8f.zip
r9983: Make the NOEMIT conformance directive with no argument mean do not
emit any dissectors for this IDL. (This used to be commit 55a98b3dfdef21df172dac6cff4ebc114b35df00)
Diffstat (limited to 'source4')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm11
1 files changed, 9 insertions, 2 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
index 45654fe6aa..8a4782073d 100644
--- a/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
+++ b/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
@@ -68,9 +68,16 @@ sub handle_strip_prefix($$)
sub handle_noemit($$)
{
- my ($data,$type) = @_;
+ my ($data) = shift;
+ my $type;
- $data->{noemit}->{$type} = 1;
+ $type = shift if ($#_ == 1);
+
+ if (defined($type)) {
+ $data->{noemit}->{$type} = 1;
+ } else {
+ $data->{noemit_dissector} = 1;
+ }
}
sub handle_protocol($$$$$)