shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-07-30 23:41:52 +03:00
Code Issues Projects Releases Activity

override: Switch virStreamSend wrapper to use libvirt_charPtrSizeUnwrap

Browse Source 
Instead of using a 'z#i' format string to receive byte array,
use 'O' and then libvirt_charPtrSizeUnwrap. This lets us hide
the Python 3 vs 2 differences in typewrappers.c

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange
2013-12-09 14:53:34 +00:00
parent e6551e60ce
commit d40861012c
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libvirt-override.c
View File

@ -6920,21 +6920,22 @@ libvirt_virStreamSend(PyObject *self ATTRIBUTE_UNUSED,
{
PyObject *py_retval;
PyObject *pyobj_stream;
PyObject *pyobj_data;
virStreamPtr stream;
char *data;
int datalen;
Py_ssize_t datalen;
int ret;
int nbytes;
if (!PyArg_ParseTuple(args, (char *) "Oz#i:virStreamRecv",
&pyobj_stream, &data, &datalen, &nbytes)) {
if (!PyArg_ParseTuple(args, (char *) "OO:virStreamRecv",
&pyobj_stream, &pyobj_data)) {
DEBUG("%s failed to parse tuple\n", __FUNCTION__);
return VIR_PY_INT_FAIL;
}
stream = PyvirStream_Get(pyobj_stream);
libvirt_charPtrSizeUnwrap(pyobj_data, &data, &datalen);
LIBVIRT_BEGIN_ALLOW_THREADS;
ret = virStreamSend(stream, data, nbytes);
ret = virStreamSend(stream, data, datalen);
LIBVIRT_END_ALLOW_THREADS;
DEBUG("StreamSend ret=%d\n", ret);