cli: rename sr_hw_hwcap_get() to sr_devopt_get()

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 403f01d2ea0be06f33b5cbd5e06b153a6f249064..260cb9bfabfc030fab51849310a318f23cb29198 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -346,7 +346,7 @@ static void show_dev_detail(void)
                return;
 
        for (cap = 0; hwcaps[cap]; cap++) {
-               if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
+               if (!(hwo = sr_devopt_get(hwcaps[cap])))
                        continue;
 
                if (title) {
@@ -599,7 +599,6 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                if (opt_continuous)
                        g_warning("Device stopped after %" PRIu64 " samples.",
                               received_samples);
-               sr_session_stop();
                if (outfile && outfile != stdout)
                        fclose(outfile);
                g_free(o);
@@ -1144,7 +1143,7 @@ static void load_input_file_format(void)
        char *fmtspec = NULL;
 
        if (opt_input_format) {
-               fmtargs = parse_generic_arg(opt_input_format);
+               fmtargs = parse_generic_arg(opt_input_format, TRUE);
                fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
        }
 
@@ -1153,7 +1152,7 @@ static void load_input_file_format(void)
                /* The exact cause was already logged. */
                return;
        }
-;
+
        if (fmtargs)
                g_hash_table_remove(fmtargs, "sigrok_key");