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

diff --git a/util.c b/util.c
index 51b7cd6..680d3b1 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
@@ -40,23 +40,68 @@ int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
 	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.
+ */
+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
  * allocated char *.
@@ -78,7 +123,7 @@ 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,21 +138,17 @@ int py_str_as_str(PyObject *py_str, char **outstr)
 	}
 
 	if (!(*outstr = g_strdup(str))) {
-		srd_dbg("malloc failed");
+		srd_dbg("outstr 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()) {
-		srd_dbg("string conversion failed");
-		/* TODO: dump exception to srd_dbg */
-		PyErr_Clear();
+		catch_exception("string conversion failed");
 	}
 
 	return ret;