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

White space tweaking to match what's in Samba git. 

(Samba git also needs some white space tweaking; this only changes the
cases where we're not obviously "better".)

Change-Id: Iafb9cf8fea67b898b12850a7793806e3fccb39ac
Reviewed-on: https://code.wireshark.org/review/5403
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-11-19 16:53:36 -08:00
parent 4fdabdcfe7
commit d23247e7a9
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
View File

@ -452,7 +452,6 @@ sub Element($$$$$$)
if (not defined($switch_raw_type)) {
die("Unknown type[$type]\n");
}
my $switch_type = "g${switch_raw_type}";
$moreparam = ", $switch_type *".$name;
@ -1141,12 +1140,12 @@ sub Parse($$$$$)
my $h_basename = basename($h_filename);
$self->{res}->{headers} .= "#include \"$h_basename\"\n";
$self->pidl_code("");
if (defined($self->{conformance}->{ett})) {
register_ett($self,$_) foreach(@{$self->{conformance}->{ett}})
}
# Wireshark protocol registration
foreach (@$ndr) {

24
tools/pidl/pidl
View File

@ -191,7 +191,7 @@ the wire representation. It does not make the array a fixed array.
midl.exe would write the above array as the following C header:
typedef struct {
typedef struct {
long abc;
long count;
long foo;
@ -664,17 +664,17 @@ sub process_file($)
if (defined($opt_ws_parser) or
defined($opt_client) or
defined($opt_server) or
defined($opt_header) or
defined($opt_ndr_parser) or
defined($opt_python) or
defined($opt_dump_ndr_tree) or
defined($opt_samba3_header) or
defined($opt_samba3_parser) or
defined($opt_samba3_server) or
defined($opt_samba3_ndr_client) or
defined($opt_samba3_ndr_server)) {
defined($opt_client) or
defined($opt_server) or
defined($opt_header) or
defined($opt_ndr_parser) or
defined($opt_python) or
defined($opt_dump_ndr_tree) or
defined($opt_samba3_header) or
defined($opt_samba3_parser) or
defined($opt_samba3_server) or
defined($opt_samba3_ndr_client) or
defined($opt_samba3_ndr_server)) {
require Parse::Pidl::NDR;
$ndr = Parse::Pidl::NDR::Parse($pidl);
}