X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=9fa545ec690a35fc5b6f3e742df2eb472ec5ce0c;hp=aa30266f975e9447a72a8dafa4f7b21fcf05f42a;hb=bc5b66d7044337c00a6c2a8af86b910d33a56a90;hpb=f0f54487c6a146af523d6eb19fcce63422e3f0f1

diff --git a/session.c b/session.c
index aa30266..9fa545e 100644
--- a/session.c
+++ b/session.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "sigrok-cli.h"
 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
@@ -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;
@@ -553,7 +552,7 @@ void run_session(void)
 	g_slist_free(devices);
 	g_slist_free(real_devices);
 
-	sr_session_new(&session);
+	sr_session_new(sr_ctx, &session);
 	sr_session_datafeed_callback_add(session, datafeed_in, NULL);
 
 	if (sr_dev_open(sdi) != SR_OK) {