srd: Add/use SRD_API/SRD_PRIV macros.

[libsigrokdecode.git] / util.c

diff --git a/util.c b/util.c
index 680d3b1ce55c51166490589fbc53e0857163d3f2..5f186398a7697141c1d7acee44f34f019acddd96 100644 (file)
--- a/util.c
+++ b/util.c
@@ -22,7 +22,6 @@
 #include "sigrokdecode-internal.h"
 #include "config.h"
 
-
 /**
  * Get the value of a python object's attribute, returned as a newly
  * allocated char *.
@@ -34,7 +33,7 @@
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
  */
-int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
+SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
 {
        PyObject *py_str;
        int ret;
@@ -63,7 +62,6 @@ int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
        return ret;
 }
 
-
 /**
  * Get the value of a python dictionary item, returned as a newly
  * allocated char *.
@@ -75,13 +73,15 @@ int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr)
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
  */
-int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr)
+SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key,
+                               char **outstr)
 {
        PyObject *py_value;
        int ret;
 
        if (!PyDict_Check(py_obj)) {
-               srd_dbg("Object is a %s, not a dictionary.", Py_TYPE(py_obj)->tp_name);
+               srd_dbg("Object is a %s, not a dictionary.",
+                       Py_TYPE(py_obj)->tp_name);
                return SRD_ERR_PYTHON;
        }
 
@@ -91,8 +91,8 @@ int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr)
        }
 
        if (!PyUnicode_Check(py_value)) {
-               srd_dbg("Dictionary value for %s should be a string, but is a %s.",
-                       key, Py_TYPE(py_value)->tp_name);
+               srd_dbg("Dictionary value for %s should be a string, but is "
+                       "a %s.", key, Py_TYPE(py_value)->tp_name);
                return SRD_ERR_PYTHON;
        }
 
@@ -101,7 +101,6 @@ int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr)
        return SRD_OK;
 }
 
-
 /**
  * Get the value of a python unicode string object, returned as a newly
  * allocated char *.
@@ -112,7 +111,7 @@ int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr)
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed string upon success.
  */
-int py_str_as_str(PyObject *py_str, char **outstr)
+SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr)
 {
        PyObject *py_encstr;
        int ret;
@@ -123,7 +122,8 @@ int py_str_as_str(PyObject *py_str, char **outstr)
        ret = SRD_OK;
 
        if (!PyUnicode_Check(py_str)) {
-               srd_dbg("Object is a %s, not a string object.", Py_TYPE(py_str)->tp_name);
+               srd_dbg("Object is a %s, not a string object.",
+                       Py_TYPE(py_str)->tp_name);
                ret = SRD_ERR_PYTHON;
                goto err_out;
        }
@@ -154,7 +154,6 @@ err_out:
        return ret;
 }
 
-
 /**
  * Convert a python list of unicode strings to a NULL-terminated UTF8-encoded
  * char * array. The caller must free each string when finished.
@@ -165,7 +164,7 @@ err_out:
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         The 'outstr' argument points to a malloc()ed char ** upon success.
  */
-int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
+SRD_PRIV int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
 {
        PyObject *py_str;
        int list_len, i;
@@ -176,7 +175,7 @@ int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
                return SRD_ERR_MALLOC;
        for (i = 0; i < list_len; i++) {
                if (!(py_str = PyUnicode_AsEncodedString(
-                               PyList_GetItem(py_strlist, i), "utf-8", NULL)))
+                   PyList_GetItem(py_strlist, i), "utf-8", NULL)))
                        return SRD_ERR_PYTHON;
                if (!(str = PyBytes_AS_STRING(py_str)))
                        return SRD_ERR_PYTHON;
@@ -187,4 +186,3 @@ int py_strlist_to_char(PyObject *py_strlist, char ***outstr)
 
        return SRD_OK;
 }
-