X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=util.c;h=c65cbfdde07e515f09b119419b37695074475e82;hp=df433d719f6bb08ad26262883ec5acd7434ed366;hb=f38ec2855ce41154bc1035dd7f1ab9a21f411f0d;hpb=159699490ea4bf2495e99dcd5fb18b240d7499df

diff --git a/util.c b/util.c
index df433d7..c65cbfd 100644
--- a/util.c
+++ b/util.c
@@ -19,69 +19,153 @@
  */
 
 #include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "sigrokdecode-internal.h"
 #include "config.h"
 
 
 /**
- * Helper function to get the value of a python object's attribute,
- * returned as a newly allocated char *.
+ * Get the value of a python object's attribute, returned as a newly
+ * allocated char *.
  *
  * @param py_obj The object to probe.
- * @param key Name of the attribute to retrieve.
+ * @param attr Name of the attribute to retrieve.
  * @param outstr ptr 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.
  */
-int h_str(PyObject *py_obj, const char *key, char **outstr)
+int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
 {
-	PyObject *py_str, *py_encstr;
-	char *str;
+	PyObject *py_str;
+	int ret;
+
+	if (!PyObject_HasAttrString(py_obj, attr)) {
+		srd_dbg("object has no attribute '%s'", attr);
+		return SRD_ERR_PYTHON;
+	}
+
+	if (!(py_str = PyObject_GetAttrString(py_obj, attr))) {
+		/* TODO: report exception message/traceback to err/dbg */
+		PyErr_Clear();
+		return SRD_ERR_PYTHON;
+	}
+
+	if (!PyUnicode_Check(py_str)) {
+		srd_err("%s attribute should be a string, but is a %s.",
+				attr, py_str->ob_type->tp_name);
+		Py_DecRef(py_str);
+		return SRD_ERR_PYTHON;
+	}
+
+	ret = py_str_as_str(py_str, outstr);
+	Py_DecRef(py_str);
+
+	return ret;
+}
+
+
+/**
+ * Get the value of a python dictionary item, returned as a newly
+ * 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.
+ *
+ * @return SRD_OK upon success, a (negative) error code otherwise.
+ *         The 'outstr' argument points to a malloc()ed string upon success.
+ */
+int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr)
+{
+	PyObject *py_value;
+	int ret;
+
+	if (!PyDict_Check(py_obj)) {
+		srd_err("Object is not a dictionary.");
+		return SRD_ERR_PYTHON;
+	}
+
+	if (!(py_value = PyDict_GetItemString(py_obj, key))) {
+		srd_err("Dictionary has no attribute '%s'", key);
+		return SRD_ERR_PYTHON;
+	}
+
+	if (!PyUnicode_Check(py_value)) {
+		srd_err("Dictionary value should be a string, but is a %s.",
+				key, py_value->ob_type->tp_name);
+		return SRD_ERR_PYTHON;
+	}
+
+	ret = py_str_as_str(py_value, outstr);
+
+	return SRD_OK;
+}
+
+
+/**
+ * Get the value of a python unicode string object, returned as a newly
+ * allocated char *.
+ *
+ * @param py_str The unicode string object.
+ * @param outstr ptr 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.
+ */
+int py_str_as_str(PyObject *py_str, char **outstr)
+{
+	PyObject *py_encstr;
 	int ret;
+	char *str;
 
-	py_str = py_encstr = NULL;
+	py_encstr = NULL;
 	str = NULL;
 	ret = SRD_OK;
 
-	if (!(py_str = PyObject_GetAttrString(py_obj, (char *)key))) {
-		/* TODO: log level 4 debug message */
+	if (!PyUnicode_Check(py_str)) {
+		srd_dbg("not a string object");
 		ret = SRD_ERR_PYTHON;
 		goto err_out;
 	}
 
 	if (!(py_encstr = PyUnicode_AsEncodedString(py_str, "utf-8", NULL))) {
-		/* TODO: log level 4 debug message */
 		ret = SRD_ERR_PYTHON;
 		goto err_out;
 	}
 	if (!(str = PyBytes_AS_STRING(py_encstr))) {
-		/* TODO: log level 4 debug message */
 		ret = SRD_ERR_PYTHON;
 		goto err_out;
 	}
 
 	if (!(*outstr = g_strdup(str))) {
-		/* TODO: log level 4 debug message */
+		srd_dbg("malloc failed");
 		ret = SRD_ERR_MALLOC;
 		goto err_out;
 	}
 
 err_out:
-	if (py_str)
-		Py_XDECREF(py_str);
 	if (py_encstr)
 		Py_XDECREF(py_encstr);
 
-	if (PyErr_Occurred())
-		/* TODO: log level 4 debug message */
-		PyErr_Print();
+	if (PyErr_Occurred()) {
+		srd_dbg("string conversion failed");
+		/* TODO: dump exception to srd_dbg */
+		PyErr_Clear();
+	}
 
 	return ret;
 }
 
+
 /**
  * Convert a python list of unicode strings to a NULL-terminated UTF8-encoded
  * char * array. The caller must free each string when finished.
+ *
+ * @param py_strlist The list object.
+ * @param outstr ptr 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 char ** upon success.
  */
 int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
 {
@@ -93,7 +177,8 @@ int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
 	if (!(out = g_try_malloc(sizeof(char *) * (list_len + 1))))
 		return SRD_ERR_MALLOC;
 	for (i = 0; i < list_len; i++) {
-		if (!(py_str = PyUnicode_AsEncodedString(PyList_GetItem(py_strlist, i), "utf-8", NULL)))
+		if (!(py_str = PyUnicode_AsEncodedString(
+				PyList_GetItem(py_strlist, i), "utf-8", NULL)))
 			return SRD_ERR_PYTHON;
 		if (!(str = PyBytes_AS_STRING(py_str)))
 			return SRD_ERR_PYTHON;