X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=exception.c;h=0c248e169e4c4b45502a8d781df86b532e47801c;hp=07ffab35969770851f941cc0d1bd0a8effac81f1;hb=c07cbb92b129bef7a279169e1d7312811ee5e83f;hpb=ec871a279893cfe0ab378eddc0a9f9bcccc44925

diff --git a/exception.c b/exception.c
index 07ffab3..0c248e1 100644
--- a/exception.c
+++ b/exception.c
@@ -24,8 +24,7 @@
 #include <glib.h>
 #include <frameobject.h> /* Python header not pulled in by default. */
 
-
-void catch_exception(const char *format, ...)
+SRD_PRIV void srd_exception_catch(const char *format, ...)
 {
 	PyObject *etype, *evalue, *etb, *py_str;
 	PyTracebackObject *py_tb;
@@ -41,8 +40,8 @@ void catch_exception(const char *format, ...)
 	PyErr_NormalizeException(&etype, &evalue, &etb);
 
 	if (!(py_str = PyObject_Str(evalue))) {
-		/* Shouldn't happen */
-		srd_dbg("srd: failed to convert exception value to string");
+		/* Shouldn't happen. */
+		srd_dbg("Failed to convert exception value to string.");
 		return;
 	}
 
@@ -68,14 +67,14 @@ void catch_exception(const char *format, ...)
 	/* Send a more precise error location to srd_dbg(), if we have it. */
 	if (etb && etb != Py_None) {
 		tracestr = NULL;
-		py_tb = (PyTracebackObject *) etb;
+		py_tb = (PyTracebackObject *)etb;
 		py_str = PyUnicode_FromFormat("%U:%d in %U",
-				py_tb->tb_frame->f_code->co_filename, py_tb->tb_frame->f_lineno,
-				py_tb->tb_frame->f_code->co_name);
+					py_tb->tb_frame->f_code->co_filename,
+					py_tb->tb_frame->f_lineno,
+					py_tb->tb_frame->f_code->co_name);
 		py_str_as_str(py_str, &tracestr);
 		Py_DecRef(py_str);
-		g_string_printf(msg, "srd: %s in %s: %s", ename,
-				tracestr, str);
+		g_string_printf(msg, "%s in %s: %s", ename, tracestr, str);
 		srd_dbg(msg->str);
 		g_free(tracestr);
 	}
@@ -88,8 +87,4 @@ void catch_exception(const char *format, ...)
 
 	/* Just in case. */
 	PyErr_Clear();
-
-	return;
 }
-
-