X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=9fa545ec690a35fc5b6f3e742df2eb472ec5ce0c;hp=86eea7c44b462b10dbe9a83cc038d9c7ddc0b04c;hb=23c40b60cd87f9779c6e99a99653f7c68682c852;hpb=ad92a2b3072fadfcda1c19c03a27a8fe76984383 diff --git a/session.c b/session.c index 86eea7c..9fa545e 100644 --- a/session.c +++ b/session.c @@ -53,7 +53,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi) } } else if (config_key_has_cap(driver, sdi, NULL, SR_CONF_SAMPLERATE, SR_CONF_GET | SR_CONF_SET)) { - /* Convert to samples based on the samplerate. */ + /* Convert to samples based on the samplerate. */ sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar); samplerate = g_variant_get_uint64(gvar); g_variant_unref(gvar); @@ -171,7 +171,7 @@ void datafeed_in(const struct sr_dev_inst *sdi, driver = sr_dev_inst_driver_get(sdi); /* If the first packet to come in isn't a header, don't even try. */ - if (packet->type != SR_DF_HEADER && o == NULL) + if (packet->type != SR_DF_HEADER && !o) return; session = cb_data; @@ -371,7 +371,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src) } src->key = srci->key; - if ((value == NULL || strlen(value) == 0) && + if ((!value || strlen(value) == 0) && (srci->datatype != SR_T_BOOL)) { g_critical("Option '%s' needs a value.", (char *)key); return -1;