GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: Fix type.

Browse Source 
* lang/python/gpgme.i: Use correct Python type for size.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-06-08 17:04:02 +02:00
parent e3c5913a33
commit 990492ea4f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lang/python/gpgme.i
View File

@ -183,18 +183,28 @@
/* For gpgme_data_write, but should be universal. */ /* For gpgme_data_write, but should be universal. */
%typemap(in) (const void *buffer, size_t size) { %typemap(in) (const void *buffer, size_t size) {
Py_ssize_t ssize;
if ($input == Py_None) if ($input == Py_None)
$1 = NULL, $2 = 0; $1 = NULL, $2 = 0;
else if (PyUnicode_Check($input)) else if (PyUnicode_Check($input))
$1 = PyUnicode_AsUTF8AndSize($input, (size_t *) &$2); $1 = PyUnicode_AsUTF8AndSize($input, &ssize);
else if (PyBytes_Check($input)) else if (PyBytes_Check($input))
PyBytes_AsStringAndSize($input, (char **) &$1, (size_t *) &$2); PyBytes_AsStringAndSize($input, (char **) &$1, &ssize);
else { else {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"arg %d: expected str, bytes, or None, got %s", "arg %d: expected str, bytes, or None, got %s",
$argnum, $input->ob_type->tp_name); $argnum, $input->ob_type->tp_name);
return NULL; return NULL;
} }
if (! $1)
$2 = 0;
else
{
assert (ssize >= 0);
$2 = (size_t) ssize;
}
} }
%typemap(freearg) (const void *buffer, size_t size) ""; %typemap(freearg) (const void *buffer, size_t size) "";