From 62a2b15ce3fe6af6867c30cfc9c14c01d201a898 Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Wed, 11 Dec 2013 23:41:02 +0100 Subject: [PATCH] Easier access to sequences of strings, not just lists. --- decoder.c | 2 +- libsigrokdecode-internal.h | 2 +- type_decoder.c | 2 +- util.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/decoder.c b/decoder.c index 1b0ed2a..858b56a 100644 --- a/decoder.c +++ b/decoder.c @@ -395,7 +395,7 @@ SRD_API int srd_decoder_load(const char *module_name) goto err_out; } - if (py_strlist_to_char(py_ann, &ann) != SRD_OK) { + if (py_strseq_to_char(py_ann, &ann) != SRD_OK) { goto err_out; } d->annotations = g_slist_append(d->annotations, ann); diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h index aa626ca..898ba04 100644 --- a/libsigrokdecode-internal.h +++ b/libsigrokdecode-internal.h @@ -68,7 +68,7 @@ SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr, SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key, char **outstr); SRD_PRIV int py_str_as_str(const PyObject *py_str, char **outstr); -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); /* exception.c */ SRD_PRIV void srd_exception_catch(const char *format, ...); diff --git a/type_decoder.c b/type_decoder.c index 38fa1ae..6140fd0 100644 --- a/type_decoder.c +++ b/type_decoder.c @@ -78,7 +78,7 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj, "second element was not a list.", di->decoder->name); return SRD_ERR_PYTHON; } - if (py_strlist_to_char(py_tmp, &ann_text) != SRD_OK) { + if (py_strseq_to_char(py_tmp, &ann_text) != SRD_OK) { srd_err("Protocol decoder %s submitted annotation list, but " "second element was malformed.", di->decoder->name); return SRD_ERR_PYTHON; diff --git a/util.c b/util.c index 74d56c3..1efaa84 100644 --- a/util.c +++ b/util.c @@ -174,20 +174,20 @@ err_out: * * @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; -- 2.30.2