From: Uwe Hermann <redacted>
Date: Mon, 15 Sep 2014 18:26:08 +0000 (+0200)
Subject: Replace ann_format with ann_class.
X-Git-Tag: sigrok-cli-0.6.0~65
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=a23105b12a31ce9f329cf73f5536d003cea9e243;hp=4c6a77987e2bbda7c4e9c6f3568ccb7b65226d6c

Replace ann_format with ann_class.

The naming has been changed to "annotation class" a while ago.
---

diff --git a/decode.c b/decode.c
index 7712ea1..b020b68 100644
--- a/decode.c
+++ b/decode.c
@@ -465,7 +465,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 	show = FALSE;
 	for (l = ann_list; l; l = l->next) {
 		if (GPOINTER_TO_INT(l->data) == -1
-				|| GPOINTER_TO_INT(l->data) == pda->ann_format) {
+				|| GPOINTER_TO_INT(l->data) == pda->ann_class) {
 			show = TRUE;
 			break;
 		}
@@ -484,7 +484,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 		} else {
 			/* Protocol decoder id, annotation class,
 			 * all annotation strings. */
-			ann_descr = g_slist_nth_data(dec->annotations, pda->ann_format);
+			ann_descr = g_slist_nth_data(dec->annotations, pda->ann_class);
 			printf(" %s: %s:", pdata->pdo->proto_id, ann_descr[0]);
 			for (i = 0; pda->ann_text[i]; i++)
 				printf(" \"%s\"", pda->ann_text[i]);