X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=79b6270158b318e0d0f77cdaa984f8fac464bbb9;hp=4f51e11553e3bb68c1c714610b28f5b7e3fb2922;hb=662a1e27fa9573a35a6f9a6f699dee2be447826a;hpb=f553109693c34861f14884b917139bef19d79000

diff --git a/input.c b/input.c
index 4f51e11..79b6270 100644
--- a/input.c
+++ b/input.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -27,8 +25,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
+#include "config.h"
 
-#define BUFSIZE 16384
+#define BUFSIZE (16 * 1024)
 
 static void load_input_file_module(void)
 {
@@ -107,11 +107,11 @@ static void load_input_file_module(void)
 		if (!in)
 			g_critical("Error: no input module found for this file.");
 	}
-	sr_session_new(&session);
+	sr_session_new(sr_ctx, &session);
 	sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
 
 	got_sdi = FALSE;
-	while(TRUE) {
+	while (TRUE) {
 		g_string_truncate(buf, 0);
 		len = read(fd, buf->str, BUFSIZE);
 		if (len < 0)
@@ -124,7 +124,7 @@ static void load_input_file_module(void)
 			break;
 
 		sdi = sr_input_dev_inst_get(in);
-		if(!got_sdi && sdi) {
+		if (!got_sdi && sdi) {
 			/* First time we got a valid sdi. */
 			if (select_channels(sdi) != SR_OK)
 				return;
@@ -135,7 +135,6 @@ static void load_input_file_module(void)
 			}
 			got_sdi = TRUE;
 		}
-
 	}
 	sr_input_end(in);
 	sr_input_free(in);
@@ -156,7 +155,8 @@ void load_input_file(void)
 		/* Input from stdin is never a session file. */
 		load_input_file_module();
 	} else {
-		if ((ret = sr_session_load(opt_input_file, &session)) == SR_OK) {
+		if ((ret = sr_session_load(sr_ctx, opt_input_file,
+				&session)) == SR_OK) {
 			/* sigrok session file */
 			ret = sr_session_dev_list(session, &devices);
 			if (ret != SR_OK || !devices || !devices->data) {