upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 10:01:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace (void *)-1 with ISC_LINK_TOMBSTONE

Browse source 
Instead of having "arbitrary" (void *)-1 to define non-linked, add a
ISC_LINK_TOMBSTONE(type) macro that replaces the "magic" value with a
define.

(cherry picked from commit 5e20c2ccfb)
This commit is contained in:
Ondřej Surý 2022-10-18 11:28:03 +02:00
parent 8efe60d423
commit 6525ebc777
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/isc/include/isc/list.h
View file

@ -15,13 +15,16 @@
#include <isc/assertions.h>
#define ISC_LINK_TOMBSTONE(type) ((type *)-1)
#define ISC_LIST_INITIALIZER \
{ \
.head = NULL, .tail = NULL, \
}
#define ISC_LINK_INITIALIZER_TYPE(type) \
{ \
.prev = (type *)-1, .next = (type *)-1, \
#define ISC_LINK_INITIALIZER_TYPE(type) \
{ \
.prev = ISC_LINK_TOMBSTONE(type), \
.next = ISC_LINK_TOMBSTONE(type), \
}
#define ISC_LINK_INITIALIZER ISC_LINK_INITIALIZER_TYPE(void)
@ -45,13 +48,15 @@
struct { \
type *prev, *next; \
}
#define ISC_LINK_INIT_TYPE(elt, link, type) \
do { \
(elt)->link.prev = (type *)(-1); \
(elt)->link.next = (type *)(-1); \
#define ISC_LINK_INIT_TYPE(elt, link, type) \
do { \
(elt)->link.prev = ISC_LINK_TOMBSTONE(type); \
(elt)->link.next = ISC_LINK_TOMBSTONE(type); \
} while (0)
#define ISC_LINK_INIT(elt, link) ISC_LINK_INIT_TYPE(elt, link, void)
#define ISC_LINK_LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1))
#define ISC_LINK_INIT(elt, link) ISC_LINK_INIT_TYPE(elt, link, void)
#define ISC_LINK_LINKED_TYPE(elt, link, type) \
((type *)((elt)->link.prev) != ISC_LINK_TOMBSTONE(type))
#define ISC_LINK_LINKED(elt, link) ISC_LINK_LINKED_TYPE(elt, link, void)
#define ISC_LIST_HEAD(list) ((list).head)
#define ISC_LIST_TAIL(list) ((list).tail)
@ -113,8 +118,8 @@
ISC_INSIST((list).head == (elt)); \
(list).head = (elt)->link.next; \
} \
(elt)->link.prev = (type *)(-1); \
(elt)->link.next = (type *)(-1); \
(elt)->link.prev = ISC_LINK_TOMBSTONE(type); \
(elt)->link.next = ISC_LINK_TOMBSTONE(type); \
ISC_INSIST((list).head != (elt)); \
ISC_INSIST((list).tail != (elt)); \
} while (0)