Use rb_entry_safe() instead of open-coding it. Signed-off-by: Geliang Tang <geliangt...@gmail.com> --- lib/timerqueue.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/timerqueue.c b/lib/timerqueue.c index 782ae8c..3debca0 100644 --- a/lib/timerqueue.c +++ b/lib/timerqueue.c @@ -80,8 +80,7 @@ bool timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node) if (head->next == node) { struct rb_node *rbn = rb_next(&node->node); - head->next = rbn ? - rb_entry(rbn, struct timerqueue_node, node) : NULL; + head->next = rb_entry_safe(rbn, struct timerqueue_node, node); } rb_erase(&node->node, &head->head); RB_CLEAR_NODE(&node->node); -- 2.9.3