X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=util.c;h=680d3b1ce55c51166490589fbc53e0857163d3f2;hp=090c0c156d267ecf45d10094fa6347b6de061a2c;hb=7a1712c4fd07f64222079acd5ec3fa3348a5cb15;hpb=3a8b2e789262545fe409f95f69319b80e66aac13 diff --git a/util.c b/util.c index 090c0c1..680d3b1 100644 --- a/util.c +++ b/util.c @@ -40,8 +40,8 @@ int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr) int ret; if (!PyObject_HasAttrString(py_obj, attr)) { - srd_dbg("srd: %s object has no attribute '%s'.", - Py_TYPE(py_obj)->tp_name, attr); + srd_dbg("%s object has no attribute '%s'.", + Py_TYPE(py_obj)->tp_name, attr); return SRD_ERR_PYTHON; } @@ -51,8 +51,8 @@ int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr) } if (!PyUnicode_Check(py_str)) { - srd_dbg("srd: %s attribute should be a string, but is a %s.", - attr, Py_TYPE(py_str)->tp_name); + srd_dbg("%s attribute should be a string, but is a %s.", + attr, Py_TYPE(py_str)->tp_name); Py_DecRef(py_str); return SRD_ERR_PYTHON; } @@ -81,18 +81,18 @@ int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr) int ret; if (!PyDict_Check(py_obj)) { - srd_dbg("srd: Object is a %s, not a dictionary.", Py_TYPE(py_obj)->tp_name); + srd_dbg("Object is a %s, not a dictionary.", Py_TYPE(py_obj)->tp_name); return SRD_ERR_PYTHON; } if (!(py_value = PyDict_GetItemString(py_obj, key))) { - srd_dbg("srd: Dictionary has no attribute '%s'.", key); + srd_dbg("Dictionary has no attribute '%s'.", key); return SRD_ERR_PYTHON; } if (!PyUnicode_Check(py_value)) { - srd_dbg("srd: Dictionary value for %s should be a string, but is a %s.", - key, Py_TYPE(py_value)->tp_name); + srd_dbg("Dictionary value for %s should be a string, but is a %s.", + key, Py_TYPE(py_value)->tp_name); return SRD_ERR_PYTHON; } @@ -123,7 +123,7 @@ int py_str_as_str(PyObject *py_str, char **outstr) ret = SRD_OK; if (!PyUnicode_Check(py_str)) { - srd_dbg("srd: object is a %s, not a string object", Py_TYPE(py_str)->tp_name); + srd_dbg("Object is a %s, not a string object.", Py_TYPE(py_str)->tp_name); ret = SRD_ERR_PYTHON; goto err_out; } @@ -138,7 +138,7 @@ int py_str_as_str(PyObject *py_str, char **outstr) } if (!(*outstr = g_strdup(str))) { - srd_dbg("srd: malloc failed"); + srd_dbg("outstr malloc failed"); ret = SRD_ERR_MALLOC; goto err_out; }