X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=d201492b01ed1464cfe85804ea7d1f23715a206c;hb=7c6a0420448760fc138cbe38579a5c9e0a46132c;hp=ab7e67488fdb519c431faa63dddf81351d338d6b;hpb=b61a8850b1396aecb59da1ff51f1c874b1cce01f;p=sigrok-cli.git 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);