X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=exception.c;h=8810304aac6090d580abc41057320f89fc1566ba;hb=41bab68212533f4697ad378af574e06ea83e4fd9;hp=a67600fa4f50a87eaba3667bcdb7e4b004040627;hpb=c9bfccc6347e05e6faba6f27fe0e50a7d55f531c;p=libsigrokdecode.git

diff --git a/exception.c b/exception.c
index a67600f..8810304 100644
--- a/exception.c
+++ b/exception.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrokdecode project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
@@ -17,14 +17,15 @@
  * 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"
 #include <stdarg.h>
 #include <glib.h>
 #include <frameobject.h> /* Python header not pulled in by default. */
 
-void catch_exception(const char *format, ...)
+/** @private */
+SRD_PRIV void srd_exception_catch(const char *format, ...)
 {
 	PyObject *etype, *evalue, *etb, *py_str;
 	PyTracebackObject *py_tb;
@@ -45,29 +46,28 @@ void catch_exception(const char *format, ...)
 		return;
 	}
 
-	msg = g_string_sized_new(128);
-	va_start(args, format);
-	g_string_vprintf(msg, format, args);
-	va_end(args);
-
-	/* Can be NULL. */
+	/* Send the exception error message(s) to srd_err(). */
 	if (evalue)
 		ename = (char *)Py_TYPE(evalue)->tp_name;
 	else
+		/* Can be NULL. */
 		ename = "(unknown exception)";
 
-	/* Send the exception error message(s) to srd_err(). */
-	py_str_as_str(py_str, &str);
+	msg = g_string_sized_new(128);
 	g_string_append(msg, ename);
 	g_string_append(msg, ": ");
+	va_start(args, format);
+	g_string_append_vprintf(msg, format, args);
+	va_end(args);
+	py_str_as_str(py_str, &str);
 	g_string_append(msg, str);
 	Py_DecRef(py_str);
-	srd_err(msg->str);
+	srd_err("%s", msg->str);
 
 	/* 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,
@@ -75,7 +75,7 @@ void catch_exception(const char *format, ...)
 		py_str_as_str(py_str, &tracestr);
 		Py_DecRef(py_str);
 		g_string_printf(msg, "%s in %s: %s", ename, tracestr, str);
-		srd_dbg(msg->str);
+		srd_dbg("%s", msg->str);
 		g_free(tracestr);
 	}
 	g_free(str);