Module Name: src
Committed By: rillig
Date: Sun May 12 10:34:56 UTC 2024
Modified Files:
src/sys/sys: bitops.h boot_flag.h bootblock.h buf.h cctr.h cdefs.h
cpu_data.h fd_set.h ieee754.h ipc.h kernhist.h lock.h mbuf.h msg.h
queue.h rbtree.h resourcevar.h sem.h shm.h siginfo.h sigtypes.h
socketvar.h systm.h time.h tree.h
Log Message:
sys/sys: remove CONSTCOND comment from do-while-0 loop
Lint doesn't need this comment anymore, as there is nothing surprising
or unusual about this idiom.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/bitops.h
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/boot_flag.h src/sys/sys/fd_set.h
cvs rdiff -u -r1.59 -r1.60 src/sys/sys/bootblock.h
cvs rdiff -u -r1.134 -r1.135 src/sys/sys/buf.h
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/cctr.h
cvs rdiff -u -r1.162 -r1.163 src/sys/sys/cdefs.h
cvs rdiff -u -r1.55 -r1.56 src/sys/sys/cpu_data.h src/sys/sys/shm.h
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/ieee754.h
cvs rdiff -u -r1.37 -r1.38 src/sys/sys/ipc.h
cvs rdiff -u -r1.26 -r1.27 src/sys/sys/kernhist.h
cvs rdiff -u -r1.92 -r1.93 src/sys/sys/lock.h
cvs rdiff -u -r1.239 -r1.240 src/sys/sys/mbuf.h
cvs rdiff -u -r1.29 -r1.30 src/sys/sys/msg.h
cvs rdiff -u -r1.76 -r1.77 src/sys/sys/queue.h
cvs rdiff -u -r1.11 -r1.12 src/sys/sys/rbtree.h
cvs rdiff -u -r1.58 -r1.59 src/sys/sys/resourcevar.h
cvs rdiff -u -r1.34 -r1.35 src/sys/sys/sem.h src/sys/sys/siginfo.h
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/sigtypes.h
cvs rdiff -u -r1.168 -r1.169 src/sys/sys/socketvar.h
cvs rdiff -u -r1.305 -r1.306 src/sys/sys/systm.h
cvs rdiff -u -r1.80 -r1.81 src/sys/sys/time.h
cvs rdiff -u -r1.20 -r1.21 src/sys/sys/tree.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/sys/bitops.h
diff -u src/sys/sys/bitops.h:1.15 src/sys/sys/bitops.h:1.16
--- src/sys/sys/bitops.h:1.15 Sun Sep 12 15:22:05 2021
+++ src/sys/sys/bitops.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bitops.h,v 1.15 2021/09/12 15:22:05 rillig Exp $ */
+/* $NetBSD: bitops.h,v 1.16 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
@@ -323,7 +323,7 @@ fast_remainder32(uint32_t _v, uint32_t _
size_t __i; \
for (__i = 0; __i < __arraycount((__v)->_b); __i++) \
(__v)->_b[__i] = 0; \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#endif /* GCC 2.95 */
#endif /* _SYS_BITOPS_H_ */
Index: src/sys/sys/boot_flag.h
diff -u src/sys/sys/boot_flag.h:1.7 src/sys/sys/boot_flag.h:1.8
--- src/sys/sys/boot_flag.h:1.7 Tue Apr 29 19:16:08 2008
+++ src/sys/sys/boot_flag.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: boot_flag.h,v 1.7 2008/04/29 19:16:08 ad Exp $ */
+/* $NetBSD: boot_flag.h,v 1.8 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -86,6 +86,6 @@
break; \
} /* switch */ \
\
- } while (/* CONSTCOND */ 0)
+ } while (0)
#endif /* _SYS_BOOT_FLAG_H_ */
Index: src/sys/sys/fd_set.h
diff -u src/sys/sys/fd_set.h:1.7 src/sys/sys/fd_set.h:1.8
--- src/sys/sys/fd_set.h:1.7 Sun Jun 24 12:05:40 2018
+++ src/sys/sys/fd_set.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fd_set.h,v 1.7 2018/06/24 12:05:40 kamil Exp $ */
+/* $NetBSD: fd_set.h,v 1.8 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -81,7 +81,7 @@ typedef struct fd_set {
unsigned int __i; \
for (__i = 0; __i < __NFD_SIZE; __i++) \
__fds->fds_bits[__i] = 0; \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#endif /* GCC 2.95 */
/*
@@ -100,7 +100,7 @@ typedef struct fd_set {
unsigned int __i; \
for (__i = 0; __i < __NFD_SIZE; __i++) \
__t->fds_bits[__i] = __f->fds_bits[__i]; \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#endif /* GCC 2.95 */
#endif /* _NETBSD_SOURCE */
Index: src/sys/sys/bootblock.h
diff -u src/sys/sys/bootblock.h:1.59 src/sys/sys/bootblock.h:1.60
--- src/sys/sys/bootblock.h:1.59 Sat May 11 22:10:27 2024
+++ src/sys/sys/bootblock.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bootblock.h,v 1.59 2024/05/11 22:10:27 tsutsui Exp $ */
+/* $NetBSD: bootblock.h,v 1.60 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 2002-2004 The NetBSD Foundation, Inc.
@@ -800,7 +800,7 @@ struct alpha_boot_block {
_i++) \
_cksum += le64toh(_bb->bb_data[_i]); \
*(cksum) = htole64(_cksum); \
- } while (/*CONSTCOND*/ 0)
+ } while (0)
/* ------------------------------------------
* apple --
Index: src/sys/sys/buf.h
diff -u src/sys/sys/buf.h:1.134 src/sys/sys/buf.h:1.135
--- src/sys/sys/buf.h:1.134 Fri Jul 31 04:07:30 2020
+++ src/sys/sys/buf.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.134 2020/07/31 04:07:30 chs Exp $ */
+/* $NetBSD: buf.h,v 1.135 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 1999, 2000, 2007, 2008 The NetBSD Foundation, Inc.
@@ -234,7 +234,7 @@ struct cluster_save {
do { \
memset((bp)->b_data, 0, (u_int)(bp)->b_bcount); \
(bp)->b_resid = 0; \
-} while (/* CONSTCOND */ 0)
+} while (0)
/* Flags to low-level allocation routines. */
#define B_CLRBUF 0x01 /* Request allocated buffer be cleared. */
Index: src/sys/sys/cctr.h
diff -u src/sys/sys/cctr.h:1.4 src/sys/sys/cctr.h:1.5
--- src/sys/sys/cctr.h:1.4 Sat Oct 10 03:05:04 2020
+++ src/sys/sys/cctr.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cctr.h,v 1.4 2020/10/10 03:05:04 thorpej Exp $ */
+/* $NetBSD: cctr.h,v 1.5 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 2004, 2020 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@ do { \
(ci)->ci_cc.cc_ticks = 0; \
cc_calibrate_cpu((ci)); \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
#endif /* _KERNEL */
#endif /* _SYS_CCTR_H_ */
Index: src/sys/sys/cdefs.h
diff -u src/sys/sys/cdefs.h:1.162 src/sys/sys/cdefs.h:1.163
--- src/sys/sys/cdefs.h:1.162 Sat May 11 13:26:54 2024
+++ src/sys/sys/cdefs.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.162 2024/05/11 13:26:54 riastradh Exp $ */
+/* $NetBSD: cdefs.h,v 1.163 2024/05/12 10:34:56 rillig Exp $ */
/* * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -340,7 +340,7 @@
#if __GNUC_PREREQ__(4, 6) || defined(__clang__) || defined(__lint__)
#define __unreachable() __builtin_unreachable()
#else
-#define __unreachable() do {} while (/*CONSTCOND*/0)
+#define __unreachable() do {} while (0)
#endif
#if defined(_KERNEL) || defined(_RUMPKERNEL)
Index: src/sys/sys/cpu_data.h
diff -u src/sys/sys/cpu_data.h:1.55 src/sys/sys/cpu_data.h:1.56
--- src/sys/sys/cpu_data.h:1.55 Wed Sep 6 12:29:14 2023
+++ src/sys/sys/cpu_data.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_data.h,v 1.55 2023/09/06 12:29:14 riastradh Exp $ */
+/* $NetBSD: cpu_data.h,v 1.56 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 2004, 2006, 2007, 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -248,7 +248,7 @@ do { \
KASSERT(kpreempt_disabled()); \
KASSERT((unsigned)idx < CPU_COUNT_MAX); \
curcpu()->ci_counts[(idx)] += (d); \
-} while (/* CONSTCOND */ 0)
+} while (0)
/*
* Fetch a potentially stale count - cheap, use as often as you like.
Index: src/sys/sys/shm.h
diff -u src/sys/sys/shm.h:1.55 src/sys/sys/shm.h:1.56
--- src/sys/sys/shm.h:1.55 Tue Aug 17 22:00:32 2021
+++ src/sys/sys/shm.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: shm.h,v 1.55 2021/08/17 22:00:32 andvar Exp $ */
+/* $NetBSD: shm.h,v 1.56 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -192,7 +192,7 @@ extern void (*uvm_shmfork)(struct vmspac
(dst).shm_dtime = (src).shm_dtime; \
(dst).shm_ctime = (src).shm_ctime; \
(dst).shm_nattch = (src).shm_nattch; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#else /* !_KERNEL */
Index: src/sys/sys/ieee754.h
diff -u src/sys/sys/ieee754.h:1.17 src/sys/sys/ieee754.h:1.18
--- src/sys/sys/ieee754.h:1.17 Thu Apr 16 22:13:51 2020
+++ src/sys/sys/ieee754.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee754.h,v 1.17 2020/04/16 22:13:51 christos Exp $ */
+/* $NetBSD: ieee754.h,v 1.18 2024/05/12 10:34:56 rillig Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -131,7 +131,7 @@ struct ieee_double {
(a)[1] = (uint32_t)((u).extu_ext.ext_fracl >> 32); \
(a)[2] = (uint32_t)((u).extu_ext.ext_frach >> 0); \
(a)[3] = (uint32_t)((u).extu_ext.ext_frach >> 32); \
-} while(/*CONSTCOND*/0)
+} while (0)
struct ieee_ext {
#if _BYTE_ORDER == _BIG_ENDIAN
Index: src/sys/sys/ipc.h
diff -u src/sys/sys/ipc.h:1.37 src/sys/sys/ipc.h:1.38
--- src/sys/sys/ipc.h:1.37 Sat Jun 23 07:23:06 2018
+++ src/sys/sys/ipc.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ipc.h,v 1.37 2018/06/23 07:23:06 gson Exp $ */
+/* $NetBSD: ipc.h,v 1.38 2024/05/12 10:34:56 rillig Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -131,7 +131,7 @@ __END_DECLS
(dst).cgid = (src).cgid; \
(dst).mode = (src).mode; \
(dst)._seq = (src)._seq; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
/*
* Set-up the sysctl routine for COMPAT_50
Index: src/sys/sys/kernhist.h
diff -u src/sys/sys/kernhist.h:1.26 src/sys/sys/kernhist.h:1.27
--- src/sys/sys/kernhist.h:1.26 Sat Apr 17 01:53:58 2021
+++ src/sys/sys/kernhist.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: kernhist.h,v 1.26 2021/04/17 01:53:58 mrg Exp $ */
+/* $NetBSD: kernhist.h,v 1.27 2024/05/12 10:34:56 rillig Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -151,7 +151,7 @@ extern struct kern_history_head kern_his
do { \
LIST_INSERT_HEAD(&kern_histories, &(NAME), list); \
sysctl_kernhist_new(&(NAME)); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define KERNHIST_INIT(NAME,N) \
do { \
@@ -163,7 +163,7 @@ do { \
kmem_zalloc(sizeof(struct kern_history_ent) * (N), KM_SLEEP); \
(NAME).s = 0; \
KERNHIST_LINK_STATIC(NAME); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define KERNHIST_INITIALIZER(NAME,BUF) \
{ \
@@ -189,7 +189,7 @@ do { \
if (KERNHIST_DELAY != 0) \
DELAY(KERNHIST_DELAY); \
} \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#else
#define KERNHIST_PRINTNOW(E) /* nothing */
#endif
@@ -215,13 +215,13 @@ do { \
_e_->v[2] = (uintmax_t)(C); \
_e_->v[3] = (uintmax_t)(D); \
KERNHIST_PRINTNOW(_e_); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define KERNHIST_CALLED(NAME) \
do { \
_kernhist_call = atomic_inc_32_nv(&_kernhist_cnt); \
KERNHIST_LOG(NAME, "called!", 0, 0, 0, 0); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
/*
* This extends kernhist to avoid wasting a separate "called!" entry on every
@@ -231,7 +231,7 @@ do { \
do { \
_kernhist_call = atomic_inc_32_nv(&_kernhist_cnt); \
KERNHIST_LOG(NAME, "called: "FMT, (A), (B), (C), (D)); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define KERNHIST_FUNC(FNAME) \
static uint32_t _kernhist_cnt = 0; \
Index: src/sys/sys/lock.h
diff -u src/sys/sys/lock.h:1.92 src/sys/sys/lock.h:1.93
--- src/sys/sys/lock.h:1.92 Sun Jul 24 20:28:39 2022
+++ src/sys/sys/lock.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.92 2022/07/24 20:28:39 riastradh Exp $ */
+/* $NetBSD: lock.h,v 1.93 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 1999, 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@ do { \
} \
if ((count) < SPINLOCK_BACKOFF_MAX) \
(count) += (count); \
-} while (/* CONSTCOND */ 0);
+} while (0);
#ifdef LOCKDEBUG
#define SPINLOCK_SPINOUT(spins) ((spins)++ > 0x0fffffff)
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.239 src/sys/sys/mbuf.h:1.240
--- src/sys/sys/mbuf.h:1.239 Mon Jan 22 21:15:02 2024
+++ src/sys/sys/mbuf.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.239 2024/01/22 21:15:02 jdolecek Exp $ */
+/* $NetBSD: mbuf.h,v 1.240 2024/05/12 10:34:56 rillig Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -459,7 +459,7 @@ do { \
KASSERT(((m)->m_flags & M_EXT) == 0); \
(m)->m_ext_ref = (m); \
(m)->m_ext.ext_refcnt = 1; \
-} while (/* CONSTCOND */ 0)
+} while (0)
/*
* Macros for mbuf external storage.
@@ -489,7 +489,7 @@ do { \
(m)->m_ext.ext_arg = NULL; \
mowner_ref((m), M_EXT); \
} \
-} while (/* CONSTCOND */ 0)
+} while (0)
#define MEXTADD(m, buf, size, type, free, arg) \
do { \
@@ -500,7 +500,7 @@ do { \
(m)->m_ext.ext_free = (free); \
(m)->m_ext.ext_arg = (arg); \
mowner_ref((m), M_EXT); \
-} while (/* CONSTCOND */ 0)
+} while (0)
#define M_BUFADDR(m) \
(((m)->m_flags & M_EXT) ? (m)->m_ext.ext_buf : \
@@ -573,7 +573,7 @@ do { \
(m) = m_prepend((m), (plen), (how)); \
if ((m) && (m)->m_flags & M_PKTHDR) \
(m)->m_pkthdr.len += (plen); \
-} while (/* CONSTCOND */ 0)
+} while (0)
/* change mbuf to new type */
#define MCHTYPE(m, t) \
@@ -582,7 +582,7 @@ do { \
mbstat_type_add((m)->m_type, -1); \
mbstat_type_add(t, 1); \
(m)->m_type = t; \
-} while (/* CONSTCOND */ 0)
+} while (0)
#ifdef DIAGNOSTIC
#define M_VERIFY_PACKET(m) m_verify_packet(m)
@@ -623,7 +623,7 @@ do { \
(m) = NULL; \
} \
} \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#endif /* defined(_KERNEL) */
@@ -644,19 +644,19 @@ struct name { \
#define MBUFQ_INIT(q) do { \
(q)->mq_first = NULL; \
(q)->mq_last = &(q)->mq_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define MBUFQ_ENQUEUE(q, m) do { \
(m)->m_nextpkt = NULL; \
*(q)->mq_last = (m); \
(q)->mq_last = &(m)->m_nextpkt; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define MBUFQ_PREPEND(q, m) do { \
if (((m)->m_nextpkt = (q)->mq_first) == NULL) \
(q)->mq_last = &(m)->m_nextpkt; \
(q)->mq_first = (m); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define MBUFQ_DEQUEUE(q, m) do { \
if (((m) = (q)->mq_first) != NULL) { \
@@ -665,7 +665,7 @@ struct name { \
else \
(m)->m_nextpkt = NULL; \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
#define MBUFQ_DRAIN(q) do { \
struct mbuf *__m0; \
@@ -674,7 +674,7 @@ struct name { \
m_freem(__m0); \
} \
(q)->mq_last = &(q)->mq_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define MBUFQ_FIRST(q) ((q)->mq_first)
#define MBUFQ_NEXT(m) ((m)->m_nextpkt)
Index: src/sys/sys/msg.h
diff -u src/sys/sys/msg.h:1.29 src/sys/sys/msg.h:1.30
--- src/sys/sys/msg.h:1.29 Sun Feb 12 16:28:32 2023
+++ src/sys/sys/msg.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.h,v 1.29 2023/02/12 16:28:32 andvar Exp $ */
+/* $NetBSD: msg.h,v 1.30 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -191,7 +191,7 @@ extern kmutex_t msgmutex;
(dst).msg_stime = (src).msg_stime; \
(dst).msg_rtime = (src).msg_rtime; \
(dst).msg_ctime = (src).msg_ctime; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#endif /* _KERNEL */
Index: src/sys/sys/queue.h
diff -u src/sys/sys/queue.h:1.76 src/sys/sys/queue.h:1.77
--- src/sys/sys/queue.h:1.76 Sat Jan 16 23:51:51 2021
+++ src/sys/sys/queue.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: queue.h,v 1.76 2021/01/16 23:51:51 chs Exp $ */
+/* $NetBSD: queue.h,v 1.77 2024/05/12 10:34:56 rillig Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -136,26 +136,26 @@ struct { \
*/
#define SLIST_INIT(head) do { \
(head)->slh_first = SLIST_END(head); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \
(elm)->field.sle_next = (slistelm)->field.sle_next; \
(slistelm)->field.sle_next = (elm); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SLIST_INSERT_HEAD(head, elm, field) do { \
(elm)->field.sle_next = (head)->slh_first; \
(head)->slh_first = (elm); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SLIST_REMOVE_AFTER(slistelm, field) do { \
(slistelm)->field.sle_next = \
SLIST_NEXT(SLIST_NEXT((slistelm), field), field); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SLIST_REMOVE_HEAD(head, field) do { \
(head)->slh_first = (head)->slh_first->field.sle_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SLIST_REMOVE(head, elm, type, field) do { \
if ((head)->slh_first == (elm)) { \
@@ -168,7 +168,7 @@ struct { \
curelm->field.sle_next = \
curelm->field.sle_next->field.sle_next; \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
/*
@@ -214,7 +214,7 @@ struct { \
(head2)->lh_first->field.le_prev = &(head2)->lh_first; \
LIST_INIT((head1)); \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
/*
* List functions.
@@ -245,7 +245,7 @@ struct { \
#define LIST_INIT(head) do { \
(head)->lh_first = LIST_END(head); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define LIST_INSERT_AFTER(listelm, elm, field) do { \
QUEUEDEBUG_LIST_OP((listelm), field) \
@@ -255,7 +255,7 @@ struct { \
&(elm)->field.le_next; \
(listelm)->field.le_next = (elm); \
(elm)->field.le_prev = &(listelm)->field.le_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define LIST_INSERT_BEFORE(listelm, elm, field) do { \
QUEUEDEBUG_LIST_OP((listelm), field) \
@@ -263,7 +263,7 @@ struct { \
(elm)->field.le_next = (listelm); \
*(listelm)->field.le_prev = (elm); \
(listelm)->field.le_prev = &(elm)->field.le_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define LIST_INSERT_HEAD(head, elm, field) do { \
QUEUEDEBUG_LIST_INSERT_HEAD((head), (elm), field) \
@@ -271,7 +271,7 @@ struct { \
(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
(head)->lh_first = (elm); \
(elm)->field.le_prev = &(head)->lh_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define LIST_REMOVE(elm, field) do { \
QUEUEDEBUG_LIST_OP((elm), field) \
@@ -280,7 +280,7 @@ struct { \
(elm)->field.le_prev; \
*(elm)->field.le_prev = (elm)->field.le_next; \
QUEUEDEBUG_LIST_POSTREMOVE((elm), field) \
-} while (/*CONSTCOND*/0)
+} while (0)
#define LIST_REPLACE(elm, elm2, field) do { \
if (((elm2)->field.le_next = (elm)->field.le_next) != NULL) \
@@ -289,7 +289,7 @@ struct { \
(elm2)->field.le_prev = (elm)->field.le_prev; \
*(elm2)->field.le_prev = (elm2); \
QUEUEDEBUG_LIST_POSTREMOVE((elm), field) \
-} while (/*CONSTCOND*/0)
+} while (0)
/*
* Simple queue definitions.
@@ -333,36 +333,36 @@ struct { \
#define SIMPLEQ_INIT(head) do { \
(head)->sqh_first = NULL; \
(head)->sqh_last = &(head)->sqh_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SIMPLEQ_INSERT_HEAD(head, elm, field) do { \
if (((elm)->field.sqe_next = (head)->sqh_first) == NULL) \
(head)->sqh_last = &(elm)->field.sqe_next; \
(head)->sqh_first = (elm); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SIMPLEQ_INSERT_TAIL(head, elm, field) do { \
(elm)->field.sqe_next = NULL; \
*(head)->sqh_last = (elm); \
(head)->sqh_last = &(elm)->field.sqe_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
(head)->sqh_last = &(elm)->field.sqe_next; \
(listelm)->field.sqe_next = (elm); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SIMPLEQ_REMOVE_HEAD(head, field) do { \
if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
(head)->sqh_last = &(head)->sqh_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SIMPLEQ_REMOVE_AFTER(head, elm, field) do { \
if (((elm)->field.sqe_next = (elm)->field.sqe_next->field.sqe_next) \
== NULL) \
(head)->sqh_last = &(elm)->field.sqe_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SIMPLEQ_REMOVE(head, elm, type, field) do { \
if ((head)->sqh_first == (elm)) { \
@@ -375,7 +375,7 @@ struct { \
curelm->field.sqe_next->field.sqe_next) == NULL) \
(head)->sqh_last = &(curelm)->field.sqe_next; \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SIMPLEQ_CONCAT(head1, head2) do { \
if (!SIMPLEQ_EMPTY((head2))) { \
@@ -383,7 +383,7 @@ struct { \
(head1)->sqh_last = (head2)->sqh_last; \
SIMPLEQ_INIT((head2)); \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
#define SIMPLEQ_LAST(head, type, field) \
(SIMPLEQ_EMPTY((head)) ? \
@@ -485,7 +485,7 @@ struct { \
#define TAILQ_INIT(head) do { \
(head)->tqh_first = TAILQ_END(head); \
(head)->tqh_last = &(head)->tqh_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define TAILQ_INSERT_HEAD(head, elm, field) do { \
QUEUEDEBUG_TAILQ_INSERT_HEAD((head), (elm), field) \
@@ -496,7 +496,7 @@ struct { \
(head)->tqh_last = &(elm)->field.tqe_next; \
(head)->tqh_first = (elm); \
(elm)->field.tqe_prev = &(head)->tqh_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define TAILQ_INSERT_TAIL(head, elm, field) do { \
QUEUEDEBUG_TAILQ_INSERT_TAIL((head), (elm), field) \
@@ -504,7 +504,7 @@ struct { \
(elm)->field.tqe_prev = (head)->tqh_last; \
*(head)->tqh_last = (elm); \
(head)->tqh_last = &(elm)->field.tqe_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \
QUEUEDEBUG_TAILQ_OP((listelm), field) \
@@ -516,7 +516,7 @@ struct { \
(head)->tqh_last = &(elm)->field.tqe_next; \
(listelm)->field.tqe_next = (elm); \
(elm)->field.tqe_prev = &(listelm)->field.tqe_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \
QUEUEDEBUG_TAILQ_OP((listelm), field) \
@@ -524,7 +524,7 @@ struct { \
(elm)->field.tqe_next = (listelm); \
*(listelm)->field.tqe_prev = (elm); \
(listelm)->field.tqe_prev = &(elm)->field.tqe_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define TAILQ_REMOVE(head, elm, field) do { \
QUEUEDEBUG_TAILQ_PREREMOVE((head), (elm), field) \
@@ -536,7 +536,7 @@ struct { \
(head)->tqh_last = (elm)->field.tqe_prev; \
*(elm)->field.tqe_prev = (elm)->field.tqe_next; \
QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define TAILQ_REPLACE(head, elm, elm2, field) do { \
if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != \
@@ -548,7 +548,7 @@ struct { \
(elm2)->field.tqe_prev = (elm)->field.tqe_prev; \
*(elm2)->field.tqe_prev = (elm2); \
QUEUEDEBUG_TAILQ_POSTREMOVE((elm), field); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define TAILQ_CONCAT(head1, head2, field) do { \
if (!TAILQ_EMPTY(head2)) { \
@@ -557,7 +557,7 @@ struct { \
(head1)->tqh_last = (head2)->tqh_last; \
TAILQ_INIT((head2)); \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
/*
* Singly-linked Tail queue declarations.
@@ -590,30 +590,30 @@ struct { \
#define STAILQ_INIT(head) do { \
(head)->stqh_first = NULL; \
(head)->stqh_last = &(head)->stqh_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define STAILQ_INSERT_HEAD(head, elm, field) do { \
if (((elm)->field.stqe_next = (head)->stqh_first) == NULL) \
(head)->stqh_last = &(elm)->field.stqe_next; \
(head)->stqh_first = (elm); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define STAILQ_INSERT_TAIL(head, elm, field) do { \
(elm)->field.stqe_next = NULL; \
*(head)->stqh_last = (elm); \
(head)->stqh_last = &(elm)->field.stqe_next; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define STAILQ_INSERT_AFTER(head, listelm, elm, field) do { \
if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
(head)->stqh_last = &(elm)->field.stqe_next; \
(listelm)->field.stqe_next = (elm); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define STAILQ_REMOVE_HEAD(head, field) do { \
if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) == NULL) \
(head)->stqh_last = &(head)->stqh_first; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define STAILQ_REMOVE(head, elm, type, field) do { \
if ((head)->stqh_first == (elm)) { \
@@ -626,7 +626,7 @@ struct { \
curelm->field.stqe_next->field.stqe_next) == NULL) \
(head)->stqh_last = &(curelm)->field.stqe_next; \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
#define STAILQ_FOREACH(var, head, field) \
for ((var) = ((head)->stqh_first); \
@@ -644,7 +644,7 @@ struct { \
(head1)->stqh_last = (head2)->stqh_last; \
STAILQ_INIT((head2)); \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
#define STAILQ_LAST(head, type, field) \
(STAILQ_EMPTY((head)) ? \
Index: src/sys/sys/rbtree.h
diff -u src/sys/sys/rbtree.h:1.11 src/sys/sys/rbtree.h:1.12
--- src/sys/sys/rbtree.h:1.11 Tue Jan 2 22:39:00 2024
+++ src/sys/sys/rbtree.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtree.h,v 1.11 2024/01/02 22:39:00 kre Exp $ */
+/* $NetBSD: rbtree.h,v 1.12 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@ typedef struct rb_node {
uintptr_t xorinfo = ((a)->rb_info ^ (b)->rb_info) & RB_FLAG_MASK; \
(a)->rb_info ^= xorinfo; \
(b)->rb_info ^= xorinfo; \
- } while (/*CONSTCOND*/ 0)
+ } while (0)
#ifdef RBDEBUG
TAILQ_ENTRY(rb_node) rb_link;
#endif
@@ -128,11 +128,11 @@ TAILQ_HEAD(rb_node_qh, rb_node);
#define RBDEBUG_TREE_INITIALIZER(t) \
.rbt_nodes = TAILQ_HEAD_INITIALIZER((t).rbt_nodes),
#else
-#define RB_TAILQ_REMOVE(a, b, c) do { } while (/*CONSTCOND*/0)
-#define RB_TAILQ_INIT(a) do { } while (/*CONSTCOND*/0)
-#define RB_TAILQ_INSERT_HEAD(a, b, c) do { } while (/*CONSTCOND*/0)
-#define RB_TAILQ_INSERT_BEFORE(a, b, c) do { } while (/*CONSTCOND*/0)
-#define RB_TAILQ_INSERT_AFTER(a, b, c, d) do { } while (/*CONSTCOND*/0)
+#define RB_TAILQ_REMOVE(a, b, c) do { } while (0)
+#define RB_TAILQ_INIT(a) do { } while (0)
+#define RB_TAILQ_INSERT_HEAD(a, b, c) do { } while (0)
+#define RB_TAILQ_INSERT_BEFORE(a, b, c) do { } while (0)
+#define RB_TAILQ_INSERT_AFTER(a, b, c, d) do { } while (0)
#define RBDEBUG_TREE_INITIALIZER(t) /* nothing */
#endif /* RBDEBUG */
@@ -181,8 +181,8 @@ typedef struct rb_tree {
#define RBSTAT_INC(v) ((void)((v)++))
#define RBSTAT_DEC(v) ((void)((v)--))
#else
-#define RBSTAT_INC(v) do { } while (/*CONSTCOND*/0)
-#define RBSTAT_DEC(v) do { } while (/*CONSTCOND*/0)
+#define RBSTAT_INC(v) do { } while (0)
+#define RBSTAT_DEC(v) do { } while (0)
#endif
#define RB_TREE_INIT_TYPECHECK(t) \
Index: src/sys/sys/resourcevar.h
diff -u src/sys/sys/resourcevar.h:1.58 src/sys/sys/resourcevar.h:1.59
--- src/sys/sys/resourcevar.h:1.58 Sat Jul 8 20:02:10 2023
+++ src/sys/sys/resourcevar.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: resourcevar.h,v 1.58 2023/07/08 20:02:10 riastradh Exp $ */
+/* $NetBSD: resourcevar.h,v 1.59 2024/05/12 10:34:56 rillig Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -95,7 +95,7 @@ struct plimit {
_p->p_stats->p_prof.pr_addr, \
_p->p_stats->p_prof.pr_ticks); \
_p->p_stats->p_prof.pr_ticks = 0; \
- } while (/* CONSTCOND */ 0)
+ } while (0)
extern char defcorename[];
Index: src/sys/sys/sem.h
diff -u src/sys/sys/sem.h:1.34 src/sys/sys/sem.h:1.35
--- src/sys/sys/sem.h:1.34 Wed Aug 7 00:38:02 2019
+++ src/sys/sys/sem.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.h,v 1.34 2019/08/07 00:38:02 pgoyette Exp $ */
+/* $NetBSD: sem.h,v 1.35 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -204,7 +204,7 @@ extern struct semid_ds *sema; /* semaph
(dst).sem_nsems = (src).sem_nsems; \
(dst).sem_otime = (src).sem_otime; \
(dst).sem_ctime = (src).sem_ctime; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#endif /* _KERNEL */
Index: src/sys/sys/siginfo.h
diff -u src/sys/sys/siginfo.h:1.34 src/sys/sys/siginfo.h:1.35
--- src/sys/sys/siginfo.h:1.34 Mon Sep 30 21:13:33 2019
+++ src/sys/sys/siginfo.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: siginfo.h,v 1.34 2019/09/30 21:13:33 kamil Exp $ */
+/* $NetBSD: siginfo.h,v 1.35 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -112,26 +112,26 @@ typedef struct ksiginfo {
#define KSI_INIT(ksi) \
do { \
memset((ksi), 0, sizeof(*(ksi))); \
-} while (/*CONSTCOND*/0)
+} while (0)
#define KSI_INIT_EMPTY(ksi) \
do { \
KSI_INIT((ksi)); \
(ksi)->ksi_flags = KSI_EMPTY; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define KSI_INIT_TRAP(ksi) \
do { \
KSI_INIT((ksi)); \
(ksi)->ksi_flags = KSI_TRAP; \
-} while (/*CONSTCOND*/0)
+} while (0)
/* Copy the part of ksiginfo_t without the queue pointers */
#define KSI_COPY(fksi, tksi) \
do { \
(tksi)->ksi_info = (fksi)->ksi_info; \
(tksi)->ksi_flags = (fksi)->ksi_flags; \
-} while (/*CONSTCOND*/0)
+} while (0)
/* Predicate macros to test how a ksiginfo_t was generated. */
Index: src/sys/sys/sigtypes.h
diff -u src/sys/sys/sigtypes.h:1.12 src/sys/sys/sigtypes.h:1.13
--- src/sys/sys/sigtypes.h:1.12 Tue Nov 2 20:12:26 2021
+++ src/sys/sys/sigtypes.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sigtypes.h,v 1.12 2021/11/02 20:12:26 christos Exp $ */
+/* $NetBSD: sigtypes.h,v 1.13 2024/05/12 10:34:56 rillig Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -87,21 +87,21 @@ typedef struct {
(t)->__bits[1] |= (s)->__bits[1]; \
(t)->__bits[2] |= (s)->__bits[2]; \
(t)->__bits[3] |= (s)->__bits[3]; \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#define __sigminusset(s, t) \
do { \
(t)->__bits[0] &= ~(s)->__bits[0]; \
(t)->__bits[1] &= ~(s)->__bits[1]; \
(t)->__bits[2] &= ~(s)->__bits[2]; \
(t)->__bits[3] &= ~(s)->__bits[3]; \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#define __sigandset(s, t) \
do { \
(t)->__bits[0] &= (s)->__bits[0]; \
(t)->__bits[1] &= (s)->__bits[1]; \
(t)->__bits[2] &= (s)->__bits[2]; \
(t)->__bits[3] &= (s)->__bits[3]; \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#if (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
(_XOPEN_SOURCE - 0) >= 500 || (_POSIX_C_SOURCE - 0) >= 200809L || \
Index: src/sys/sys/socketvar.h
diff -u src/sys/sys/socketvar.h:1.168 src/sys/sys/socketvar.h:1.169
--- src/sys/sys/socketvar.h:1.168 Sat Feb 3 19:05:14 2024
+++ src/sys/sys/socketvar.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: socketvar.h,v 1.168 2024/02/03 19:05:14 jdolecek Exp $ */
+/* $NetBSD: socketvar.h,v 1.169 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -237,7 +237,7 @@ do { \
(sb)->sb_mbtail = NULL; \
(sb)->sb_lastrecord = NULL; \
} \
-} while (/*CONSTCOND*/0)
+} while (0)
extern u_long sb_max;
extern int somaxkva;
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.305 src/sys/sys/systm.h:1.306
--- src/sys/sys/systm.h:1.305 Sat Sep 9 16:01:09 2023
+++ src/sys/sys/systm.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.305 2023/09/09 16:01:09 christos Exp $ */
+/* $NetBSD: systm.h,v 1.306 2024/05/12 10:34:56 rillig Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -203,7 +203,7 @@ enum hashtype {
dst = src; \
else \
hash_value(&dst, sizeof(dst), &src, sizeof(src)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define COND_SET_CPTR(dst, src, allow) \
do { \
@@ -214,7 +214,7 @@ enum hashtype {
hash_value(&__v, sizeof(__v), &src, sizeof(src)); \
dst = __v; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define COND_SET_PTR(dst, src, allow) \
do { \
@@ -222,7 +222,7 @@ enum hashtype {
dst = src; \
else \
hash_value(&dst, sizeof(dst), &src, sizeof(src)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define COND_SET_VALUE(dst, src, allow) \
do { \
@@ -232,7 +232,7 @@ enum hashtype {
uint64_t __v = src; \
hash_value(&dst, sizeof(dst), &__v, sizeof(__v)); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
void hash_value(void *, size_t, const void *, size_t);
void hash_value_ensure_initialized(void);
@@ -693,7 +693,7 @@ int cn_get_magic(char *, size_t);
(s).cnm_state = 0; \
} \
} \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#endif
/* Encode out-of-band events this way when passing to cn_check_magic() */
@@ -714,7 +714,7 @@ extern int db_fromconsole; /* XXX ddb/dd
#elif defined(Debugger)
#define console_debugger() Debugger()
#else
-#define console_debugger() do {} while (/* CONSTCOND */ 0) /* NOP */
+#define console_debugger() do {} while (0) /* NOP */
#endif
/* For SYSCALL_DEBUG */
@@ -738,12 +738,12 @@ bool kernconfig_is_held(void);
do { \
if ((count) != 0) \
_kernel_lock((count)); \
-} while (/* CONSTCOND */ 0)
+} while (0)
#define KERNEL_UNLOCK(all, lwp, p) _kernel_unlock((all), (p))
#define KERNEL_LOCKED_P() _kernel_locked_p()
#else
-#define KERNEL_LOCK(count, lwp) do {(void)(count); (void)(lwp);} while (/* CONSTCOND */ 0) /*NOP*/
-#define KERNEL_UNLOCK(all, lwp, ptr) do {(void)(all); (void)(lwp); (void)(ptr);} while (/* CONSTCOND */ 0) /*NOP*/
+#define KERNEL_LOCK(count, lwp) do {(void)(count); (void)(lwp);} while (0) /*NOP*/
+#define KERNEL_UNLOCK(all, lwp, ptr) do {(void)(all); (void)(lwp); (void)(ptr);} while (0) /*NOP*/
#define KERNEL_LOCKED_P() (true)
#endif
Index: src/sys/sys/time.h
diff -u src/sys/sys/time.h:1.80 src/sys/sys/time.h:1.81
--- src/sys/sys/time.h:1.80 Sun Jun 26 22:31:38 2022
+++ src/sys/sys/time.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.80 2022/06/26 22:31:38 riastradh Exp $ */
+/* $NetBSD: time.h,v 1.81 2024/05/12 10:34:56 rillig Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -52,11 +52,11 @@ struct timeval {
#define TIMEVAL_TO_TIMESPEC(tv, ts) do { \
(ts)->tv_sec = (tv)->tv_sec; \
(ts)->tv_nsec = (tv)->tv_usec * 1000; \
-} while (/*CONSTCOND*/0)
+} while (0)
#define TIMESPEC_TO_TIMEVAL(tv, ts) do { \
(tv)->tv_sec = (ts)->tv_sec; \
(tv)->tv_usec = (suseconds_t)(ts)->tv_nsec / 1000; \
-} while (/*CONSTCOND*/0)
+} while (0)
/*
* Note: timezone is obsolete. All timezone handling is now in
@@ -82,7 +82,7 @@ struct timezone {
(vvp)->tv_sec++; \
(vvp)->tv_usec -= 1000000; \
} \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#define timersub(tvp, uvp, vvp) \
do { \
(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
@@ -91,7 +91,7 @@ struct timezone {
(vvp)->tv_sec--; \
(vvp)->tv_usec += 1000000; \
} \
- } while (/* CONSTCOND */ 0)
+ } while (0)
/*
* hide bintime for _STANDALONE because this header is used for hpcboot.exe,
@@ -254,7 +254,7 @@ ns2bintime(uint64_t ns)
(vsp)->tv_sec++; \
(vsp)->tv_nsec -= 1000000000L; \
} \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#define timespecsub(tsp, usp, vsp) \
do { \
(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \
@@ -263,7 +263,7 @@ ns2bintime(uint64_t ns)
(vsp)->tv_sec--; \
(vsp)->tv_nsec += 1000000000L; \
} \
- } while (/* CONSTCOND */ 0)
+ } while (0)
#define timespec2ns(x) (((uint64_t)(x)->tv_sec) * 1000000000L + (x)->tv_nsec)
#ifdef _KERNEL
Index: src/sys/sys/tree.h
diff -u src/sys/sys/tree.h:1.20 src/sys/sys/tree.h:1.21
--- src/sys/sys/tree.h:1.20 Sat Sep 14 13:20:45 2013
+++ src/sys/sys/tree.h Sun May 12 10:34:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.h,v 1.20 2013/09/14 13:20:45 joerg Exp $ */
+/* $NetBSD: tree.h,v 1.21 2024/05/12 10:34:56 rillig Exp $ */
/* $OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $ */
/*
* Copyright 2002 Niels Provos <[email protected]>
@@ -65,7 +65,7 @@ struct name { \
#define SPLAY_INIT(root) do { \
(root)->sph_root = NULL; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define SPLAY_ENTRY(type) \
struct { \
@@ -83,32 +83,32 @@ struct { \
SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field); \
SPLAY_RIGHT(tmp, field) = (head)->sph_root; \
(head)->sph_root = tmp; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define SPLAY_ROTATE_LEFT(head, tmp, field) do { \
SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field); \
SPLAY_LEFT(tmp, field) = (head)->sph_root; \
(head)->sph_root = tmp; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define SPLAY_LINKLEFT(head, tmp, field) do { \
SPLAY_LEFT(tmp, field) = (head)->sph_root; \
tmp = (head)->sph_root; \
(head)->sph_root = SPLAY_LEFT((head)->sph_root, field); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define SPLAY_LINKRIGHT(head, tmp, field) do { \
SPLAY_RIGHT(tmp, field) = (head)->sph_root; \
tmp = (head)->sph_root; \
(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define SPLAY_ASSEMBLE(head, node, left, right, field) do { \
SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field); \
SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field); \
SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
/* Generates prototypes and inline functions */
@@ -299,7 +299,7 @@ struct name { \
#define RB_INIT(root) do { \
(root)->rbh_root = NULL; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define RB_BLACK 0
#define RB_RED 1
@@ -322,15 +322,15 @@ struct { \
RB_PARENT(elm, field) = parent; \
RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL; \
RB_COLOR(elm, field) = RB_RED; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define RB_SET_BLACKRED(black, red, field) do { \
RB_COLOR(black, field) = RB_BLACK; \
RB_COLOR(red, field) = RB_RED; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#ifndef RB_AUGMENT
-#define RB_AUGMENT(x) do {} while (/*CONSTCOND*/ 0)
+#define RB_AUGMENT(x) do {} while (0)
#endif
#define RB_ROTATE_LEFT(head, elm, tmp, field) do { \
@@ -351,7 +351,7 @@ struct { \
RB_AUGMENT(tmp); \
if ((RB_PARENT(tmp, field))) \
RB_AUGMENT(RB_PARENT(tmp, field)); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
#define RB_ROTATE_RIGHT(head, elm, tmp, field) do { \
(tmp) = RB_LEFT(elm, field); \
@@ -371,7 +371,7 @@ struct { \
RB_AUGMENT(tmp); \
if ((RB_PARENT(tmp, field))) \
RB_AUGMENT(RB_PARENT(tmp, field)); \
-} while (/*CONSTCOND*/ 0)
+} while (0)
/* Generates prototypes and inline functions */
#define RB_PROTOTYPE(name, type, field, cmp) \
