X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=util.c;h=18b316e66cfe80b6811bdc8290958ce7c27c8d45;hb=c9bfccc6347e05e6faba6f27fe0e50a7d55f531c;hp=75dd83e45996a02ce83ca6d41b8a024ed465bbce;hpb=d906d3f978233458fc73b56fb232352affd1b433;p=libsigrokdecode.git

diff --git a/util.c b/util.c
index 75dd83e..18b316e 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,7 +22,6 @@
 #include "sigrokdecode-internal.h"
 #include "config.h"
 
-
 /**
  * Get the value of a python object's attribute, returned as a newly
  * allocated char *.
@@ -40,20 +39,19 @@ int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
 	int ret;
 
 	if (!PyObject_HasAttrString(py_obj, attr)) {
-		srd_dbg("srd: %s object has no attribute '%s'.",
-				Py_TYPE(py_obj)->tp_name, 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("srd: %s attribute should be a string, but is a %s.",
-				attr, Py_TYPE(py_str)->tp_name);
+		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;
 	}
@@ -64,7 +62,6 @@ int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
 	return ret;
 }
 
-
 /**
  * Get the value of a python dictionary item, returned as a newly
  * allocated char *.
@@ -82,18 +79,19 @@ int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr)
 	int ret;
 
 	if (!PyDict_Check(py_obj)) {
-		srd_dbg("srd: Object is a %s, not a dictionary.", Py_TYPE(py_obj)->tp_name);
+		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("srd: Dictionary has no attribute '%s'.", key);
+		srd_dbg("Dictionary has no attribute '%s'.", key);
 		return SRD_ERR_PYTHON;
 	}
 
 	if (!PyUnicode_Check(py_value)) {
-		srd_dbg("srd: Dictionary value for %s should be a string, but is a %s.",
-				key, Py_TYPE(py_value)->tp_name);
+		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;
 	}
 
@@ -102,7 +100,6 @@ int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr)
 	return SRD_OK;
 }
 
-
 /**
  * Get the value of a python unicode string object, returned as a newly
  * allocated char *.
@@ -124,7 +121,8 @@ int py_str_as_str(PyObject *py_str, char **outstr)
 	ret = SRD_OK;
 
 	if (!PyUnicode_Check(py_str)) {
-		srd_dbg("srd: object is a %s, not a string object", Py_TYPE(py_str)->tp_name);
+		srd_dbg("Object is a %s, not a string object.",
+			Py_TYPE(py_str)->tp_name);
 		ret = SRD_ERR_PYTHON;
 		goto err_out;
 	}
@@ -139,7 +137,7 @@ int py_str_as_str(PyObject *py_str, char **outstr)
 	}
 
 	if (!(*outstr = g_strdup(str))) {
-		srd_dbg("srd: malloc failed");
+		srd_dbg("outstr malloc failed");
 		ret = SRD_ERR_MALLOC;
 		goto err_out;
 	}
@@ -149,15 +147,12 @@ err_out:
 		Py_XDECREF(py_encstr);
 
 	if (PyErr_Occurred()) {
-		srd_dbg("srd: 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.
@@ -179,7 +174,7 @@ int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
 		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;
@@ -190,4 +185,3 @@ int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
 
 	return SRD_OK;
 }
-