From: Roy Marples <roy@marples.name>
Date: Mon, 11 Oct 2010 14:53:06 +0000 (+0000)
Subject: Change delete_timeouts into a macro.
X-Git-Tag: v5.2.9~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebf35f468c527464a55699942aef6fad51171a73;p=thirdparty%2Fdhcpcd.git

Change delete_timeouts into a macro.
---

diff --git a/eloop.c b/eloop.c
index f6d5d282..a5d08cb2 100644
--- a/eloop.c
+++ b/eloop.c
@@ -223,16 +223,6 @@ delete_q_timeouts(int queue, void *arg, void (*callback)(void *), ...)
 	va_end(va);
 }
 
-void
-delete_timeouts( void *arg, void (*callback)(void *), ...)
-{
-	va_list va;
-
-	va_start(va, callback);
-	v_delete_q_timeouts(0, arg, callback, va);
-	va_end(va);
-}
-
 void
 delete_q_timeout(int queue, void (*callback)(void *), void *arg)
 {
diff --git a/eloop.h b/eloop.h
index 9f9637ac..02c9438e 100644
--- a/eloop.h
+++ b/eloop.h
@@ -37,6 +37,7 @@
 #define add_timeout_tv(a, b, c) add_q_timeout_tv(ELOOP_QUEUE, a, b, c)
 #define add_timeout_sec(a, b, c) add_q_timeout_sec(ELOOP_QUEUE, a, b, c)
 #define delete_timeout(a, b) delete_q_timeout(ELOOP_QUEUE, a, b)
+#define delete_timeouts(a, ...) delete_q_timeouts(ELOOP_QUEUE, a, __VA_ARGS__)
 
 void add_event(int fd, void (*)(void *), void *);
 void delete_event(int fd);
@@ -45,7 +46,6 @@ void add_q_timeout_tv(int queue, const struct timeval *, void (*)(void *),
     void *);
 void delete_q_timeout(int, void (*)(void *), void *);
 void delete_q_timeouts(int, void *, void (*)(void *), ...);
-void delete_timeouts(void *, void (*)(void *), ...);
 void start_eloop(void);
 
 #endif