shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2024-10-26 07:55:06 +03:00
Code Issues Projects Releases Activity

typewrappers: Replace use of PyString class

Browse Source 
Replace use of PyString with either PyBytes or PyUnicode.
The former is used for buffers with explicit sizes, which
are used by APIs processing raw bytes.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-12-05 17:10:55 +00:00
parent d021f89dfc
commit b4d8863469
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
typewrappers.c
View File

@ -92,7 +92,11 @@ libvirt_charPtrSizeWrap(char *str, Py_ssize_t size)
Py_INCREF(Py_None);
return Py_None;
}
#if PY_MAJOR_VERSION > 2
ret = PyBytes_FromStringAndSize(str, size);
#else
ret = PyString_FromStringAndSize(str, size);
#endif
return ret;
}
@ -105,7 +109,11 @@ libvirt_charPtrWrap(char *str)
Py_INCREF(Py_None);
return Py_None;
}
#if PY_MAJOR_VERSION > 2
ret = PyUnicode_FromString(str);
#else
ret = PyString_FromString(str);
#endif
return ret;
}
@ -118,7 +126,11 @@ libvirt_constcharPtrWrap(const char *str)
Py_INCREF(Py_None);
return Py_None;
}
#if PY_MAJOR_VERSION > 2
ret = PyUnicode_FromString(str);
#else
ret = PyString_FromString(str);
#endif
return ret;
}
@ -326,17 +338,24 @@ libvirt_boolUnwrap(PyObject *obj, bool *val)
int
libvirt_charPtrUnwrap(PyObject *obj, char **str)
{
#if PY_MAJOR_VERSION < 3
const char *ret;
#endif
*str = NULL;
if (!obj) {
PyErr_SetString(PyExc_TypeError, "unexpected type");
return -1;
}
#if PY_MAJOR_VERSION > 2
if (!(*str = PyUnicode_AsUTF8(obj)))
return -1;
#else
ret = PyString_AsString(obj);
if (ret &&
!(*str = strdup(ret)))
return -1;
#endif
return 0;
}