Build: Reduce autogen.sh to trivial stub

[libsigrokdecode.git] / util.c

diff --git a/util.c b/util.c
index 27a5e07574cbc0f8e5a31c4df8d72f1cf28d1ace..764474ba2a6e461814e53b574cd87dbecfb81dd9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrokdecode project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
@@ -18,8 +18,8 @@
  * 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"
 
 /**
@@ -32,20 +32,23 @@
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
+ *
+ * @private
  */
-SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
+SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr,
+                           char **outstr)
 {
        PyObject *py_str;
        int ret;
 
-       if (!PyObject_HasAttrString(py_obj, attr)) {
+       if (!PyObject_HasAttrString((PyObject *)py_obj, 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))) {
-               catch_exception("");
+       if (!(py_str = PyObject_GetAttrString((PyObject *)py_obj, attr))) {
+               srd_exception_catch("");
                return SRD_ERR_PYTHON;
        }
 
@@ -67,25 +70,27 @@ SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
  * allocated char *.
  *
  * @param py_obj The dictionary to probe.
- * @param attr Key of the item to retrieve.
- * @param outstr ptr to char * storage to be filled in.
+ * @param key Key of the item to retrieve.
+ * @param outstr Pointer to char * storage to be filled in.
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
+ *
+ * @private
  */
-SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key,
+SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key,
                                char **outstr)
 {
        PyObject *py_value;
        int ret;
 
-       if (!PyDict_Check(py_obj)) {
+       if (!PyDict_Check((PyObject *)py_obj)) {
                srd_dbg("Object is a %s, not a dictionary.",
-                       Py_TYPE(py_obj)->tp_name);
+                       Py_TYPE((PyObject *)py_obj)->tp_name);
                return SRD_ERR_PYTHON;
        }
 
-       if (!(py_value = PyDict_GetItemString(py_obj, key))) {
+       if (!(py_value = PyDict_GetItemString((PyObject *)py_obj, key))) {
                srd_dbg("Dictionary has no attribute '%s'.", key);
                return SRD_ERR_PYTHON;
        }
@@ -98,7 +103,7 @@ SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key,
 
        ret = py_str_as_str(py_value, outstr);
 
-       return SRD_OK;
+       return ret;
 }
 
 /**
@@ -110,8 +115,10 @@ SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key,
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
+ *
+ * @private
  */
-SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr)
+SRD_PRIV int py_str_as_str(const PyObject *py_str, char **outstr)
 {
        PyObject *py_encstr;
        int ret;
@@ -121,14 +128,15 @@ SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr)
        str = NULL;
        ret = SRD_OK;
 
-       if (!PyUnicode_Check(py_str)) {
+       if (!PyUnicode_Check((PyObject *)py_str)) {
                srd_dbg("Object is a %s, not a string object.",
-                       Py_TYPE(py_str)->tp_name);
+                       Py_TYPE((PyObject *)py_str)->tp_name);
                ret = SRD_ERR_PYTHON;
                goto err_out;
        }
 
-       if (!(py_encstr = PyUnicode_AsEncodedString(py_str, "utf-8", NULL))) {
+       if (!(py_encstr = PyUnicode_AsEncodedString((PyObject *)py_str,
+           "utf-8", NULL))) {
                ret = SRD_ERR_PYTHON;
                goto err_out;
        }
@@ -137,18 +145,14 @@ SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr)
                goto err_out;
        }
 
-       if (!(*outstr = g_strdup(str))) {
-               srd_dbg("Failed to g_malloc() outstr.");
-               ret = SRD_ERR_MALLOC;
-               goto err_out;
-       }
+       *outstr = g_strdup(str);
 
 err_out:
        if (py_encstr)
                Py_XDECREF(py_encstr);
 
        if (PyErr_Occurred()) {
-               catch_exception("string conversion failed");
+               srd_exception_catch("string conversion failed");
        }
 
        return ret;
@@ -156,28 +160,30 @@ err_out:
 
 /**
  * Convert a Python list of unicode strings to a NULL-terminated UTF8-encoded
- * char * array. The caller must free each string when finished.
+ * char * array. The caller must g_free() each string when finished.
  *
  * @param py_strlist The list object.
  * @param outstr ptr to char ** storage to be filled in.
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a g_malloc()ed char** upon success.
+ *
+ * @private
  */
-SRD_PRIV int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
+SRD_PRIV int py_strseq_to_char(const PyObject *py_strseq, char ***outstr)
 {
        PyObject *py_str;
        int list_len, i;
        char **out, *str;
 
-       list_len = PyList_Size(py_strlist);
+       list_len = PySequence_Size((PyObject *)py_strseq);
        if (!(out = g_try_malloc(sizeof(char *) * (list_len + 1)))) {
                srd_err("Failed to g_malloc() 'out'.");
                return SRD_ERR_MALLOC;
        }
        for (i = 0; i < list_len; i++) {
                if (!(py_str = PyUnicode_AsEncodedString(
-                   PyList_GetItem(py_strlist, i), "utf-8", NULL)))
+                   PySequence_GetItem((PyObject *)py_strseq, i), "utf-8", NULL)))
                        return SRD_ERR_PYTHON;
                if (!(str = PyBytes_AS_STRING(py_str)))
                        return SRD_ERR_PYTHON;