X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=ef0e9d8465dc4bc0f01e1e243ce84b50dde32514;hp=f64f849e9eee9fd51ff5694e7d3c6b61bc0fa53e;hb=22630a3d54361f083877a68724e8b823d5e063a7;hpb=3d14e7c9ac0155c0438b46dee267e3e16a6b8e3a

diff --git a/type_decoder.c b/type_decoder.c
index f64f849..ef0e9d8 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -17,11 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
 #include "config.h"
 #include <inttypes.h>
 
+typedef struct {
+        PyObject_HEAD
+} srd_Decoder;
+
 /* This is only used for nicer srd_dbg() output. */
 static const char *OUTPUT_TYPES[] = {
 	"OUTPUT_ANN",
@@ -36,10 +40,10 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 	PyObject *py_tmp;
 	struct srd_pd_output *pdo;
 	struct srd_proto_data_annotation *pda;
-	int ann_format;
+	int ann_class;
 	char **ann_text;
 
-	/* Should be a list of [annotation format, [string, ...]]. */
+	/* Should be a list of [annotation class, [string, ...]]. */
 	if (!PyList_Check(obj) && !PyTuple_Check(obj)) {
 		srd_err("Protocol decoder %s submitted %s instead of list.",
 			di->decoder->name, obj->ob_type->tp_name);
@@ -56,7 +60,7 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 
 	/*
 	 * The first element should be an integer matching a previously
-	 * registered annotation format.
+	 * registered annotation class.
 	 */
 	py_tmp = PyList_GetItem(obj, 0);
 	if (!PyLong_Check(py_tmp)) {
@@ -64,10 +68,10 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 			"first element was not an integer.", di->decoder->name);
 		return SRD_ERR_PYTHON;
 	}
-	ann_format = PyLong_AsLong(py_tmp);
-	if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_format))) {
+	ann_class = PyLong_AsLong(py_tmp);
+	if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_class))) {
 		srd_err("Protocol decoder %s submitted data to unregistered "
-			"annotation format %d.", di->decoder->name, ann_format);
+			"annotation class %d.", di->decoder->name, ann_class);
 		return SRD_ERR_PYTHON;
 	}
 
@@ -86,7 +90,7 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 
 	if (!(pda = g_try_malloc(sizeof(struct srd_proto_data_annotation))))
 		return SRD_ERR_MALLOC;
-	pda->ann_format = ann_format;
+	pda->ann_class = ann_class;
 	pda->ann_text = ann_text;
 	pdata->data = pda;