/*
- * 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>
* 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"
/**
*
* @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(const PyObject *py_obj, const char *attr,
char **outstr)
}
if (!(py_str = PyObject_GetAttrString((PyObject *)py_obj, attr))) {
- catch_exception("");
+ srd_exception_catch("");
return SRD_ERR_PYTHON;
}
* 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(const 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.
+ *
+ * @private
*/
SRD_PRIV int py_str_as_str(const 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;
*
* @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(const 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((PyObject *)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((PyObject *)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;