Build: Reduce autogen.sh to trivial stub

[libsigrokdecode.git] / exception.c

diff --git a/exception.c b/exception.c
index 1f30c80d95a440b2a8ab7c62fb08e1d24bc463bd..8f15ff22a520550a519dfb343d30ad8b2826933e 100644 (file)
--- 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 "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
 #include "config.h"
 #include <stdarg.h>
 #include <glib.h>
 #include <frameobject.h> /* Python header not pulled in by default. */
 
-SRD_PRIV 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,21 +46,20 @@ SRD_PRIV 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);
@@ -67,7 +67,7 @@ SRD_PRIV 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,