svn commit: samba r9558 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal: .

tpot at samba.org tpot at samba.org
Wed Aug 24 01:58:36 GMT 2005


Author: tpot
Date: 2005-08-24 01:58:36 +0000 (Wed, 24 Aug 2005)
New Revision: 9558

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9558

Log:
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.

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm	2005-08-24 01:52:17 UTC (rev 9557)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm	2005-08-24 01:58:36 UTC (rev 9558)
@@ -176,7 +176,7 @@
 	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 @@
 	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 @@
 
 	$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;



More information about the samba-cvs mailing list