From: Bert Vermeulen <redacted>
Date: Fri, 15 Aug 2014 20:32:17 +0000 (+0200)
Subject: Enumerate output module options according to API change.
X-Git-Tag: sigrok-cli-0.6.0~80
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=b61a8850b1396aecb59da1ff51f1c874b1cce01f

Enumerate output module options according to API change.
---

diff --git a/session.c b/session.c
index 39eb164..ab7e674 100644
--- a/session.c
+++ b/session.c
@@ -71,7 +71,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs)
+GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)
 {
 	GHashTable *hash;
 	GVariant *gvar;
@@ -80,7 +80,7 @@ GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs
 
 	hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
 			(GDestroyNotify)g_variant_unref);
-	for (opt = opts; opt->id && opt->def; opt++) {
+	for (opt = opts[0]; opt; opt++) {
 		if (!(s = g_hash_table_lookup(genargs, opt->id)))
 			continue;
 		if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_UINT32)) {
@@ -102,7 +102,7 @@ GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs
 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 **opts;
 	const struct sr_output *o;
 	GHashTable *fmtargs, *fmtopts;
 	char *fmtspec;
@@ -131,7 +131,7 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 	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(omod);
+		sr_output_options_free(opts);
 	} else
 		fmtopts = NULL;
 	o = sr_output_new(omod, fmtopts, sdi);
diff --git a/show.c b/show.c
index 4c0cd8f..c35f3dd 100644
--- a/show.c
+++ b/show.c
@@ -647,7 +647,7 @@ void show_pd_detail(void)
 void show_output(void)
 {
 	const struct sr_output_module *omod;
-	const struct sr_option *opt;
+	const struct sr_option *opt, **opts;
 	GSList *l;
 	char *s, **tok;
 
@@ -658,9 +658,9 @@ void show_output(void)
 	printf("ID: %s\nName: %s\n", sr_output_id_get(omod),
 			sr_output_name_get(omod));
 	printf("Description: %s\n", sr_output_description_get(omod));
-	if ((opt = sr_output_options_get(omod))) {
+	if ((opts = sr_output_options_get(omod))) {
 		printf("Options:\n");
-		while (opt->id) {
+		for (opt = opts[0]; opt; opt++) {
 			printf("  %s: %s", opt->id, opt->desc);
 			if (opt->def) {
 				s = g_variant_print(opt->def, FALSE);
@@ -679,7 +679,7 @@ void show_output(void)
 			printf("\n");
 			opt++;
 		}
-		sr_output_options_free(omod);
+		sr_output_options_free(opts);
 	}
 	g_strfreev(tok);
 }