remove some lint

This commit is contained in:
lukem 2001-04-30 01:13:20 +00:00
parent 0979d803f6
commit 36079c81c4
15 changed files with 74 additions and 65 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: boot_flag.h,v 1.1 2000/09/24 12:32:31 jdolecek Exp $ */
/* $NetBSD: boot_flag.h,v 1.2 2001/04/30 01:13:20 lukem Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -72,6 +72,6 @@
break; \
} /* switch */ \
\
} while (0)
} while (/* CONSTCOND */ 0)
#endif /* _SYS_BOOT_FLAG_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: buf.h,v 1.45 2000/11/27 18:26:40 chs Exp $ */
/* $NetBSD: buf.h,v 1.46 2001/04/30 01:13:20 lukem Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -258,7 +258,7 @@ struct cluster_save {
do { \
memset((bp)->b_data, 0, (u_int)(bp)->b_bcount); \
(bp)->b_resid = 0; \
} while (0)
} while (/* CONSTCOND */ 0)
/* Flags to low-level allocation routines. */
#define B_CLRBUF 0x01 /* Request allocated buffer be cleared. */

View File

@ -1,4 +1,4 @@
/* $NetBSD: exec.h,v 1.78 2001/02/14 18:21:42 eeh Exp $ */
/* $NetBSD: exec.h,v 1.79 2001/04/30 01:13:20 lukem Exp $ */
/*-
* Copyright (c) 1994 Christopher G. Demetriou
@ -238,7 +238,7 @@ void new_vmcmd __P((struct exec_vmcmd_set *evsp,
vcp->ev_offset = (offset); \
vcp->ev_prot = (prot); \
vcp->ev_flags = (flags); \
} while (0)
} while (/* CONSTCOND */ 0)
#endif /* EXEC_DEBUG */
#endif /* _KERNEL */

View File

@ -1,4 +1,4 @@
/* $NetBSD: file.h,v 1.25 2001/04/09 10:22:02 jdolecek Exp $ */
/* $NetBSD: file.h,v 1.26 2001/04/30 01:13:20 lukem Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -93,7 +93,7 @@ struct file {
do { \
if ((fp)->f_usecount < 0) \
panic(str); \
} while (0)
} while (/* CONSTCOND */ 0)
#else
#define FILE_USE_CHECK(fp, str) /* nothing */
#endif
@ -102,7 +102,7 @@ do { \
do { \
(fp)->f_usecount++; \
FILE_USE_CHECK((fp), "f_usecount overflow"); \
} while (0)
} while (/* CONSTCOND */ 0)
#define FILE_UNUSE(fp, p) \
do { \
@ -113,7 +113,7 @@ do { \
(fp)->f_usecount--; \
FILE_USE_CHECK((fp), "f_usecount underflow"); \
} \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* Flags for fo_read and fo_write.

View File

@ -1,4 +1,4 @@
/* $NetBSD: lock.h,v 1.41 2000/11/24 03:59:09 chs Exp $ */
/* $NetBSD: lock.h,v 1.42 2001/04/30 01:13:20 lukem Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -344,9 +344,14 @@ void simple_lock_switchcheck(void);
#define LOCK_ASSERT(x) /* nothing */
#else
#define simple_lock_init(alp) (alp)->lock_data = __SIMPLELOCK_UNLOCKED
#define simple_lock(alp) (void)(alp)
#define simple_lock_try(alp) (1)
#ifndef lint
#define simple_lock(alp) (void)(alp)
#define simple_unlock(alp) (void)(alp)
#else /* lint */
#define simple_lock(alp) /* nothing */
#define simple_unlock(alp) /* nothing */
#endif /* lint */
#define LOCK_ASSERT(x) /* nothing */
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: malloc.h,v 1.59 2001/02/26 16:35:41 lukem Exp $ */
/* $NetBSD: malloc.h,v 1.60 2001/04/30 01:13:21 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@ -397,7 +397,7 @@ do { \
kbp->kb_next = *(caddr_t *)(space); \
} \
splx(s); \
} while (0)
} while (/* CONSTCOND */ 0)
#define FREE(addr, type) \
do { \

View File

@ -1,4 +1,4 @@
/* $NetBSD: mbuf.h,v 1.56 2001/01/14 02:07:22 thorpej Exp $ */
/* $NetBSD: mbuf.h,v 1.57 2001/04/30 01:13:21 lukem Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@ -209,7 +209,7 @@ struct mbuf {
do { int ms = splvm(); \
{ code } \
splx(ms); \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* mbuf allocation/deallocation macros:
@ -235,7 +235,7 @@ struct mbuf {
(m)->m_flags = 0; \
} else \
(m) = m_retry((how), (type)); \
} while (0)
} while (/* CONSTCOND */ 0)
#define MGETHDR(m, how, type) do { \
MBUFLOCK((m) = pool_get(&mbpool, (how) == M_WAIT ? PR_WAITOK|PR_LIMITFAIL : 0);); \
@ -249,7 +249,7 @@ struct mbuf {
(m)->m_pkthdr.aux = (struct mbuf *)NULL; \
} else \
(m) = m_retryhdr((how), (type)); \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* Macros for tracking external storage associated with an mbuf.
@ -260,11 +260,11 @@ struct mbuf {
#define MCLREFDEBUGN(m, file, line) do { \
(m)->m_ext.ext_nfile = (file); \
(m)->m_ext.ext_nline = (line); \
} while (0)
} while (/* CONSTCOND */ 0)
#define MCLREFDEBUGO(m, file, line) do { \
(m)->m_ext.ext_ofile = (file); \
(m)->m_ext.ext_oline = (line); \
} while (0)
} while (/* CONSTCOND */ 0)
#else
#define MCLREFDEBUGN(m, file, line)
#define MCLREFDEBUGO(m, file, line)
@ -277,7 +277,7 @@ struct mbuf {
(m)->m_ext.ext_prevref; \
(m)->m_ext.ext_prevref->m_ext.ext_nextref = \
(m)->m_ext.ext_nextref; \
} while (0)
} while (/* CONSTCOND */ 0)
#define _MCLADDREFERENCE(o, n) do { \
(n)->m_flags |= ((o)->m_flags & (M_EXT|M_CLUSTER)); \
(n)->m_ext.ext_nextref = (o)->m_ext.ext_nextref; \
@ -285,13 +285,13 @@ struct mbuf {
(o)->m_ext.ext_nextref = (n); \
(n)->m_ext.ext_nextref->m_ext.ext_prevref = (n); \
MCLREFDEBUGN((n), __FILE__, __LINE__); \
} while (0)
} while (/* CONSTCOND */ 0)
#define MCLINITREFERENCE(m) do { \
(m)->m_ext.ext_prevref = (m); \
(m)->m_ext.ext_nextref = (m); \
MCLREFDEBUGO((m), __FILE__, __LINE__); \
MCLREFDEBUGN((m), NULL, 0); \
} while (0)
} while (/* CONSTCOND */ 0)
#define MCLADDREFERENCE(o, n) MBUFLOCK(_MCLADDREFERENCE((o), (n));)
@ -327,7 +327,7 @@ struct mbuf {
(m)->m_ext.ext_arg = NULL; \
MCLINITREFERENCE(m); \
} \
} while (0)
} while (/* CONSTCOND */ 0)
#define MEXTMALLOC(m, size, how) do { \
(m)->m_ext.ext_buf = \
@ -342,7 +342,7 @@ struct mbuf {
(m)->m_ext.ext_type = mbtypes[(m)->m_type]; \
MCLINITREFERENCE(m); \
} \
} while (0)
} while (/* CONSTCOND */ 0)
#define MEXTADD(m, buf, size, type, free, arg) do { \
(m)->m_data = (m)->m_ext.ext_buf = (caddr_t)(buf); \
@ -353,7 +353,7 @@ struct mbuf {
(m)->m_ext.ext_arg = (arg); \
(m)->m_ext.ext_type = (type); \
MCLINITREFERENCE(m); \
} while (0)
} while (/* CONSTCOND */ 0)
#define _MEXTREMOVE(m) do { \
if (MCLISREFERENCED(m)) { \
@ -368,7 +368,7 @@ struct mbuf {
} \
(m)->m_flags &= ~(M_CLUSTER|M_EXT); \
(m)->m_ext.ext_size = 0; /* why ??? */ \
} while (0)
} while (/* CONSTCOND */ 0)
#define MEXTREMOVE(m) \
MBUFLOCK(_MEXTREMOVE((m));)
@ -384,7 +384,7 @@ do { \
(m)->m_data = (m)->m_pktdat; \
else \
(m)->m_data = (m)->m_dat; \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* MFREE(struct mbuf *m, struct mbuf *n)
@ -419,20 +419,24 @@ do { \
(from)->m_pkthdr.aux = (struct mbuf *)NULL; \
(to)->m_flags = (from)->m_flags & M_COPYFLAGS; \
(to)->m_data = (to)->m_pktdat; \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* Set the m_data pointer of a newly-allocated mbuf (m_get/MGET) to place
* an object of the specified size at the end of the mbuf, longword aligned.
*/
#define M_ALIGN(m, len) \
do { (m)->m_data += (MLEN - (len)) &~ (sizeof(long) - 1); } while (0)
do { \
(m)->m_data += (MLEN - (len)) &~ (sizeof(long) - 1); \
} while (/* CONSTCOND */ 0)
/*
* As above, for mbufs allocated with m_gethdr/MGETHDR
* or initialized by M_COPY_PKTHDR.
*/
#define MH_ALIGN(m, len) \
do { (m)->m_data += (MHLEN - (len)) &~ (sizeof(long) - 1); } while (0)
do { \
(m)->m_data += (MHLEN - (len)) &~ (sizeof(long) - 1); \
} while (/* CONSTCOND */ 0)
/*
* Compute the amount of space available
@ -466,13 +470,13 @@ do { \
(m) = m_prepend((m), (plen), (how)); \
if ((m) && (m)->m_flags & M_PKTHDR) \
(m)->m_pkthdr.len += (plen); \
} while (0)
} while (/* CONSTCOND */ 0)
/* change mbuf to new type */
#define MCHTYPE(m, t) do { \
MBUFLOCK(mbstat.m_mtypes[(m)->m_type]--; mbstat.m_mtypes[t]++;); \
(m)->m_type = t; \
} while (0)
} while (/* CONSTCOND */ 0)
/* length to m_copy to copy all */
#define M_COPYALL 1000000000

View File

@ -1,4 +1,4 @@
/* $NetBSD: proc.h,v 1.125 2001/04/23 19:21:05 simonb Exp $ */
/* $NetBSD: proc.h,v 1.126 2001/04/30 01:13:21 lukem Exp $ */
/*-
* Copyright (c) 1986, 1989, 1991, 1993
@ -334,13 +334,13 @@ struct proclist_desc {
do { \
if (--(s)->s_count == 0) \
FREE(s, M_SESSION); \
} while (0)
} while (/* CONSTCOND */ 0)
#define PHOLD(p) \
do { \
if ((p)->p_holdcnt++ == 0 && ((p)->p_flag & P_INMEM) == 0) \
uvm_swapin(p); \
} while (0)
} while (/* CONSTCOND */ 0)
#define PRELE(p) (--(p)->p_holdcnt)
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: resourcevar.h,v 1.15 2000/12/10 19:29:31 mycroft Exp $ */
/* $NetBSD: resourcevar.h,v 1.16 2001/04/30 01:13:21 lukem Exp $ */
/*
* Copyright (c) 1991, 1993
@ -86,7 +86,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 (0)
} while (/* CONSTCOND */ 0)
#ifdef _KERNEL
extern char defcorename[];

View File

@ -1,4 +1,4 @@
/* $NetBSD: sched.h,v 1.10 2000/08/26 04:17:44 sommerfeld Exp $ */
/* $NetBSD: sched.h,v 1.11 2001/04/30 01:13:21 lukem Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -194,7 +194,7 @@ void roundrobin(struct cpu_info *);
#define scheduler_fork_hook(parent, child) \
do { \
(child)->p_estcpu = (parent)->p_estcpu; \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* scheduler_wait_hook:
@ -206,7 +206,7 @@ do { \
/* XXX Only if parent != init?? */ \
(parent)->p_estcpu = ESTCPULIM((parent)->p_estcpu + \
(child)->p_estcpu); \
} while (0)
} while (/* CONSTCOND */ 0)
#if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
#include <sys/lock.h>
@ -220,13 +220,13 @@ extern struct simplelock sched_lock;
do { \
s = splsched(); \
simple_lock(&sched_lock); \
} while (0)
} while (/* CONSTCOND */ 0)
#define SCHED_UNLOCK(s) \
do { \
simple_unlock(&sched_lock); \
splx(s); \
} while (0)
} while (/* CONSTCOND */ 0)
void sched_lock_idle(void);
void sched_unlock_idle(void);

View File

@ -1,4 +1,4 @@
/* $NetBSD: signal.h,v 1.42 1998/12/21 10:35:00 drochner Exp $ */
/* $NetBSD: signal.h,v 1.43 2001/04/30 01:13:21 lukem Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@ -172,14 +172,14 @@ typedef struct {
(t)->__bits[1] |= (s)->__bits[1]; \
(t)->__bits[2] |= (s)->__bits[2]; \
(t)->__bits[3] |= (s)->__bits[3]; \
} while (0)
} while (/* CONSTCOND */ 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 (0)
} while (/* CONSTCOND */ 0)
#endif /* _KERNEL */
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: signalvar.h,v 1.28 2001/01/14 22:32:01 thorpej Exp $ */
/* $NetBSD: signalvar.h,v 1.29 2001/04/30 01:13:21 lukem Exp $ */
/*
* Copyright (c) 1991, 1993
@ -93,7 +93,7 @@ struct sigctx {
do { \
(p)->p_sigctx.ps_sigcheck = 1; \
signotify(p); \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* Determine signal that should be delivered to process p, the current

View File

@ -1,4 +1,4 @@
/* $NetBSD: socketvar.h,v 1.44 2001/04/09 13:23:07 enami Exp $ */
/* $NetBSD: socketvar.h,v 1.45 2001/04/30 01:13:21 lukem Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@ -190,7 +190,7 @@ do { \
(sb)->sb_mbcnt += MSIZE; \
if ((m)->m_flags & M_EXT) \
(sb)->sb_mbcnt += (m)->m_ext.ext_size; \
} while (0)
} while (/* CONSTCOND */ 0)
/* adjust counters in sb reflecting freeing of m */
#define sbfree(sb, m) \
@ -199,7 +199,7 @@ do { \
(sb)->sb_mbcnt -= MSIZE; \
if ((m)->m_flags & M_EXT) \
(sb)->sb_mbcnt -= (m)->m_ext.ext_size; \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* Set lock on sockbuf sb; sleep if lock is already held.
@ -219,19 +219,19 @@ do { \
(sb)->sb_flags &= ~SB_WANT; \
wakeup((caddr_t)&(sb)->sb_flags); \
} \
} while (0)
} while (/* CONSTCOND */ 0)
#define sorwakeup(so) \
do { \
if (sb_notify(&(so)->so_rcv)) \
sowakeup((so), &(so)->so_rcv); \
} while (0)
} while (/* CONSTCOND */ 0)
#define sowwakeup(so) \
do { \
if (sb_notify(&(so)->so_snd)) \
sowakeup((so), &(so)->so_snd); \
} while (0)
} while (/* CONSTCOND */ 0)
#ifdef _KERNEL
extern u_long sb_max;

View File

@ -1,4 +1,4 @@
/* $NetBSD: systm.h,v 1.125 2001/01/27 07:21:43 thorpej Exp $ */
/* $NetBSD: systm.h,v 1.126 2001/04/30 01:13:21 lukem Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@ -371,7 +371,7 @@ int cn_get_magic __P((char *magic, int len));
(s).cnm_state = 0; \
} \
} \
} while (0)
} while (/* CONSTCOND */ 0)
#endif
/* Encode out-of-band events this way when passing to cn_check_magic() */
@ -390,7 +390,7 @@ void cpu_Debugger __P((void));
extern int db_fromconsole; /* XXX ddb/ddbvar.h */
#define console_debugger() if (db_fromconsole) Debugger()
#else
#define console_debugger() do {} while (0) /* NOP */
#define console_debugger() do {} while (/* CONSTCOND */ 0) /* NOP */
#endif
#endif /* _KERNEL */
@ -414,7 +414,7 @@ extern struct lock kernel_lock;
do { \
SCHED_ASSERT_UNLOCKED(); \
spinlockmgr(&kernel_lock, (flag), 0); \
} while (0)
} while (/* CONSTCOND */ 0)
#define KERNEL_UNLOCK() spinlockmgr(&kernel_lock, LK_RELEASE, 0)
@ -426,13 +426,13 @@ do { \
do { \
KERNEL_LOCK(LK_EXCLUSIVE); \
(p)->p_flag |= P_BIGLOCK; \
} while (0)
} while (/* CONSTCOND */ 0)
#define KERNEL_PROC_UNLOCK(p) \
do { \
p->p_flag &= ~P_BIGLOCK; \
KERNEL_UNLOCK(); \
} while (0)
} while (/* CONSTCOND */ 0)
#else /* ! MULTIPROCESSOR */

View File

@ -1,4 +1,4 @@
/* $NetBSD: time.h,v 1.30 2000/07/09 06:44:57 itojun Exp $ */
/* $NetBSD: time.h,v 1.31 2001/04/30 01:13:21 lukem Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@ -90,7 +90,7 @@ struct timezone {
(vvp)->tv_sec++; \
(vvp)->tv_usec -= 1000000; \
} \
} while (0)
} while (/* CONSTCOND */ 0)
#define timersub(tvp, uvp, vvp) \
do { \
(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
@ -99,7 +99,7 @@ struct timezone {
(vvp)->tv_sec--; \
(vvp)->tv_usec += 1000000; \
} \
} while (0)
} while (/* CONSTCOND */ 0)
/* Operations on timespecs. */
#define timespecclear(tsp) (tsp)->tv_sec = (tsp)->tv_nsec = 0
@ -116,7 +116,7 @@ struct timezone {
(vsp)->tv_sec++; \
(vsp)->tv_nsec -= 1000000000L; \
} \
} while (0)
} while (/* CONSTCOND */ 0)
#define timespecsub(tsp, usp, vsp) \
do { \
(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \
@ -125,7 +125,7 @@ struct timezone {
(vsp)->tv_sec--; \
(vsp)->tv_nsec += 1000000000L; \
} \
} while (0)
} while (/* CONSTCOND */ 0)
/*
* Names of the interval timers, and structure