X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=python%2Fftdi1.i;h=f397f84eb89c4d84adea104aa8c03f4f839c883c;hp=93793f802df8825f8967d2b54988933f17a3a9c9;hb=3eca5150db07262c1c6eb737e12149201f631d47;hpb=b829fe92a5a283744daee3f689e58729ae930967 diff --git a/python/ftdi1.i b/python/ftdi1.i index 93793f8..f397f84 100644 --- a/python/ftdi1.i +++ b/python/ftdi1.i @@ -19,14 +19,16 @@ inline PyObject* charp2str(const char *v_, long len) #endif } -inline char * str2charp_size(PyObject* pyObj, int * size) +char * str2charp_size(PyObject* pyObj, int * size) { char * v_ = 0; + Py_ssize_t len = 0; #if PY_MAJOR_VERSION >= 3 - PyBytes_AsStringAndSize(pyObj, &v_, (Py_ssize_t*)size); + PyBytes_AsStringAndSize(pyObj, &v_, &len); #else - PyString_AsStringAndSize(pyObj, &v_, (Py_ssize_t*)size); + PyString_AsStringAndSize(pyObj, &v_, &len); #endif + *size = len; return v_; } %}