properly check for result after output module data()

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

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 74e9dfcbe001322bca51f77203a0bb4bce5dd456..bc293179b4c8130a32ebbc517bbe6207f5be79de 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -629,7 +629,7 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                unitsize = (logic_probelist->len + 7) / 8;
 
                if (opt_pds && logic_probelist->len) {
-                       if (sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
+                       if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
                                        (const void **)&samplerate, sdi) != SR_OK) {
                                g_critical("Unable to initialize protocol "
                                                "decoders: no samplerate found.");
@@ -746,7 +746,7 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
                                if (o->format->data && packet->type == o->format->df_type)
                                        o->format->data(o, filter_out, filter_out_len,
                                                        &output_buf, &output_len);
-                               if (output_buf) {
+                               if (output_len) {
                                        fwrite(output_buf, 1, output_len, outfile);
                                        fflush(outfile);
                                        g_free(output_buf);
@@ -1189,7 +1189,7 @@ static void load_input_file_format(void)
        in->format = input_format;
        in->param = fmtargs;
        if (in->format->init) {
-               if (in->format->init(in) != SR_OK) {
+               if (in->format->init(in, opt_input_file) != SR_OK) {
                        g_critical("Input format init failed.");
                        exit(1);
                }
@@ -1312,7 +1312,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       if (sr_driver_hwcap_exists(sdi->driver, SR_CONF_LIMIT_MSEC)) {
+       if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) {
                if (sr_config_set(sdi, SR_CONF_LIMIT_MSEC, &time_msec) != SR_OK) {
                        g_critical("Failed to configure time limit.");
                        sr_session_destroy();
@@ -1324,8 +1324,8 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
                 * convert to samples based on the samplerate.
                 */
                limit_samples = 0;
-               if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) {
-                       sr_info_get(sdi->driver, SR_CONF_SAMPLERATE,
+               if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
+                       sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
                                        (const void **)&samplerate, sdi);
                        limit_samples = (*samplerate) * time_msec / (uint64_t)1000;
                }
@@ -1404,7 +1404,7 @@ static void run_session(void)
        }
 
        if (opt_continuous) {
-               if (!sr_driver_hwcap_exists(sdi->driver, SR_CONF_CONTINUOUS)) {
+               if (!sr_dev_has_option(sdi, SR_CONF_CONTINUOUS)) {
                        g_critical("This device does not support continuous sampling.");
                        sr_session_destroy();
                        return;