Attachment 10441 Details for Bug 10943 – Patch to clean up NDR.pm

[patch] Patch to clean up NDR.pm

patch.txt (text/plain), 1.63 KB, created by Guy Harris on 2014-11-20 01:10:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guy Harris

Created: 2014-11-20 01:10:51 UTC

Size: 1.63 KB

patch

obsolete

>diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
>index caa58c2..0488ca1 100644
>--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
>+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
>@@ -347,11 +347,9 @@ sub ElementLevel($$$$$$$$)
> 			if ($self->{conformance}->{imports}->{$l->{DATA_TYPE}}) {
> 				$call = $self->{conformance}->{imports}->{$l->{DATA_TYPE}}->{DATA};
> 				$self->{conformance}->{imports}->{$l->{DATA_TYPE}}->{USED} = 1;
>-
> 			} elsif (defined($self->{conformance}->{imports}->{"$pn.$e->{NAME}"})) {
> 				$call = $self->{conformance}->{imports}->{"$pn.$e->{NAME}"}->{DATA};
> 				$self->{conformance}->{imports}->{"$pn.$e->{NAME}"}->{USED} = 1;
>-
> 			} elsif (defined($self->{conformance}->{types}->{$l->{DATA_TYPE}})) {
> 				$call= $self->{conformance}->{types}->{$l->{DATA_TYPE}}->{DISSECTOR_NAME};
> 				$self->{conformance}->{types}->{$l->{DATA_TYPE}}->{USED} = 1;
>@@ -1085,7 +1083,7 @@ sub Parse($$$$$)
> 
> 	my $notice =
> "/* DO NOT EDIT
>-	This filter was automatically generated
>+	This file was automatically generated by Pidl
> 	from $idl_file and $cnf_file.
> 
> 	Pidl is a perl based IDL compiler for DCE/RPC idl files.
>@@ -1275,7 +1273,7 @@ sub DumpHfList($)
> 	foreach (sort {$a->{INDEX} cmp $b->{INDEX}} values %{$self->{conformance}->{header_fields}})
> 	{
> 		$res .= "\t{ &$_->{INDEX},
>-	  { ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str_or_null($_->{BLURB}).", HFILL }},
>+		{ ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str_or_null($_->{BLURB}).", HFILL }},
> ";
> 	}
>

Actions: View

Attachments on bug 10943: 10441