The branch, master has been updated
via bba1771 Treat uid_t, git_t as 64 bit in Pidl Python bindings
from cdbc6d9 ctdb: Accept the key in hex format for the pstore command
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bba177100c4286f521d60e208a6f048ac33a722f
Author: Douglas Bagnall <[email protected]>
Date: Thu Jun 18 12:38:22 2015 +1200
Treat uid_t, git_t as 64 bit in Pidl Python bindings
This follows their treatment in librpc/ndr/ndr_basic.c.
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-By: Jelmer Vernooij <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Tue Jul 7 07:19:49 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/Python.pm | 10 ++++++----
1 file changed, 6 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 0f54944..ff68e7a 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -972,7 +972,9 @@ sub ConvertObjectFromPythonData($$$$$$;$)
return;
}
if ($actual_ctype->{TYPE} eq "SCALAR" ) {
- if (expandAlias($actual_ctype->{NAME}) =~
/^(u?int64|hyper|dlong|udlong|udlongr|NTTIME_hyper|NTTIME|NTTIME_1sec)$/) {
+ if (expandAlias($actual_ctype->{NAME}) =~
/^(u?int64|hyper|dlong|udlong|udlongr
+
|NTTIME_hyper|NTTIME|NTTIME_1sec
+ |uid_t|gid_t)$/x) {
$self->pidl("if (PyLong_Check($cvar)) {");
$self->indent;
$self->pidl("$target = PyLong_AsLongLong($cvar);");
@@ -990,7 +992,7 @@ sub ConvertObjectFromPythonData($$$$$$;$)
$self->pidl("}");
return;
}
- if (expandAlias($actual_ctype->{NAME}) =~
/^(char|u?int[0-9]*|time_t|uid_t|gid_t)$/) {
+ if (expandAlias($actual_ctype->{NAME}) =~
/^(char|u?int[0-9]*|time_t)$/) {
$self->pidl("PY_CHECK_TYPE(&PyInt_Type, $cvar,
$fail);");
$self->pidl("$target = PyInt_AsLong($cvar);");
return;
@@ -1203,11 +1205,11 @@ sub ConvertScalarToPython($$$)
return "PyLong_FromLongLong($cvar)";
}
- if ($ctypename =~
/^(uint64|hyper|udlong|udlongr|NTTIME_hyper|NTTIME|NTTIME_1sec)$/) {
+ if ($ctypename =~
/^(uint64|hyper|udlong|udlongr|NTTIME_hyper|NTTIME|NTTIME_1sec|uid_t|gid_t)$/) {
return "PyLong_FromUnsignedLongLong($cvar)";
}
- if ($ctypename =~ /^(char|u?int[0-9]*|time_t|uid_t|gid_t)$/) {
+ if ($ctypename =~ /^(char|u?int[0-9]*|time_t)$/) {
return "PyInt_FromLong($cvar)";
}
--
Samba Shared Repository
