From ffa465b759204272a5e94d851ce3696c827e9d96 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 9 Nov 2023 14:34:40 -0500 Subject: list: Simplify slist_remove_impl() We now assume that all-bits-zero is a null pointer, so memset is fine. --- src/list.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/list.h') diff --git a/src/list.h b/src/list.h index 61c22e3..91f416f 100644 --- a/src/list.h +++ b/src/list.h @@ -317,15 +317,15 @@ #define SLIST_REMOVE__(list, cursor, next) \ (list->tail = (*cursor)->next ? list->tail : cursor, \ - slist_remove_impl(*cursor, cursor, &(*cursor)->next, list->tail, sizeof(*cursor))) + slist_remove_impl(*cursor, cursor, &(*cursor)->next, sizeof(*cursor))) // Helper for SLIST_REMOVE() -static inline void *slist_remove_impl(void *ret, void *cursor, void *next, void *tail, size_t size) { +static inline void *slist_remove_impl(void *ret, void *cursor, void *next, size_t size) { // ret = *cursor; // *cursor = ret->next; memcpy(cursor, next, size); - // ret->next = *list->tail; (NULL) - memcpy(next, tail, size); + // ret->next = NULL; + memset(next, 0, size); return ret; } -- cgit v1.2.3