From 28412ed69e4c630e82a8bd644bce2ace64dcdafe Mon Sep 17 00:00:00 2001
From: Christopher Haster <chaster@utexas.edu>
Date: Thu, 30 Jun 2016 22:52:51 -0500
Subject: [PATCH] Moved delay/period to first argument of
 event_call_in/event_call_every

per suggestion from @kilogram:
- makes the call clearer, especially when callback argument looks like
  a delay value
- simplifies implementation of c++11 wrappers
---
 events.c      |  4 ++--
 events.h      |  4 ++--
 tests/tests.c | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/events.c b/events.c
index a7226d0..dc61869 100644
--- a/events.c
+++ b/events.c
@@ -304,7 +304,7 @@ int event_call(equeue_t *q, void (*cb)(void*), void *data) {
     return event_post(q, ecallback_dispatch, e);
 }
 
-int event_call_in(equeue_t *q, void (*cb)(void*), void *data, int ms) {
+int event_call_in(equeue_t *q, int ms, void (*cb)(void*), void *data) {
     struct ecallback *e = event_alloc(q, sizeof(struct ecallback));
     if (!e) {
         return 0;
@@ -316,7 +316,7 @@ int event_call_in(equeue_t *q, void (*cb)(void*), void *data, int ms) {
     return event_post(q, ecallback_dispatch, e);
 }
 
-int event_call_every(equeue_t *q, void (*cb)(void*), void *data, int ms) {
+int event_call_every(equeue_t *q, int ms, void (*cb)(void*), void *data) {
     struct ecallback *e = event_alloc(q, sizeof(struct ecallback));
     if (!e) {
         return 0;
diff --git a/events.h b/events.h
index 96b50be..5274bcd 100644
--- a/events.h
+++ b/events.h
@@ -79,8 +79,8 @@ void equeue_break(equeue_t *queue);
 // These calls will result in 0 if no memory is available, otherwise they
 // will result in a unique identifier that can be passed to event_cancel.
 int event_call(equeue_t *queue, void (*cb)(void *), void *data);
-int event_call_in(equeue_t *queue, void (*cb)(void *), void *data, int ms);
-int event_call_every(equeue_t *queue, void (*cb)(void *), void *data, int ms);
+int event_call_in(equeue_t *queue, int ms, void (*cb)(void *), void *data);
+int event_call_every(equeue_t *queue, int ms, void (*cb)(void *), void *data);
 
 // Events with queue handled blocks of memory
 //
diff --git a/tests/tests.c b/tests/tests.c
index fb50ed4..6234a86 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -107,7 +107,7 @@ void simple_call_in_test(void) {
     test_assert(!err);
 
     bool touched = false;
-    int id = event_call_in(&q, simple_func, &touched, 5);
+    int id = event_call_in(&q, 5, simple_func, &touched);
     test_assert(id);
 
     equeue_dispatch(&q, 10);
@@ -122,7 +122,7 @@ void simple_call_every_test(void) {
     test_assert(!err);
 
     bool touched = false;
-    int id = event_call_every(&q, simple_func, &touched, 5);
+    int id = event_call_every(&q, 5, simple_func, &touched);
     test_assert(id);
 
     equeue_dispatch(&q, 10);
@@ -227,13 +227,13 @@ void loop_protect_test(void) {
     test_assert(!err);
 
     bool touched = false;
-    event_call_every(&q, simple_func, &touched, 0);
+    event_call_every(&q, 0, simple_func, &touched);
 
     equeue_dispatch(&q, 0);
     test_assert(touched);
 
     touched = false;
-    event_call_every(&q, simple_func, &touched, 1);
+    event_call_every(&q, 1, simple_func, &touched);
 
     equeue_dispatch(&q, 0);
     test_assert(touched);
@@ -247,7 +247,7 @@ void break_test(void) {
     test_assert(!err);
 
     bool touched = false;
-    event_call_every(&q, simple_func, &touched, 0);
+    event_call_every(&q, 0, simple_func, &touched);
 
     equeue_break(&q);
     equeue_dispatch(&q, -1);