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

diff --git a/util.c b/util.c
index 51b7cd6..cd77fc1 100644
--- a/util.c
+++ b/util.c
@@ -2,7 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,9 +22,8 @@
 #include "sigrokdecode-internal.h"
 #include "config.h"
 
-
 /**
- * Get the value of a python object's attribute, returned as a newly
+ * Get the value of a Python object's attribute, returned as a newly
  * allocated char *.
  *
  * @param py_obj The object to probe.
@@ -34,31 +33,76 @@
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
  */
-int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
+SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
 {
 	PyObject *py_str;
 	int ret;
 
 	if (!PyObject_HasAttrString(py_obj, attr)) {
-		srd_dbg("object has no attribute '%s'", attr);
+		srd_dbg("%s object has no attribute '%s'.",
+			Py_TYPE(py_obj)->tp_name, attr);
 		return SRD_ERR_PYTHON;
 	}
 
 	if (!(py_str = PyObject_GetAttrString(py_obj, attr))) {
-		/* TODO: report exception message/traceback to err/dbg */
-		PyErr_Clear();
+		catch_exception("");
+		return SRD_ERR_PYTHON;
+	}
+
+	if (!PyUnicode_Check(py_str)) {
+		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;
 	}
 
 	ret = py_str_as_str(py_str, outstr);
-	Py_XDECREF(py_str);
+	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.
+ */
+SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key,
+				char **outstr)
+{
+	PyObject *py_value;
+	int ret;
+
+	if (!PyDict_Check(py_obj)) {
+		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("Dictionary has no attribute '%s'.", key);
+		return SRD_ERR_PYTHON;
+	}
+
+	if (!PyUnicode_Check(py_value)) {
+		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;
+	}
+
+	ret = py_str_as_str(py_value, outstr);
+
+	return SRD_OK;
+}
 
 /**
- * Get the value of a python unicode string object, returned as a newly
+ * Get the value of a Python unicode string object, returned as a newly
  * allocated char *.
  *
  * @param py_str The unicode string object.
@@ -67,7 +111,7 @@ int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
  * @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)
+SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr)
 {
 	PyObject *py_encstr;
 	int ret;
@@ -78,7 +122,8 @@ int py_str_as_str(PyObject *py_str, char **outstr)
 	ret = SRD_OK;
 
 	if (!PyUnicode_Check(py_str)) {
-		srd_dbg("not a string object");
+		srd_dbg("Object is a %s, not a string object.",
+			Py_TYPE(py_str)->tp_name);
 		ret = SRD_ERR_PYTHON;
 		goto err_out;
 	}
@@ -93,49 +138,46 @@ int py_str_as_str(PyObject *py_str, char **outstr)
 	}
 
 	if (!(*outstr = g_strdup(str))) {
-		srd_dbg("malloc failed");
+		srd_dbg("Failed to g_malloc() outstr.");
 		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()) {
-		srd_dbg("string conversion failed");
-		/* TODO: dump exception to srd_dbg */
-		PyErr_Clear();
+		catch_exception("string conversion failed");
 	}
 
 	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.
+ * Convert a Python list of unicode strings to a NULL-terminated UTF8-encoded
+ * char * array. The caller must g_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.
+ *         The 'outstr' argument points to a g_malloc()ed char** upon success.
  */
-int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
+SRD_PRIV 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))))
+	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(py_strlist, i), "utf-8", NULL)))
+		    PyList_GetItem(py_strlist, i), "utf-8", NULL)))
 			return SRD_ERR_PYTHON;
 		if (!(str = PyBytes_AS_STRING(py_str)))
 			return SRD_ERR_PYTHON;
@@ -146,4 +188,3 @@ int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
 
 	return SRD_OK;
 }
-