Various #include file cosmetic fixes.

[sigrok-cli.git] / input.c

diff --git a/input.c b/input.c
index 9d7bf626cd24a2341afaa1d29f83b381deadb4f4..79b6270158b318e0d0f77cdaa984f8fac464bbb9 100644 (file)
--- 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,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
+#include "config.h"
 
 #define BUFSIZE (16 * 1024)
 
@@ -107,7 +107,7 @@ 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;
@@ -155,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) {