automake build system

[mech_eap.orig] / src / utils / eloop_none.c

diff --git a/src/utils/eloop_none.c b/src/utils/eloop_none.c
index 6943109..18eae4e 100644 (file)
--- a/src/utils/eloop_none.c
+++ b/src/utils/eloop_none.c
@@ -41,8 +41,6 @@ struct eloop_signal {
 };
 
 struct eloop_data {
-       void *user_data;
-
        int max_sock, reader_count;
        struct eloop_sock *readers;
 
@@ -60,10 +58,9 @@ struct eloop_data {
 static struct eloop_data eloop;
 
 
-int eloop_init(void *user_data)
+int eloop_init(void)
 {
        memset(&eloop, 0, sizeof(eloop));
-       eloop.user_data = user_data;
        return 0;
 }
 
@@ -197,6 +194,26 @@ int eloop_cancel_timeout(void (*handler)(void *eloop_ctx, void *sock_ctx),
 }
 
 
+int eloop_is_timeout_registered(void (*handler)(void *eloop_ctx,
+                                               void *timeout_ctx),
+                               void *eloop_data, void *user_data)
+{
+       struct eloop_timeout *tmp;
+
+       tmp = eloop.timeout;
+       while (tmp != NULL) {
+               if (tmp->handler == handler &&
+                   tmp->eloop_data == eloop_data &&
+                   tmp->user_data == user_data)
+                       return 1;
+
+               tmp = tmp->next;
+       }
+
+       return 0;
+}
+
+
 /* TODO: replace with suitable signal handler */
 #if 0
 static void eloop_handle_signal(int sig)
@@ -382,9 +399,3 @@ void eloop_wait_for_read_sock(int sock)
         * reading
         */
 }
-
-
-void * eloop_get_user_data(void)
-{
-       return eloop.user_data;
-}