osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update from samba tree revision 12205 to 12325 

============================ Samba log start ============
------------------------------------------------------------------------
r12205 | jelmer | 2005-12-13 02:56:04 +0100 (Tue, 13 Dec 2005) | 2 lines

Support 'TFS' command in conformance files

------------------------------------------------------------------------
r12206 | jelmer | 2005-12-13 14:14:23 +0100 (Tue, 13 Dec 2005) | 2 lines

Fix some issues in NOEMIT

------------------------------------------------------------------------
============================ Samba log end ==============


svn path=/trunk/; revision=16851
This commit is contained in:
Jörg Mayer 2005-12-18 22:40:49 +00:00
parent 093444abd3
commit b7d11ac06c
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
View File

@ -232,10 +232,9 @@ sub handle_strip_prefix($$$)
sub handle_noemit($$$) sub handle_noemit($$$)
{ {
my ($pos,$data) = @_; my $pos = shift;
my $type; my $data = shift;
my $type = shift;
$type = shift if ($#_ == 1);
if (defined($type)) { if (defined($type)) {
$data->{noemit}->{$type} = 1; $data->{noemit}->{$type} = 1;

9
tools/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
View File

@ -22,6 +22,7 @@ use Parse::Pidl::Util qw(has_property ParseExpr property_matches make_str);
use Parse::Pidl::NDR qw(ContainsString GetNextLevel); use Parse::Pidl::NDR qw(ContainsString GetNextLevel);
use Parse::Pidl::Dump qw(DumpTypedef DumpFunction); use Parse::Pidl::Dump qw(DumpTypedef DumpFunction);
use Parse::Pidl::Ethereal::Conformance qw(ReadConformance); use Parse::Pidl::Ethereal::Conformance qw(ReadConformance);
use File::Basename;
use vars qw($VERSION); use vars qw($VERSION);
$VERSION = '0.01'; $VERSION = '0.01';
@ -206,6 +207,7 @@ sub Bitmap($$$)
if (defined($conformance->{tfs}->{$hf_bitname})) { if (defined($conformance->{tfs}->{$hf_bitname})) {
pidl_def " $conformance->{tfs}->{$hf_bitname}->{TRUE_STRING},"; pidl_def " $conformance->{tfs}->{$hf_bitname}->{TRUE_STRING},";
pidl_def " $conformance->{tfs}->{$hf_bitname}->{FALSE_STRING},"; pidl_def " $conformance->{tfs}->{$hf_bitname}->{FALSE_STRING},";
$conformance->{tfs}->{$hf_bitname}->{USED} = 1;
} else { } else {
pidl_def " \"$en is SET\","; pidl_def " \"$en is SET\",";
pidl_def " \"$en is NOT SET\","; pidl_def " \"$en is NOT SET\",";
@ -827,7 +829,6 @@ sub Parse($$$$)
$res{headers} .= "#include \"packet-dcerpc-nt.h\"\n"; $res{headers} .= "#include \"packet-dcerpc-nt.h\"\n";
$res{headers} .= "#include \"packet-windows-common.h\"\n"; $res{headers} .= "#include \"packet-windows-common.h\"\n";
use File::Basename;
my $h_basename = basename($h_filename); my $h_basename = basename($h_filename);
$res{headers} .= "#include \"$h_basename\"\n"; $res{headers} .= "#include \"$h_basename\"\n";
@ -1009,6 +1010,12 @@ sub CheckUsed($)
print "$_->{POS}: warning: description never used\n"; print "$_->{POS}: warning: description never used\n";
} }
} }
foreach (values %{$conformance->{tfs}}) {
if (not $_->{USED}) {
print "$_->{POS}: warning: True/False description never used\n";
}
}
} }
1; 1;