Merge pull request #5625 from qlyoung/fix-zapi-ipset-name-nullterm

[mirror_frr.git] / lib / wheel.c

diff --git a/lib/wheel.c b/lib/wheel.c
index 722b02424a30ebf7b64ad3f6703eccd117e13ef9..8e479c931b5ac7c8cc590bd4dadcf2f9e48b4d46 100644 (file)
--- a/lib/wheel.c
+++ b/lib/wheel.c
@@ -80,7 +80,7 @@ static int wheel_timer_thread(struct thread *t)
 }
 
 struct timer_wheel *wheel_init(struct thread_master *master, int period,
-                              size_t slots, unsigned int (*slot_key)(void *),
+                              size_t slots, unsigned int (*slot_key)(const void *),
                               void (*slot_run)(void *),
                               const char *run_name)
 {
@@ -115,7 +115,7 @@ void wheel_delete(struct timer_wheel *wheel)
        int i;
 
        for (i = 0; i < wheel->slots; i++) {
-               list_delete_and_null(&wheel->wheel_slot_lists[i]);
+               list_delete(&wheel->wheel_slot_lists[i]);
        }
 
        THREAD_OFF(wheel->timer);