As we are not freeing elements while iterating the list of timers, we can forgo using the safe variant, and reduce the number of pointer dances required for the insertion sort.
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> --- os/WaitFor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os/WaitFor.c b/os/WaitFor.c index e3b545b93..ae317dc11 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -295,7 +295,7 @@ OsTimerPtr TimerSet(OsTimerPtr timer, int flags, CARD32 millis, OsTimerCallback func, void *arg) { - OsTimerPtr existing, tmp; + OsTimerPtr existing; CARD32 now = GetTimeInMillis(); if (!timer) { @@ -328,7 +328,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, input_lock(); /* Sort into list */ - xorg_list_for_each_entry_safe(existing, tmp, &timers, list) + xorg_list_for_each_entry(existing, &timers, list) if ((int) (existing->expires - millis) > 0) break; /* This even works at the end of the list -- existing->list will be timers */ -- 2.17.0 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel