From: Bert Vermeulen <redacted>
Date: Wed, 27 Aug 2014 23:50:49 +0000 (+0200)
Subject: Use sr_input_scan_*() API changes.
X-Git-Tag: sigrok-cli-0.6.0~72
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=b66260b90ab0dc9a4c3df56fba4ea794f74fdec5;hp=a48ddcc122a4ec8625c634041f4d635ff5935565

Use sr_input_scan_*() API changes.
---

diff --git a/input.c b/input.c
index f143cf9..c4f41bf 100644
--- a/input.c
+++ b/input.c
@@ -79,9 +79,10 @@ static void load_input_file_module(void)
 			 * An actual filename: let the input modules try to
 			 * identify the file.
 			 */
-			in = sr_input_scan_file(opt_input_file);
-			/* That worked, reopen the file for reading. */
-			fd = open(opt_input_file, O_RDONLY);
+			if (sr_input_scan_file(opt_input_file, &in) == SR_OK) {
+				/* That worked, reopen the file for reading. */
+				fd = open(opt_input_file, O_RDONLY);
+			}
 		} else {
 			/*
 			 * Taking input from a pipe: let the input modules try
@@ -99,7 +100,7 @@ static void load_input_file_module(void)
 				g_critical("Failed to read %s: %s.", opt_input_file,
 						strerror(errno));
 			buf->len = len;
-			in = sr_input_scan_buffer(buf);
+			sr_input_scan_buffer(buf, &in);
 		}
 		if (!in)
 			g_critical("Error: no input module found for this file.");