From: Nick Porter Date: Fri, 5 Sep 2025 12:24:27 +0000 (+0100) Subject: No need to pass in event list as fr_event_user_t contains the list X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92c62087fd93199207b0622950a91c8fda836bd1;p=thirdparty%2Ffreeradius-server.git No need to pass in event list as fr_event_user_t contains the list --- diff --git a/src/lib/util/event.c b/src/lib/util/event.c index f0d41fbc2ca..e96caac370e 100644 --- a/src/lib/util/event.c +++ b/src/lib/util/event.c @@ -1919,19 +1919,18 @@ int _fr_event_user_insert(NDEBUG_LOCATION_ARGS /** Trigger a user event * - * @param[in] el containing the user event. * @param[in] ev Handle for the user event. * @return * - 0 on success. * - -1 on error. */ -int fr_event_user_trigger(fr_event_list_t *el, fr_event_user_t *ev) +int fr_event_user_trigger(fr_event_user_t *ev) { struct kevent evset; EV_SET(&evset, (uintptr_t)ev, EVFILT_USER, EV_ENABLE, NOTE_TRIGGER, 0, NULL); - if (unlikely(kevent(el->kq, &evset, 1, NULL, 0, NULL) < 0)) { + if (unlikely(kevent(ev->el->kq, &evset, 1, NULL, 0, NULL) < 0)) { fr_strerror_printf("Failed triggering user event - kevent %s", fr_syserror(evset.flags)); return -1; } diff --git a/src/lib/util/event.h b/src/lib/util/event.h index b9919d54ec2..4d5b689d074 100644 --- a/src/lib/util/event.h +++ b/src/lib/util/event.h @@ -280,7 +280,7 @@ int _fr_event_user_insert(NDEBUG_LOCATION_ARGS #define fr_event_user_insert(_ctx, _ev_p, _el, _trigger, _callback, _uctx) \ _fr_event_user_insert(NDEBUG_LOCATION_EXP _ctx, _ev_p, _el, _trigger, _callback, _uctx) -int fr_event_user_trigger(fr_event_list_t *el, fr_event_user_t *ev); +int fr_event_user_trigger(fr_event_user_t *ev); int fr_event_user_delete(fr_event_list_t *el, fr_event_user_cb_t user, void *uctx) CC_HINT(nonnull(1,2));