X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=util.c;h=be14041ce5147a1dcf616000bdcfb8729cd915b4;hb=d8d409590ce21116d85800c0eb8be287817a0eed;hp=0112efa39847c8e717387d21e7d7d3827a6680a9;hpb=57790bc8c558ccf2e57b3d973c043088232628c7;p=libsigrokdecode.git

diff --git a/util.c b/util.c
index 0112efa..be14041 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrokdecode project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
@@ -18,9 +18,9 @@
  * 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 <config.h>
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
 
 /**
  * Get the value of a Python object's attribute, returned as a newly
@@ -145,11 +145,7 @@ SRD_PRIV int py_str_as_str(const PyObject *py_str, char **outstr)
 		goto err_out;
 	}
 
-	if (!(*outstr = g_strdup(str))) {
-		srd_dbg("Failed to g_malloc() outstr.");
-		ret = SRD_ERR_MALLOC;
-		goto err_out;
-	}
+	*outstr = g_strdup(str);
 
 err_out:
 	if (py_encstr)
@@ -174,20 +170,20 @@ err_out:
  *
  * @private
  */
-SRD_PRIV int py_strlist_to_char(const PyObject *py_strlist, char ***outstr)
+SRD_PRIV int py_strseq_to_char(const PyObject *py_strseq, char ***outstr)
 {
 	PyObject *py_str;
 	int list_len, i;
 	char **out, *str;
 
-	list_len = PyList_Size((PyObject *)py_strlist);
+	list_len = PySequence_Size((PyObject *)py_strseq);
 	if (!(out = g_try_malloc(sizeof(char *) * (list_len + 1)))) {
 		srd_err("Failed to g_malloc() 'out'.");
 		return SRD_ERR_MALLOC;
 	}
 	for (i = 0; i < list_len; i++) {
 		if (!(py_str = PyUnicode_AsEncodedString(
-		    PyList_GetItem((PyObject *)py_strlist, i), "utf-8", NULL)))
+		    PySequence_GetItem((PyObject *)py_strseq, i), "utf-8", NULL)))
 			return SRD_ERR_PYTHON;
 		if (!(str = PyBytes_AS_STRING(py_str)))
 			return SRD_ERR_PYTHON;