Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:54:19 UTC 2018
Modified Files:
src/sys/external/bsd/common/include/linux: list.h
Log Message:
Fix hlist iteration again with more fields and null checks.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/common/include/linux/list.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/linux/list.h
diff -u src/sys/external/bsd/common/include/linux/list.h:1.8 src/sys/external/bsd/common/include/linux/list.h:1.9
--- src/sys/external/bsd/common/include/linux/list.h:1.8 Mon Aug 27 06:51:38 2018
+++ src/sys/external/bsd/common/include/linux/list.h Mon Aug 27 06:54:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: list.h,v 1.8 2018/08/27 06:51:38 riastradh Exp $ */
+/* $NetBSD: list.h,v 1.9 2018/08/27 06:54:19 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -296,7 +296,7 @@ hlist_del_init(struct hlist_node *node)
hlist_entry(hlist_first(HEAD), typeof(*(VAR)), \
FIELD)); \
(VAR) != NULL; \
- (VAR) = (hlist_next(VAR) == NULL ? NULL : \
+ (VAR) = (hlist_next(&(VAR)->FIELD) == NULL ? NULL : \
hlist_entry(hlist_next(&(VAR)->FIELD), typeof(*(VAR)),\
FIELD)))
@@ -305,8 +305,9 @@ hlist_del_init(struct hlist_node *node)
hlist_entry(hlist_first(HEAD), typeof(*(VAR)), \
FIELD)), \
(NEXT) = ((VAR) == NULL ? NULL : \
- hlist_entry(hlist_next(&(VAR)->FIELD), typeof(*(VAR)),\
- FIELD)); \
+ hlist_next(&(VAR)->FIELD) == NULL ? NULL : \
+ hlist_entry(hlist_next(&(VAR)->FIELD), \
+ typeof(*(VAR)), FIELD)); \
(VAR) != NULL; \
(VAR) = (NEXT))
