The branch, v4-17-test has been updated
via c366a064c8f pidl: avoid py compile issues with --pidl-developer
from 88c24655c79 s3:utils: smbget fix a memory leak
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-17-test
- Log -----------------------------------------------------------------
commit c366a064c8fc72af5a531de3f567253bcbb86d7a
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Fri Dec 9 10:36:30 2022 +1300
pidl: avoid py compile issues with --pidl-developer
We get these warnings-as-errors:
librpc/gen_ndr/py_netlogon.c:61903:53: error: stray ‘\’ in program
61903 | PyErr_Format(PyExc_TypeError, "Expected type %s",\ //<PIDL>
Parse::Pidl::Samba4::Python::ConvertObjectFromPythonData
lib/Parse/Pidl/Samba4/Python.pm:2005
but the '\' is unnecessary and unconventional anyway, since we're in a
function argument list.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15404
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Andrew Bartlett <abart...@samba.org>
Autobuild-Date(master): Fri Feb 3 03:27:54 UTC 2023 on atb-devel-224
(cherry picked from commit e26a01a48c4a6ca6f9424ced72eda68e6eb1e7e3)
Autobuild-User(v4-17-test): Jule Anger <jan...@samba.org>
Autobuild-Date(v4-17-test): Fri Jun 30 12:44:07 UTC 2023 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/Python.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm
b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 5c4d3e8e087..03a901cc24d 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -1747,7 +1747,7 @@ sub ConvertObjectFromPythonData($$$$$$;$$)
$self->pidl("}");
$self->pidl("if (test_var > uint_max) {");
$self->indent;
- $self->pidl("PyErr_Format(PyExc_OverflowError, \"Expected type
%s within range 0 - %llu, got %llu\",\\");
+ $self->pidl("PyErr_Format(PyExc_OverflowError, \"Expected type
%s within range 0 - %llu, got %llu\",");
$self->pidl(" PyLong_Type.tp_name, uint_max, test_var);");
$self->pidl($fail);
$self->deindent;
@@ -1756,7 +1756,7 @@ sub ConvertObjectFromPythonData($$$$$$;$$)
$self->deindent;
$self->pidl("} else {");
$self->indent;
- $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type
%s\",\\");
+ $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type
%s\",");
$self->pidl(" PyLong_Type.tp_name);");
$self->pidl($fail);
$self->deindent;
@@ -1786,7 +1786,7 @@ sub ConvertObjectFromPythonData($$$$$$;$$)
$self->pidl("}");
$self->pidl("if (test_var < int_min || test_var > int_max) {");
$self->indent;
- $self->pidl("PyErr_Format(PyExc_OverflowError, \"Expected type
%s within range %lld - %lld, got %lld\",\\");
+ $self->pidl("PyErr_Format(PyExc_OverflowError, \"Expected type
%s within range %lld - %lld, got %lld\",");
$self->pidl(" PyLong_Type.tp_name, int_min, int_max,
test_var);");
$self->pidl($fail);
$self->deindent;
@@ -1795,7 +1795,7 @@ sub ConvertObjectFromPythonData($$$$$$;$$)
$self->deindent;
$self->pidl("} else {");
$self->indent;
- $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type
%s\",\\");
+ $self->pidl("PyErr_Format(PyExc_TypeError, \"Expected type
%s\",");
$self->pidl(" PyLong_Type.tp_name);");
$self->pidl($fail);
$self->deindent;
--
Samba Shared Repository
