use GVariant for passing decoder options and probes

[libsigrokdecode.git] / util.c

diff --git a/util.c b/util.c
index a4268ec176315e92181da6b85da07cd387b02d30..0112efa39847c8e717387d21e7d7d3827a6680a9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -32,6 +32,8 @@
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
+ *
+ * @private
  */
 SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr,
                            char **outstr)
@@ -46,7 +48,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,11 +70,13 @@ 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.
+ *
+ * @private
  */
 SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key,
                                char **outstr)
@@ -111,6 +115,8 @@ SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key,
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
+ *
+ * @private
  */
 SRD_PRIV int py_str_as_str(const PyObject *py_str, char **outstr)
 {
@@ -150,7 +156,7 @@ err_out:
                Py_XDECREF(py_encstr);
 
        if (PyErr_Occurred()) {
-               catch_exception("string conversion failed");
+               srd_exception_catch("string conversion failed");
        }
 
        return ret;
@@ -165,6 +171,8 @@ err_out:
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a g_malloc()ed char** upon success.
+ *
+ * @private
  */
 SRD_PRIV int py_strlist_to_char(const PyObject *py_strlist, char ***outstr)
 {