X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=util.c;h=51b7cd685c4a36d6505b79c0a839e14002fc71b9;hp=3aa0fd90a324ca5349c193f6129e6a858fbed2c1;hb=451680f192b97d652fb02186f5201efa0d668a2a;hpb=b2c19614a6c4eaa0170971d1261a1bb25212e277

diff --git a/util.c b/util.c
index 3aa0fd9..51b7cd6 100644
--- a/util.c
+++ b/util.c
@@ -18,57 +18,132 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "sigrokdecode-internal.h"
 #include "config.h"
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 
 
 /**
- * Helper function to handle Python strings.
+ * Get the value of a python object's attribute, returned as a newly
+ * allocated char *.
  *
- * TODO: @param entries.
+ * @param py_obj The object to probe.
+ * @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_res, PyObject *py_mod, const char *key, char **outstr)
+int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
 {
 	PyObject *py_str;
-	char *str;
 	int ret;
 
-	py_str = PyObject_GetAttrString(py_res, (char *)key); /* NEWREF */
-	if (!py_str || !PyString_Check(py_str)) {
-		ret = SRD_ERR_PYTHON; /* TODO: More specific error? */
-		goto err_h_decref_mod;
+	if (!PyObject_HasAttrString(py_obj, attr)) {
+		srd_dbg("object has no attribute '%s'", attr);
+		return SRD_ERR_PYTHON;
 	}
 
-	/*
-	 * PyString_AsString()'s returned string refers to an internal buffer
-	 * (not a copy), i.e. the data must not be modified, and the memory
-	 * must not be free()'d.
-	 */
-	if (!(str = PyString_AsString(py_str))) {
-		ret = SRD_ERR_PYTHON; /* TODO: More specific error? */
-		goto err_h_decref_str;
+	if (!(py_str = PyObject_GetAttrString(py_obj, attr))) {
+		/* TODO: report exception message/traceback to err/dbg */
+		PyErr_Clear();
+		return SRD_ERR_PYTHON;
+	}
+
+	ret = py_str_as_str(py_str, outstr);
+	Py_XDECREF(py_str);
+
+	return ret;
+}
+
+
+/**
+ * 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_encstr = NULL;
+	str = NULL;
+	ret = SRD_OK;
+
+	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))) {
+		ret = SRD_ERR_PYTHON;
+		goto err_out;
+	}
+	if (!(str = PyBytes_AS_STRING(py_encstr))) {
+		ret = SRD_ERR_PYTHON;
+		goto err_out;
 	}
 
 	if (!(*outstr = g_strdup(str))) {
+		srd_dbg("malloc failed");
 		ret = SRD_ERR_MALLOC;
-		goto err_h_decref_str;
+		goto err_out;
 	}
 
-	Py_XDECREF(py_str);
+err_out:
+	if (py_str)
+		Py_XDECREF(py_str);
+	if (py_encstr)
+		Py_XDECREF(py_encstr);
 
-	return SRD_OK;
+	if (PyErr_Occurred()) {
+		srd_dbg("string conversion failed");
+		/* TODO: dump exception to srd_dbg */
+		PyErr_Clear();
+	}
 
-err_h_decref_str:
-	Py_XDECREF(py_str);
-err_h_decref_mod:
-	Py_XDECREF(py_mod);
+	return ret;
+}
 
-	if (PyErr_Occurred())
-		PyErr_Print(); /* Returns void. */
 
-	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)
+{
+	PyObject *py_str;
+	int list_len, i;
+	char **out, *str;
+
+	list_len = PyList_Size(py_strlist);
+	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)))
+			return SRD_ERR_PYTHON;
+		if (!(str = PyBytes_AS_STRING(py_str)))
+			return SRD_ERR_PYTHON;
+		out[i] = g_strdup(str);
+	}
+	out[i] = NULL;
+	*outstr = out;
+
+	return SRD_OK;
 }