Refactor main source into separate files

[sigrok-cli.git] / anykey.c

diff --git a/anykey.c b/anykey.c
index f0ab52efe6548a9654822781670acd4ab80d046d..24970c2c299a26733dc754a34a3c586925367be5 100644 (file)
--- a/anykey.c
+++ b/anykey.c
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of the sigrok project.
+ * This file is part of the sigrok-cli project.

  *
  * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
  *
  *
  * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
  *


@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>

-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>

 #include "sigrok-cli.h"
 
 #ifdef _WIN32
 #include "sigrok-cli.h"
 
 #ifdef _WIN32


@@ -36,13 +36,13 @@ static DWORD stdin_mode;
 static struct termios term_orig;
 #endif
 
 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)fd;
        (void)revents;

-       (void)user_data;
+       (void)cb_data;

 
 

+       sr_session_source_remove(STDIN_FILENO);

        sr_session_stop();
 
        return TRUE;
        sr_session_stop();
 
        return TRUE;


@@ -70,7 +70,7 @@ void add_anykey(void)
 
        sr_session_source_add(STDIN_FILENO, G_IO_IN, -1, received_anykey, NULL);
 
 
        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. */
 }
 
 /* Restore stdin attributes. */