diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-11-19 16:53:36 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-11-20 00:55:06 +0000 |
| commit | d23247e7a91f9e21e07bb33504b4c1821e234308 (patch) | |
| tree | a3bbd76817a2885bc1cd33e2891dddfc4762fefe /tools/pidl | |
| parent | 4fdabdcfe70c84a040a1230658a51b42c4d17ade (diff) | |
| download | wireshark-d23247e7a91f9e21e07bb33504b4c1821e234308.tar.gz | |
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>
Diffstat (limited to 'tools/pidl')
| -rw-r--r-- | tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 3 | ||||
| -rwxr-xr-x | tools/pidl/pidl | 24 |
2 files changed, 13 insertions, 14 deletions
diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 5c6172f068..04e4741e4b 100644 --- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -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) { diff --git a/tools/pidl/pidl b/tools/pidl/pidl index e8cb7d874b..4eec34685d 100755 --- a/tools/pidl/pidl +++ b/tools/pidl/pidl @@ -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); } |