Check for config key availability before using it.

[sigrok-cli.git] / main.c

diff --git a/main.c b/main.c
index a5749529e82859c00f38746a8d4d1cea9afaf597..81dc4ad21055a11bfc6f199d1dff732e388eb620 100644 (file)
--- a/main.c
+++ b/main.c
@@ -50,13 +50,15 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level,
 int select_channels(struct sr_dev_inst *sdi)
 {
        struct sr_channel *ch;
 int select_channels(struct sr_dev_inst *sdi)
 {
        struct sr_channel *ch;

-       GSList *selected_channels, *l;
+       GSList *selected_channels, *l, *channels;
+
+       channels = sr_dev_inst_channels_get(sdi);

 
        if (opt_channels) {
                if (!(selected_channels = parse_channelstring(sdi, opt_channels)))
                        return SR_ERR;
 
 
        if (opt_channels) {
                if (!(selected_channels = parse_channelstring(sdi, opt_channels)))
                        return SR_ERR;
 

-               for (l = sdi->channels; l; l = l->next) {
+               for (l = channels; l; l = l->next) {

                        ch = l->data;
                        if (g_slist_find(selected_channels, ch))
                                ch->enabled = TRUE;
                        ch = l->data;
                        if (g_slist_find(selected_channels, ch))
                                ch->enabled = TRUE;


@@ -78,8 +80,10 @@ static void get_option(void)
        const struct sr_config_info *ci;
        GSList *devices;
        GVariant *gvar;
        const struct sr_config_info *ci;
        GSList *devices;
        GVariant *gvar;

+       GHashTable *devargs;

        int ret;
        char *s;
        int ret;
        char *s;

+       struct sr_dev_driver *driver;

 
        if (!(devices = device_scan())) {
                g_critical("No devices found.");
 
        if (!(devices = device_scan())) {
                g_critical("No devices found.");


@@ -88,6 +92,8 @@ static void get_option(void)
        sdi = devices->data;
        g_slist_free(devices);
 
        sdi = devices->data;
        g_slist_free(devices);
 

+       driver = sr_dev_inst_driver_get(sdi);
+

        if (sr_dev_open(sdi) != SR_OK) {
                g_critical("Failed to open device.");
                return;
        if (sr_dev_open(sdi) != SR_OK) {
                g_critical("Failed to open device.");
                return;


@@ -97,7 +103,11 @@ static void get_option(void)
        if (!(ci = sr_config_info_name_get(opt_get)))
                g_critical("Unknown option '%s'", opt_get);
 
        if (!(ci = sr_config_info_name_get(opt_get)))
                g_critical("Unknown option '%s'", opt_get);
 

-       if ((ret = sr_config_get(sdi->driver, sdi, cg, ci->key, &gvar)) != SR_OK)
+       if ((devargs = parse_generic_arg(opt_config, FALSE)))
+               set_dev_options(sdi, devargs);
+       else devargs = NULL;
+
+       if ((ret = sr_config_get(driver, sdi, cg, ci->key, &gvar)) != SR_OK)

                g_critical("Failed to get '%s': %s", opt_get, sr_strerror(ret));
        s = g_variant_print(gvar, FALSE);
        printf("%s\n", s);
                g_critical("Failed to get '%s': %s", opt_get, sr_strerror(ret));
        s = g_variant_print(gvar, FALSE);
        printf("%s\n", s);


@@ -105,6 +115,8 @@ static void get_option(void)
 
        g_variant_unref(gvar);
        sr_dev_close(sdi);
 
        g_variant_unref(gvar);
        sr_dev_close(sdi);

+       if (devargs)
+               g_hash_table_destroy(devargs);

 }
 
 static void set_options(void)
 }
 
 static void set_options(void)