Use sr_input_scan_*() API changes.
authorBert Vermeulen <bert@biot.com>
Wed, 27 Aug 2014 23:50:49 +0000 (01:50 +0200)
committerBert Vermeulen <bert@biot.com>
Thu, 28 Aug 2014 10:34:41 +0000 (12:34 +0200)
input.c

diff --git a/input.c b/input.c
index f143cf9b513f10b01575413f990bb3e8b8e33e35..c4f41bf4f57a9a1ea0b70dba02f484ee4c26a1b1 100644 (file)
--- 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.");