Better output module checking.

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index 705dcc8152fbfde59284fb61ba910ffb66abffbd..39eb164942c447a57bba67e04ad3e9e7d7fee06a 100644 (file)
--- a/session.c
+++ b/session.c
@@ -87,10 +87,12 @@ GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs
                        gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
                        g_hash_table_insert(hash, g_strdup(opt->id),
                                        g_variant_ref_sink(gvar));
-                       printf("opt %s value %s\n", opt->id, s);
+               } else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_DOUBLE)) {
+                       gvar = g_variant_new_double(strtod(s, NULL));
+                       g_hash_table_insert(hash, g_strdup(opt->id),
+                                       g_variant_ref_sink(gvar));
                } else {
-                       g_critical("Don't know how to convert option '%s' to %s!",
-                                       opt->id, g_variant_get_type_string(opt->def));
+                       g_critical("Don't know GVariant type for option '%s'!", opt->id);
                 }
        }
 
@@ -172,7 +174,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        switch (packet->type) {
        case SR_DF_HEADER:
                g_debug("cli: Received SR_DF_HEADER.");
-               o = setup_output_format(sdi);
+               if (!(o = setup_output_format(sdi)))
+                       g_critical("Failed to initialize output module.");
 
                /* Set up backup analog output module. */
                oa = sr_output_new(sr_output_find("analog"), NULL, sdi);