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

diff --git a/session.c b/session.c
index b6c5564..30e0825 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;
@@ -121,7 +121,6 @@ const struct sr_transform *setup_transform_module(const struct sr_dev_inst *sdi)
 	const struct sr_option **options;
 	const struct sr_transform *t;
 	GHashTable *fmtargs, *fmtopts;
-	int size;
 	char *fmtspec;
 
 	if (!opt_transform_module)
@@ -309,8 +308,10 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			if (!out || (out->len == 0
 					&& !opt_output_format
 					&& packet->type == SR_DF_ANALOG)) {
-				/* The user didn't specify an output module,
-				 * but needs to see this analog data. */
+				/*
+				 * The user didn't specify an output module,
+				 * but needs to see this analog data.
+				 */
 				sr_output_send(oa, packet, &out);
 			}
 			if (out && out->len > 0) {
@@ -322,8 +323,10 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 		}
 	}
 
-	/* SR_DF_END needs to be handled after the output module's receive()
-	 * is called, so it can properly clean up that module. */
+	/*
+	 * SR_DF_END needs to be handled after the output module's receive()
+	 * is called, so it can properly clean up that module.
+	 */
 	if (packet->type == SR_DF_END) {
 		g_debug("cli: Received SR_DF_END.");
 
@@ -479,7 +482,8 @@ int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 		cg = select_channel_group(sdi);
 		if ((ret = maybe_config_set(sr_dev_inst_driver_get(sdi), sdi, cg,
 				src.key, src.data)) != SR_OK) {
-			g_critical("Failed to set device option '%s'.", (char *)key);
+			g_critical("Failed to set device option '%s': %s.",
+				   (char *)key, sr_strerror(ret));
 			return ret;
 		}
 	}
@@ -549,7 +553,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) {
@@ -611,8 +615,10 @@ void run_session(void)
 		}
 		if (maybe_config_list(driver, sdi, NULL, SR_CONF_LIMIT_SAMPLES,
 				&gvar) == SR_OK) {
-			/* The device has no compression, or compression is turned
-			 * off, and publishes its sample memory size. */
+			/*
+			 * The device has no compression, or compression is turned
+			 * off, and publishes its sample memory size.
+			 */
 			g_variant_get(gvar, "(tt)", &min_samples, &max_samples);
 			g_variant_unref(gvar);
 			if (limit_samples < min_samples) {
@@ -667,4 +673,3 @@ void run_session(void)
 	sr_session_destroy(session);
 
 }
-