From 7c6a0420448760fc138cbe38579a5c9e0a46132c Mon Sep 17 00:00:00 2001
From: Bert Vermeulen <bert@biot.com>
Date: Mon, 18 Aug 2014 23:59:23 +0200
Subject: [PATCH] Fix output module enumeration + code cleanup.

---
 session.c | 10 +++++-----
 show.c    | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/session.c b/session.c
index ab7e674..d201492 100644
--- a/session.c
+++ b/session.c
@@ -102,7 +102,7 @@ GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genarg
 const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 {
 	const struct sr_output_module *omod;
-	const struct sr_option **opts;
+	const struct sr_option **options;
 	const struct sr_output *o;
 	GHashTable *fmtargs, *fmtopts;
 	char *fmtspec;
@@ -127,11 +127,11 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 	if (!fmtspec)
 		g_critical("Invalid output format.");
 	if (!(omod = sr_output_find(fmtspec)))
-		g_critical("Unknown output format '%s'.", fmtspec);
+		g_critical("Unknown output module '%s'.", fmtspec);
 	g_hash_table_remove(fmtargs, "sigrok_key");
-	if ((opts = sr_output_options_get(omod))) {
-		fmtopts = generic_arg_to_opt(opts, fmtargs);
-		sr_output_options_free(opts);
+	if ((options = sr_output_options_get(omod))) {
+		fmtopts = generic_arg_to_opt(options, fmtargs);
+		sr_output_options_free(options);
 	} else
 		fmtopts = NULL;
 	o = sr_output_new(omod, fmtopts, sdi);
diff --git a/show.c b/show.c
index c35f3dd..79273a4 100644
--- a/show.c
+++ b/show.c
@@ -647,8 +647,9 @@ void show_pd_detail(void)
 void show_output(void)
 {
 	const struct sr_output_module *omod;
-	const struct sr_option *opt, **opts;
+	const struct sr_option **opts;
 	GSList *l;
+	int i;
 	char *s, **tok;
 
 	tok = g_strsplit(opt_output_format, ":", 0);
@@ -660,15 +661,15 @@ void show_output(void)
 	printf("Description: %s\n", sr_output_description_get(omod));
 	if ((opts = sr_output_options_get(omod))) {
 		printf("Options:\n");
-		for (opt = opts[0]; opt; opt++) {
-			printf("  %s: %s", opt->id, opt->desc);
-			if (opt->def) {
-				s = g_variant_print(opt->def, FALSE);
+		for (i = 0; opts[i]; i++) {
+			printf("  %s: %s", opts[i]->id, opts[i]->desc);
+			if (opts[i]->def) {
+				s = g_variant_print(opts[i]->def, FALSE);
 				printf(" (default %s", s);
 				g_free(s);
-				if (opt->values) {
+				if (opts[i]->values) {
 					printf(", possible values ");
-					for (l = opt->values; l; l = l->next) {
+					for (l = opts[i]->values; l; l = l->next) {
 						s = g_variant_print((GVariant *)l->data, FALSE);
 						printf("%s%s", s, l->next ? ", " : "");
 						g_free(s);
@@ -677,7 +678,6 @@ void show_output(void)
 				printf(")");
 			}
 			printf("\n");
-			opt++;
 		}
 		sr_output_options_free(opts);
 	}
-- 
2.30.2