X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=util.c;h=ed31e9749ffec0e6e295110e8b19e69fa51b8b3c;hp=a4268ec176315e92181da6b85da07cd387b02d30;hb=f4d0363dc492cebc3bc37adfbffaff6fafd55ff4;hpb=abeeed8b6da45e1854bc151a8175836b5ca38e34 diff --git a/util.c b/util.c index a4268ec..ed31e97 100644 --- a/util.c +++ b/util.c @@ -46,7 +46,7 @@ SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr, } if (!(py_str = PyObject_GetAttrString((PyObject *)py_obj, attr))) { - catch_exception(""); + srd_exception_catch(""); return SRD_ERR_PYTHON; } @@ -68,8 +68,8 @@ SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr, * allocated char *. * * @param py_obj The dictionary to probe. - * @param attr Key of the item to retrieve. - * @param outstr ptr to char * storage to be filled in. + * @param key Key of the item to retrieve. + * @param outstr Pointer to char * storage to be filled in. * * @return SRD_OK upon success, a (negative) error code otherwise. * The 'outstr' argument points to a malloc()ed string upon success. @@ -150,7 +150,7 @@ err_out: Py_XDECREF(py_encstr); if (PyErr_Occurred()) { - catch_exception("string conversion failed"); + srd_exception_catch("string conversion failed"); } return ret;