Attachment 17963 Details for Bug 15404 – Patch for v4-18-test

Patch for v4-18-test

bfixes-tmp418.txt (text/plain), 2.97 KB, created by Stefan Metzmacher on 2023-06-28 21:18:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2023-06-28 21:18:31 UTC

Size: 2.97 KB

patch

obsolete

>From 5294bd0c8de89f419a001d1073d40a1459c6f9fe Mon Sep 17 00:00:00 2001
>From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Date: Fri, 9 Dec 2022 10:36:30 +1300
>Subject: [PATCH] pidl: avoid py compile issues with --pidl-developer
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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.
>
>Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
>Autobuild-Date(master): Fri Feb  3 03:27:54 UTC 2023 on atb-devel-224
>
>(cherry picked from commit e26a01a48c4a6ca6f9424ced72eda68e6eb1e7e3)
>---
> pidl/lib/Parse/Pidl/Samba4/Python.pm | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
>index 5c4d3e8e0877..03a901cc24dc 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;
>-- 
>2.34.1
>

Flags:

dbagnall: review+

Actions: View

Attachments on bug 15404: 17960 | 17961 | 17963