Fix pre func arg order

diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index ec7ca0d14f13c6b35d45ce31e536bdecd36fbfd3..ac50df70b1333e7ce98ab27cba3b040c17a4f936 100644 (file)
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -1947,7 +1947,7 @@ static void rs_got_packet(fr_event_list_t *el, int fd, UNUSED int flags, void *c
        }
 }
 
-static int  _rs_event_status(UNUSED void *ctx, fr_time_delta_t wake_t)
+static int  _rs_event_status(fr_time_delta_t wake_t, UNUSED void *uctx)
 {
        struct timeval wake;
 

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index abf97efda062c1b8075aa87d5ce4cdca12a81f63..2eb193bb285e0ee7778b4ebfb606b5c90f6f4487 100644 (file)
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -148,7 +148,7 @@ struct fr_network_s {
 };
 
 static void fr_network_post_event(fr_event_list_t *el, fr_time_t now, void *uctx);
-static int fr_network_pre_event(void *ctx, fr_time_t wake);
+static int fr_network_pre_event(fr_time_t wake, void *uctx);
 static void fr_network_socket_dead(fr_network_t *nr, fr_network_socket_t *s);
 static void fr_network_read(UNUSED fr_event_list_t *el, int sockfd, UNUSED int flags, void *ctx);
 static int8_t reply_cmp(void const *one, void const *two)
@@ -1306,16 +1306,14 @@ static void fr_network_inject_callback(void *ctx, void const *data, size_t data_
  *  work, and tell the event code to return to the main loop if
  *  there's work to do.
  *
- * @param[in] ctx the network
  * @param[in] wake the time when the event loop will wake up.
+ * @param[in] uctx the network
  */
-static int fr_network_pre_event(void *ctx, UNUSED fr_time_t wake)
+static int fr_network_pre_event(UNUSED fr_time_t wake, void *uctx)
 {
-       fr_network_t *nr = talloc_get_type_abort(ctx, fr_network_t);
+       fr_network_t *nr = talloc_get_type_abort(uctx, fr_network_t);
 
-       if (fr_heap_num_elements(nr->replies) > 0) {
-               return 1;
-       }
+       if (fr_heap_num_elements(nr->replies) > 0) return 1;
 
        return 0;
 }

diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c
index b8380de0ca201dfcb06d777a9ab9e275054a627b..a6b1a990b92fcaca767c83c62906d7a05c11e38d 100644 (file)
--- a/src/lib/io/worker.c
+++ b/src/lib/io/worker.c
@@ -1208,7 +1208,7 @@ void fr_worker(fr_worker_t *worker)
  *
  *     This should be run ONLY in single-threaded mode!
  */
-int fr_worker_pre_event(void *uctx, UNUSED fr_time_t wake)
+int fr_worker_pre_event(UNUSED fr_time_t wake, void *uctx)
 {
        fr_worker_t *worker = talloc_get_type_abort(uctx, fr_worker_t);
        request_t *request;

diff --git a/src/lib/io/worker.h b/src/lib/io/worker.h
index 1ce64572f137f52a8228b8089f844144953579d1..d0f9a268787bf05164bc7194c04a359a6c501a36 100644 (file)
--- a/src/lib/io/worker.h
+++ b/src/lib/io/worker.h
@@ -77,7 +77,7 @@ void          fr_worker(fr_worker_t *worker) CC_HINT(nonnull);
 
 void           fr_worker_debug(fr_worker_t *worker, FILE *fp) CC_HINT(nonnull);
 
-int            fr_worker_pre_event(void *uctx, fr_time_t wake);
+int            fr_worker_pre_event(fr_time_t wake, void *uctx);
 
 void           fr_worker_post_event(fr_event_list_t *el, fr_time_t now, void *uctx);
 
@@ -87,7 +87,9 @@ int           fr_worker_stats(fr_worker_t const *worker, int num, uint64_t *stats) CC_HIN
 
 #include <freeradius-devel/server/module.h>
 
-int            fr_worker_request_add(request_t *request, module_method_t process, void *ctx);
+int            fr_worker_request_add(request_t *request, module_method_t process, void *uctx) CC_HINT(nonnull(1,2));
+
+int            fr_worker_subrequest_add(request_t *request) CC_HINT(nonnull);
 
 #ifdef __cplusplus
 }

diff --git a/src/lib/server/main_loop.c b/src/lib/server/main_loop.c
index e9de8d5c1b19cdd0ac8733e174c4936c76c64139..6d4d91b618c68c3d1fcc4ecdfeaef60acb909ead 100644 (file)
--- a/src/lib/server/main_loop.c
+++ b/src/lib/server/main_loop.c
@@ -232,7 +232,7 @@ int main_loop_start(void)
        return ret;
 }
 
-static int _loop_status(UNUSED void *ctx, fr_time_t wake)
+static int _loop_status(fr_time_t wake, UNUSED void *ctx)
 {
        if (wake > (NSEC / 10)) DEBUG3("Main loop waking up in %pV seconds", fr_box_time_delta(wake));
 

diff --git a/src/lib/util/event.c b/src/lib/util/event.c
index 97757227000febe63976176e2d99b597b130ca8a..6d6e91294ea4cbe1e4556e56bcdd520a30e44310 100644 (file)
--- a/src/lib/util/event.c
+++ b/src/lib/util/event.c
@@ -1802,7 +1802,7 @@ int fr_event_corral(fr_event_list_t *el, fr_time_t now, bool wait)
                for (pre = fr_dlist_head(&el->pre_callbacks);
                     pre != NULL;
                     pre = fr_dlist_next(&el->pre_callbacks, pre)) {
-                       if (pre->callback(pre->uctx, wake ? *wake : 0) > 0) {
+                       if (pre->callback(wake ? *wake : 0, pre->uctx) > 0) {
                                wake = &when;
                                when = 0;
                        }

diff --git a/src/lib/util/event.h b/src/lib/util/event.h
index 54316ceec6d4b8a21a18bc04bf5f6117a4f17dfb..5bf1c9940521a9e4fbd9ac926e4cafc2cfb7164e 100644 (file)
--- a/src/lib/util/event.h
+++ b/src/lib/util/event.h
@@ -119,7 +119,7 @@ typedef     void (*fr_event_timer_cb_t)(fr_event_list_t *el, fr_time_t now, void *uc
  * @param[in] now      The current time.
  * @param[in] uctx     User ctx passed to #fr_event_list_alloc.
  */
-typedef        int (*fr_event_status_cb_t)(void *uctx, fr_time_t now);
+typedef        int (*fr_event_status_cb_t)(fr_time_t now, void *uctx);
 
 /** Called when an IO event occurs on a file descriptor
  *