Use sr_config_get().

[sigrok-cli.git] / anykey.c

diff --git a/anykey.c b/anykey.c
index be16ff11a37fa6895a4385d93665f890f2cb8b4e..1e006b52d3f4ba718d61cbff31b6fb4ac3b4c10b 100644 (file)
--- a/anykey.c
+++ b/anykey.c
@@ -26,22 +26,21 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
 #include "sigrok-cli.h"
 
 #ifdef _WIN32
-HANDLE stdin_handle;
-DWORD stdin_mode;
+static HANDLE stdin_handle;
+static DWORD stdin_mode;
 #else
-struct termios term_orig;
+static struct termios term_orig;
 #endif
 
-static int received_anykey(int fd, int revents, void *user_data)
+static int received_anykey(int fd, int revents, void *cb_data)
 {
-       /* Avoid compiler warnings. */
        (void)fd;
        (void)revents;
-       (void)user_data;
+       (void)cb_data;
 
        sr_session_stop();
 
@@ -70,7 +69,7 @@ void add_anykey(void)
 
        sr_session_source_add(STDIN_FILENO, G_IO_IN, -1, received_anykey, NULL);
 
-       printf("Press any key to stop acquisition.\n");
+       g_message("Press any key to stop acquisition.");
 }
 
 /* Restore stdin attributes. */