summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-12-08 15:08:45 +0100
committerStefan Metzmacher <metze@samba.org>2010-12-08 19:07:09 +0100
commit12c5e3fe26e729a4a01e66f5418d0977ef6de025 (patch)
tree172ae9c697efc1b354cd45ec289499ee3ab5640a
parent63574fda0e43c18e5379654ee53e62ff7657de66 (diff)
downloadsamba-12c5e3fe26e729a4a01e66f5418d0977ef6de025.tar.gz
samba-12c5e3fe26e729a4a01e66f5418d0977ef6de025.tar.bz2
samba-12c5e3fe26e729a4a01e66f5418d0977ef6de025.zip
pidl:Samba4/Python.pm: use PyString_FromStringOrNULL() from pyrpc_util
metze
-rw-r--r--pidl/lib/Parse/Pidl/Samba4/Python.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 3e9178b7e8..1ed75ae0e1 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -1107,19 +1107,19 @@ sub ConvertScalarToPython($$$)
}
if (($ctypename eq "string" or $ctypename eq "nbt_string" or $ctypename eq "nbt_name" or $ctypename eq "wrepl_nbt_name")) {
- return "PyString_FromString_check_null($cvar)";
+ return "PyString_FromStringOrNULL($cvar)";
}
if (($ctypename eq "dns_string" or $ctypename eq "dns_name")) {
- return "PyString_FromString_check_null($cvar)";
+ return "PyString_FromStringOrNULL($cvar)";
}
# Not yet supported
if ($ctypename eq "string_array") { return "PyCObject_FromTallocPtr($cvar)"; }
- if ($ctypename eq "ipv4address") { return "PyString_FromString_check_null($cvar)"; }
- if ($ctypename eq "ipv6address") { return "PyString_FromString_check_null($cvar)"; }
- if ($ctypename eq "dnsp_name") { return "PyString_FromString_check_null($cvar)"; }
- if ($ctypename eq "dnsp_string") { return "PyString_FromString_check_null($cvar)"; }
+ if ($ctypename eq "ipv4address") { return "PyString_FromStringOrNULL($cvar)"; }
+ if ($ctypename eq "ipv6address") { return "PyString_FromStringOrNULL($cvar)"; }
+ if ($ctypename eq "dnsp_name") { return "PyString_FromStringOrNULL($cvar)"; }
+ if ($ctypename eq "dnsp_string") { return "PyString_FromStringOrNULL($cvar)"; }
if ($ctypename eq "pointer") {
return "PyCObject_FromTallocPtr($cvar)";
}