The branch, master has been updated via 5241617 pidl-wireshark: fix the trailling white space in the generated headers via cd871a6 pidl-wireshark: fix trailing white space in the HF definition from 0de6282 Fix bug #10187 - Missing talloc_free can leak stackframe in error path.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 52416175dba7c359f0f324c6f0754c75a4cca18d Author: Matthieu Patou <m...@matws.net> Date: Tue Oct 8 12:23:21 2013 -0700 pidl-wireshark: fix the trailling white space in the generated headers Signed-off-by: Matthieu Patou <m...@matws.net> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Wed Oct 9 10:31:25 CEST 2013 on sn-devel-104 commit cd871a6b8c82bd2b9d2c1470ea93ba84b7f57885 Author: Matthieu Patou <m...@matws.net> Date: Tue Oct 8 12:22:18 2013 -0700 pidl-wireshark: fix trailing white space in the HF definition Signed-off-by: Matthieu Patou <m...@matws.net> Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 6 +++--- pidl/tests/wireshark-ndr.pl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 1151dc0..91ef118 100644 --- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -1021,9 +1021,9 @@ sub Parse($$$$$) This filter was automatically generated from $idl_file and $cnf_file. - Pidl is a perl based IDL compiler for DCE/RPC idl files. + Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. - Instructions on how to download and install Pidl can be + Instructions on how to download and install Pidl can be found at http://wiki.wireshark.org/Pidl \$Id\$ @@ -1192,7 +1192,7 @@ sub DumpHfList($) foreach (values %{$self->{conformance}->{header_fields}}) { - $res .= "\t{ &$_->{INDEX}, + $res .= "\t{ &$_->{INDEX}, { ".make_str($_->{NAME}).", ".make_str($_->{FILTER}).", $_->{FT_TYPE}, $_->{BASE_TYPE}, $_->{VALSSTRING}, $_->{MASK}, ".make_str_or_null($_->{BLURB}).", HFILL }}, "; } diff --git a/pidl/tests/wireshark-ndr.pl b/pidl/tests/wireshark-ndr.pl index 8c2cd47..49ecc5c 100755 --- a/pidl/tests/wireshark-ndr.pl +++ b/pidl/tests/wireshark-ndr.pl @@ -227,7 +227,7 @@ $x->{conformance} = { }; is($x->DumpHfList(), "\tstatic hf_register_info hf[] = { - { &hf_bla, + { &hf_bla, { \"Bla\", \"bla.field\", FT_UINT32, BASE_DEC, NULL, 255, \"NULL\", HFILL }}, }; "); -- Samba Shared Repository