From: Uwe Hermann <redacted>
Date: Tue, 10 Jan 2012 20:32:26 +0000 (+0100)
Subject: cli: Fix left-over ANN/PROTO names.
X-Git-Tag: sigrok-cli-0.3.0~71
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ca07c71183a88c7f6eeb47c0d11399f0145562a1;p=sigrok-cli.git

cli: Fix left-over ANN/PROTO names.
---

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 979fc89..33d8ebb 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -487,25 +487,25 @@ static int register_pds(struct sr_device *device, const char *pdstring)
 	return 0;
 }
 
-void show_pd_annotation(struct srd_protocol_data *pdata)
+void show_pd_annotation(struct srd_proto_data *pdata)
 {
 	int i;
-	char **annotation;
+	char **annotations;
 
-	annotation = pdata->data;
-	if (pdata->annotation_format != 0) {
+	annotations = pdata->data;
+	if (pdata->ann_format != 0) {
 		/* CLI only shows the default annotation format */
 		return;
 	}
 
-	if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->protocol_id)) {
+	if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->proto_id)) {
 		/* not in the list of PDs whose annotations we're showing */
 		return;
 	}
 
-	printf("%s: ", pdata->pdo->protocol_id);
-	for (i = 0; annotation[i]; i++)
-		printf("\"%s\" ", annotation[i]);
+	printf("%s: ", pdata->pdo->proto_id);
+	for (i = 0; annotations[i]; i++)
+		printf("\"%s\" ", annotations[i]);
 	printf("\n");
 
 }
@@ -984,7 +984,7 @@ int main(int argc, char **argv)
 			printf("Failed to register protocol decoders\n");
 			return 1;
 		}
-		if (srd_register_callback(SRD_OUTPUT_ANNOTATION,
+		if (srd_register_callback(SRD_OUTPUT_ANN,
 				show_pd_annotation) != SRD_OK) {
 			printf("Failed to register protocol decoder callback\n");
 			return 1;