X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=9fa545ec690a35fc5b6f3e742df2eb472ec5ce0c;hp=30e08252fe6543b94a266fe92b708332bfe01f17;hb=23c40b60cd87f9779c6e99a99653f7c68682c852;hpb=662a1e27fa9573a35a6f9a6f699dee2be447826a

diff --git a/session.c b/session.c
index 30e0825..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;
@@ -332,8 +332,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 
 		if (o) {
 			sr_output_free(o);
-			if (srzip_and_filename)
-				g_free(srzip_and_filename);
+			g_free(srzip_and_filename);
 		}
 		o = NULL;
 
@@ -372,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;