X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=exception.c;h=8810304aac6090d580abc41057320f89fc1566ba;hp=1c50321c2faa452555a734c2721ee5629b17d7a4;hb=b480383d4605915f7b4cd8f14ccf62af9bf710f3;hpb=57790bc8c558ccf2e57b3d973c043088232628c7

diff --git a/exception.c b/exception.c
index 1c50321..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,9 +17,9 @@
  * 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. */
@@ -46,24 +46,23 @@ SRD_PRIV void srd_exception_catch(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) {
@@ -76,7 +75,7 @@ SRD_PRIV void srd_exception_catch(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);