From b18d075e5c726062995a89d1cc88a8e39c3043d7 Mon Sep 17 00:00:00 2001 From: Aurelien Aptel Date: Tue, 9 Feb 2016 18:54:39 +0100 Subject: [PATCH] pidl/ws: whitespace cleanup Imported from the WS repo. Signed-off-by: Aurelien Aptel Reviewed-by: Stefan Metzmacher Reviewed-by: David Disseldorp --- pidl/lib/Parse/Pidl/Samba4/Python.pm | 20 ++++++++++---------- pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm index f43e4d62443..3c84b6e4adb 100644 --- a/pidl/lib/Parse/Pidl/Samba4/Python.pm +++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm @@ -1027,21 +1027,21 @@ sub ConvertObjectFromPythonData($$$$$$;$) my $ctype_alias = ""; my $uint_max = ""; if ($actual_ctype->{TYPE} eq "ENUM") { - # Importantly, ENUM values are unsigned in pidl, and - # typically map to uint32 - $ctype_alias = enum_type_fn($actual_ctype); + # Importantly, ENUM values are unsigned in pidl, and + # typically map to uint32 + $ctype_alias = enum_type_fn($actual_ctype); } elsif ($actual_ctype->{TYPE} eq "BITMAP") { - $ctype_alias = bitmap_type_fn($actual_ctype); + $ctype_alias = bitmap_type_fn($actual_ctype); } elsif ($actual_ctype->{TYPE} eq "SCALAR") { - $ctype_alias = expandAlias($actual_ctype->{NAME}); + $ctype_alias = expandAlias($actual_ctype->{NAME}); } # This is the unsigned Python Integer -> C integer validation - # case. The signed case is below. + # case. The signed case is below. if ($ctype_alias =~ /^(uint[0-9]*|hyper|udlong|udlongr - |NTTIME_hyper|NTTIME|NTTIME_1sec - |uid_t|gid_t)$/x) { - $self->pidl("{"); + |NTTIME_hyper|NTTIME|NTTIME_1sec + |uid_t|gid_t)$/x) { + $self->pidl("{"); $self->indent; $self->pidl("const unsigned long long uint_max = ndr_sizeof2uintmax(sizeof($target));"); $self->pidl("if (PyLong_Check($cvar)) {"); @@ -1092,7 +1092,7 @@ sub ConvertObjectFromPythonData($$$$$$;$) # above, so while it looks like a duplicate, it is not # actually a duplicate. if ($ctype_alias =~ /^(dlong|char|int[0-9]*|time_t)$/x) { - $self->pidl("{"); + $self->pidl("{"); $self->indent; $self->pidl("const long long int_max = ndr_sizeof2intmax(sizeof($target));"); $self->pidl("const long long int_min = -int_max - 1;"); diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index fee7f0654d1..47947dff57b 100644 --- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -1143,12 +1143,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) { @@ -1299,7 +1299,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 }}, "; }