From a36c43bc2161086a229b620a01eb071f05eda878 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sun, 6 Feb 2005 00:34:44 +0000 Subject: r5242: Check that argument is an integer or a long for uint32_t input typemap. The uint32_t output typemap must return a Python long as an unsigned uint32_t cannot be fully represented by a Python int. Likewise for the NTSTATUS typemap. (This used to be commit 6dba5d6fb43f87bedc380c4f82b1d5f90b70325a) --- source4/scripting/swig/samba.i | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'source4/scripting/swig/samba.i') diff --git a/source4/scripting/swig/samba.i b/source4/scripting/swig/samba.i index 6cdf424095..db48b3c4ba 100644 --- a/source4/scripting/swig/samba.i +++ b/source4/scripting/swig/samba.i @@ -28,11 +28,24 @@ %apply char { int8_t }; %apply unsigned int { uint16_t }; %apply int { int16_t }; -%apply unsigned long { uint32_t }; -%apply long { int32_t }; %apply unsigned long long { uint64_t }; %apply long long { int64_t }; +%typemap(in) uint32_t { + if (PyLong_Check($input)) + $1 = PyLong_AsUnsignedLong($input); + else if (PyInt_Check($input)) + $1 = PyInt_AsLong($input); + else { + PyErr_SetString(PyExc_TypeError,"Expected a long or an int"); + return NULL; + } +} + +%typemap(out) uint32_t { + $result = PyLong_FromUnsignedLong($1); +} + %typemap(out) NTSTATUS { - $result = PyLong_FromLong(NT_STATUS_V($1)); + $result = PyLong_FromUnsignedLong(NT_STATUS_V($1)); } -- cgit