From e97b6ef569f73e387b2597dfa144c01838c0e27c Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 10 Jan 2012 21:05:09 +0100 Subject: srd: annotation -> annotations. In the PDs (Python code), the 'annotation' variable/attribute is a list of annotation formats. Use the plural 'annotations' as we do for other lists such as 'inputs', 'outputs', 'probes', 'options', and so on. --- decoder.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'decoder.c') diff --git a/decoder.c b/decoder.c index d626bd3..e25e4e0 100644 --- a/decoder.c +++ b/decoder.c @@ -127,11 +127,11 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec) d->outputformats = NULL; /* Convert class annotation attribute to GSList of **char */ - d->annotation = NULL; - if (PyObject_HasAttrString(py_res, "annotation")) { - py_annlist = PyObject_GetAttrString(py_res, "annotation"); + d->annotations = NULL; + if (PyObject_HasAttrString(py_res, "annotations")) { + py_annlist = PyObject_GetAttrString(py_res, "annotations"); if (!PyList_Check(py_annlist)) { - srd_err("Protocol decoder module %s annotation should be a list", name); + srd_err("Protocol decoder module %s annotations should be a list", name); return SRD_ERR_PYTHON; } alen = PyList_Size(py_annlist); @@ -145,7 +145,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec) if (py_strlist_to_char(py_ann, &ann) != SRD_OK) return SRD_ERR_PYTHON; - d->annotation = g_slist_append(d->annotation, ann); + d->annotations = g_slist_append(d->annotations, ann); } } -- cgit v1.2.3-70-g09d2