Fix minor build errors

diff --git a/src/lib/util/atexit.h b/src/lib/util/atexit.h
index 15d44f146b2e3e1b766c4a4994d97f79f96c073b..b911c2371388c9c370e8419b7b47c6415903aaab 100644 (file)
--- a/src/lib/util/atexit.h
+++ b/src/lib/util/atexit.h
@@ -67,7 +67,7 @@ int   fr_atexit_global_setup(void);
                pthread_mutex_lock(&_init_mutex); \
                if (!atomic_load(&_init_done)) { \
                        _init(); \
-                       if (_free) atexit(_free); \
+                       atexit(_free); \
                        atomic_store(&_init_done, true); \
                } \
                pthread_mutex_unlock(&_init_mutex); \

diff --git a/src/lib/util/event.c b/src/lib/util/event.c
index b3fbc7fe67d3e1952d06b827ef5954cd34712eb4..006b019be133e935c9921721304d04e7c5bcb911 100644 (file)
--- a/src/lib/util/event.c
+++ b/src/lib/util/event.c
@@ -1249,7 +1249,7 @@ fr_event_fd_t *fr_event_fd_handle(fr_event_list_t *el, int fd, fr_event_filter_t
        ef = fr_rb_find(el->fds, &(fr_event_fd_t){ .fd = fd, .filter = filter });
        if (unlikely(!ef)) {
                fr_strerror_printf("No events are registered for fd %i", fd);
-               return -1;
+               return NULL;
        }
 
        return ef;