summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-08-24 01:58:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:29 -0500
commit12e269c9381da19058f57b313f70066bc06030ac (patch)
treeea5646302217c2842f8992491957b8cfd82a6099 /source4
parent479ef0a3874098bdc90021908b329f6d74aa1b4b (diff)
downloadsamba-12e269c9381da19058f57b313f70066bc06030ac.tar.gz
samba-12e269c9381da19058f57b313f70066bc06030ac.tar.bz2
samba-12e269c9381da19058f57b313f70066bc06030ac.zip
r9558: Add more whitespace to generated output.
Change conformance file warning to something more understandable. Don't generate duplicate duplicate element dissectors for function call arguments. Hey this makes the winreg dissector compile, but not link. (This used to be commit 545d3deaa43ed2e837a7fb5e0cf5761281a9451f)
Diffstat (limited to 'source4')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm6
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 c013d5670a..72ff819b68 100644
--- a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
@@ -176,7 +176,7 @@ sub Bitmap($$$)
pidl_code "if(parent_tree) {";
indent;
pidl_code "item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, $e->{ALIGN}, TRUE);";
- pidl_code "tree=proto_item_add_subtree(item,ett_$ifname\_$name);";
+ pidl_code "tree = proto_item_add_subtree(item,ett_$ifname\_$name);";
deindent;
pidl_code "}\n";
@@ -352,7 +352,7 @@ sub Function($$$)
my %dissectornames;
foreach (@{$fn->{ELEMENTS}}) {
- $dissectornames{$_->{NAME}} = Element($_, $fn->{NAME}, $ifname)
+ $dissectornames{$_->{NAME}} = Element($_, $fn->{NAME}, $ifname) if not defined($dissectornames{$_->{NAME}});
}
my $fn_name = $_->{NAME};
@@ -664,7 +664,7 @@ sub Initialize($)
$conformance = {};
- ReadConformance($cnf_file, $conformance) or print "Warning: Not using conformance file `$cnf_file'\n";
+ ReadConformance($cnf_file, $conformance) or print "Warning: No conformance file `$cnf_file'\n";
foreach my $bytes (qw(1 2 4 8)) {
my $bits = $bytes * 8;