From: Douglas Bagnall Date: Thu, 8 Dec 2022 21:36:30 +0000 (+1300) Subject: pidl: avoid py compile issues with --pidl-developer X-Git-Tag: samba-4.17.9~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c366a064c8fc72af5a531de3f567253bcbb86d7a;p=thirdparty%2Fsamba.git 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",\ // 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 Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett 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 Autobuild-Date(v4-17-test): Fri Jun 30 12:44:07 UTC 2023 on sn-devel-184 --- 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;