Fix error message and compiler warning
authorBert Vermeulen <bert@biot.com>
Thu, 9 May 2013 11:49:37 +0000 (13:49 +0200)
committerBert Vermeulen <bert@biot.com>
Thu, 9 May 2013 11:49:37 +0000 (13:49 +0200)
Thanks to Christian Deussen for the patch.

sigrok-cli.c

index d400c7dce3e35fd55895d7d1cb8dcac350991e9e..05ac6c1e245021511993f3ab24cbc76082bb53c5 100644 (file)
@@ -347,7 +347,7 @@ static void show_dev_detail(void)
 
        num_devices = g_slist_length(devices);
        if (num_devices > 1) {
-               g_critical("%d devices found. Use --list-devices to show them, "
+               g_critical("%d devices found. Use --scan to show them, "
                                "and select one to show.", num_devices);
                return;
        }
@@ -677,7 +677,6 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
        static FILE *outfile = NULL;
        GSList *l;
        GString *out;
-       GVariant *gvar;
        int sample_size, ret;
        uint64_t samplerate, output_len, filter_out_len;
        uint8_t *output_buf, *filter_out;
@@ -729,6 +728,7 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                unitsize = (logic_probelist->len + 7) / 8;
 
 #ifdef HAVE_SRD
+               GVariant *gvar;
                if (opt_pds && logic_probelist->len) {
                        if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
                                        &gvar, sdi) != SR_OK) {