r9611: Reset global variables (hf and ett lists) for each parser run. This

avoids building up buckets of unecessary definitions from other parsers.

Get rid of warning and FIXME for unknown data types.  This is handled
by the interface depends list and including the appropriate header files.
(This used to be commit eb5e3b031cd18fb1f83d9ccbb21e5148c8c1cdd0)

1 files changed, 4 insertions, 6 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
index f61ce89ee8..a4c6ecdba0 100644
--- a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
@@ -16,6 +16,8 @@ use Parse::Pidl::Dump qw(DumpTypedef DumpFunction);
 use Parse::Pidl::Ethereal::Conformance qw(ReadConformance);
 
 my %types;
+my %hf;
+my @ett;
 
 my $conformance = {imports=>{}};
 
@@ -280,8 +282,6 @@ sub ElementLevel($$$$$)
 			} elsif ($conformance->{imports}->{$l->{DATA_TYPE}}) {
 				$call = $conformance->{imports}->{$l->{DATA_TYPE}};	
 			} else {
-				warn("Unknown data type `$l->{DATA_TYPE}'");
-				pidl_code "/* FIXME: Handle unknown data type $l->{DATA_TYPE} */";
 				if ($l->{DATA_TYPE} =~ /^([a-z]+)\_(.*)$/)
 				{
 					pidl_code "offset = $1_dissect_$2(tvb,offset,pinfo,tree,drep,$hf,$param);";
@@ -705,6 +705,8 @@ sub Parse($$$$)
 	$tabs = "";
 
 	%res = (code=>"",def=>"",hdr=>"");
+	%hf = ();
+	@ett = ();
 
 	my $notice = 
 "/* DO NOT EDIT
@@ -764,8 +766,6 @@ sub Parse($$$$)
 # ETT
 ###############################################################################
 
-my @ett = ();
-
 sub register_ett($)
 {
 	my $name = shift;
@@ -797,8 +797,6 @@ sub DumpEttDeclaration()
 # HF
 ###############################################################################
 
-my %hf = ();
-
 sub register_hf_field($$$$$$$$) 
 {
 	my ($index,$name,$filter_name,$ft_type,$base_type,$valsstring,$mask,$blurb) = @_;