Module Name: src
Committed By: rillig
Date: Sat Nov 27 22:16:42 UTC 2021
Modified Files:
src/usr.bin/cdplay: cdplay.c
src/usr.bin/fdformat: fdformat.c
src/usr.bin/mail: sig.c
src/usr.bin/midiplay: midiplay.c
src/usr.bin/su: su_pam.c
src/usr.bin/vmstat: drvstats.c vmstat.c
Log Message:
usr.bin: remove unnecessary CONSTCOND, lint no longer needs it
Since 2021-01-31, lint no longer requires a CONSTCOND comment in a
do-while-0 statement since this is a common code pattern, especially in
statement-like macros.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/cdplay/cdplay.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/fdformat/fdformat.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/mail/sig.c
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/midiplay/midiplay.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/su/su_pam.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/vmstat/drvstats.c
cvs rdiff -u -r1.247 -r1.248 src/usr.bin/vmstat/vmstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/cdplay/cdplay.c
diff -u src/usr.bin/cdplay/cdplay.c:1.50 src/usr.bin/cdplay/cdplay.c:1.51
--- src/usr.bin/cdplay/cdplay.c:1.50 Sun Oct 18 21:58:32 2020
+++ src/usr.bin/cdplay/cdplay.c Sat Nov 27 22:16:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cdplay.c,v 1.50 2020/10/18 21:58:32 rillig Exp $ */
+/* $NetBSD: cdplay.c,v 1.51 2021/11/27 22:16:41 rillig Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: cdplay.c,v 1.50 2020/10/18 21:58:32 rillig Exp $");
+__RCSID("$NetBSD: cdplay.c,v 1.51 2021/11/27 22:16:41 rillig Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -130,7 +130,7 @@ static struct cmdtab {
fd = -1; \
} else \
warn("ioctl(" #ctl ")");\
- } while (/* CONSTCOND */ 0)
+ } while (0)
#define CDDA_SIZE 2352
Index: src/usr.bin/fdformat/fdformat.c
diff -u src/usr.bin/fdformat/fdformat.c:1.17 src/usr.bin/fdformat/fdformat.c:1.18
--- src/usr.bin/fdformat/fdformat.c:1.17 Mon Sep 5 00:40:28 2016
+++ src/usr.bin/fdformat/fdformat.c Sat Nov 27 22:16:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdformat.c,v 1.17 2016/09/05 00:40:28 sevan Exp $ */
+/* $NetBSD: fdformat.c,v 1.18 2021/11/27 22:16:41 rillig Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fdformat.c,v 1.17 2016/09/05 00:40:28 sevan Exp $");
+__RCSID("$NetBSD: fdformat.c,v 1.18 2021/11/27 22:16:41 rillig Exp $");
#endif
#include <sys/types.h>
@@ -135,7 +135,7 @@ usage(void)
# which, optarg); \
parms.which = tmplong; \
parmmask |= MASK_##maskn; \
- } while (/* CONSTCOND */0)
+ } while (0)
#define getparm(structname, maskname) \
do { \
@@ -144,7 +144,7 @@ usage(void)
" missing for type `%s'", optarg); \
parms.structname = tmplong; \
parmmask |= MASK_ ## maskname; \
- } while (/* CONSTCOND */0)
+ } while (0)
#define copyparm(which, mask) \
Index: src/usr.bin/mail/sig.c
diff -u src/usr.bin/mail/sig.c:1.3 src/usr.bin/mail/sig.c:1.4
--- src/usr.bin/mail/sig.c:1.3 Tue Jun 12 19:03:26 2012
+++ src/usr.bin/mail/sig.c Sat Nov 27 22:16:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sig.c,v 1.3 2012/06/12 19:03:26 christos Exp $ */
+/* $NetBSD: sig.c,v 1.4 2021/11/27 22:16:41 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: sig.c,v 1.3 2012/06/12 19:03:26 christos Exp $");
+__RCSID("$NetBSD: sig.c,v 1.4 2021/11/27 22:16:41 rillig Exp $");
#endif /* not lint */
#include <assert.h>
@@ -63,7 +63,7 @@ static struct {
#define SIGQUEUE_INIT(p) do {\
(p)->qe_first = NULL;\
(p)->qe_last = &((p)->qe_first);\
- } while (/*CONSTCOND*/ 0)
+ } while (0)
/*
* The routines alloc_entry() and free_entry() manage the queue
Index: src/usr.bin/midiplay/midiplay.c
diff -u src/usr.bin/midiplay/midiplay.c:1.33 src/usr.bin/midiplay/midiplay.c:1.34
--- src/usr.bin/midiplay/midiplay.c:1.33 Fri Feb 1 08:37:21 2019
+++ src/usr.bin/midiplay/midiplay.c Sat Nov 27 22:16:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: midiplay.c,v 1.33 2019/02/01 08:37:21 mrg Exp $ */
+/* $NetBSD: midiplay.c,v 1.34 2021/11/27 22:16:41 rillig Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: midiplay.c,v 1.33 2019/02/01 08:37:21 mrg Exp $");
+__RCSID("$NetBSD: midiplay.c,v 1.34 2021/11/27 22:16:41 rillig Exp $");
#endif
@@ -842,7 +842,7 @@ main(int argc, char **argv)
struct track *_t = t[i].indirect; \
t[i].indirect = t[j].indirect; \
t[j].indirect = _t; \
-} while (/*CONSTCOND*/ 0)
+} while (0)
static void
Heapify(struct track *t, int ntrks, int node)
Index: src/usr.bin/su/su_pam.c
diff -u src/usr.bin/su/su_pam.c:1.22 src/usr.bin/su/su_pam.c:1.23
--- src/usr.bin/su/su_pam.c:1.22 Fri Sep 10 21:52:18 2021
+++ src/usr.bin/su/su_pam.c Sat Nov 27 22:16:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: su_pam.c,v 1.22 2021/09/10 21:52:18 rillig Exp $ */
+/* $NetBSD: su_pam.c,v 1.23 2021/11/27 22:16:42 rillig Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988\
#if 0
static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94";*/
#else
-__RCSID("$NetBSD: su_pam.c,v 1.22 2021/09/10 21:52:18 rillig Exp $");
+__RCSID("$NetBSD: su_pam.c,v 1.23 2021/11/27 22:16:42 rillig Exp $");
#endif
#endif /* not lint */
@@ -293,12 +293,12 @@ main(int argc, char **argv)
#define ERRX_PAM_END(args) do { \
(void)pam_end(pamh, pam_err); \
errx args; \
-} while (/* CONSTCOND */0)
+} while (0)
#define ERR_PAM_END(args) do { \
(void)pam_end(pamh, pam_err); \
err args; \
-} while (/* CONSTCOND */0)
+} while (0)
/* force the usage of specified class */
if (class) {
Index: src/usr.bin/vmstat/drvstats.c
diff -u src/usr.bin/vmstat/drvstats.c:1.13 src/usr.bin/vmstat/drvstats.c:1.14
--- src/usr.bin/vmstat/drvstats.c:1.13 Sun Jun 30 19:57:24 2019
+++ src/usr.bin/vmstat/drvstats.c Sat Nov 27 22:16:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drvstats.c,v 1.13 2019/06/30 19:57:24 he Exp $ */
+/* $NetBSD: drvstats.c,v 1.14 2021/11/27 22:16:42 rillig Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
@@ -64,7 +64,7 @@ char **dr_name;
#define timerset(tvp, uvp) do { \
((uvp)->tv_sec = (tvp)->tv_sec); \
((uvp)->tv_usec = (tvp)->tv_usec); \
-} while (/* CONSTCOND */0)
+} while (0)
/*
* Take the delta between the present values and the last recorded
@@ -81,7 +81,7 @@ drvswap(void)
tmp = cur.fld; \
cur.fld -= last.fld; \
last.fld = tmp; \
-} while (/* CONSTCOND */0)
+} while (0)
#define DELTA(x) do { \
timerclear(&tmp_timer); \
@@ -89,7 +89,7 @@ drvswap(void)
timersub(&tmp_timer, &(last.x), &(cur.x)); \
timerclear(&(last.x)); \
timerset(&tmp_timer, &(last.x)); \
-} while (/* CONSTCOND */0)
+} while (0)
for (i = 0; i < ndrive; i++) {
struct timeval tmp_timer;
@@ -194,7 +194,7 @@ drvreadstats(void)
#define COPYT(x,k,l) do { \
cur.x[k].tv_sec = drives[l].x##_sec; \
cur.x[k].tv_usec = drives[l].x##_usec; \
-} while (/* CONSTCOND */0)
+} while (0)
for (i = 0, j = 0; i < ndrive && j < count; i++) {
Index: src/usr.bin/vmstat/vmstat.c
diff -u src/usr.bin/vmstat/vmstat.c:1.247 src/usr.bin/vmstat/vmstat.c:1.248
--- src/usr.bin/vmstat/vmstat.c:1.247 Sun Aug 22 22:24:12 2021
+++ src/usr.bin/vmstat/vmstat.c Sat Nov 27 22:16:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.247 2021/08/22 22:24:12 rillig Exp $ */
+/* $NetBSD: vmstat.c,v 1.248 2021/11/27 22:16:42 rillig Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001, 2007, 2019, 2020
@@ -71,7 +71,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95";
#else
-__RCSID("$NetBSD: vmstat.c,v 1.247 2021/08/22 22:24:12 rillig Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.248 2021/11/27 22:16:42 rillig Exp $");
#endif
#endif /* not lint */
@@ -285,7 +285,7 @@ kvm_t *kd;
(val)) - (width); \
if ((ovflw) < 0) \
(ovflw) = 0; \
-} while (/* CONSTCOND */0)
+} while (0)
void cpustats(int *);
void cpucounters(struct cpu_counter *);
@@ -1372,7 +1372,7 @@ doevcnt(int verbose, int type)
(int)total_max, counttotal,
(int)rate_max, counttotal / uptime);
return;
- } while (/*CONSTCOND*/ 0);
+ } while (0);
if (type == EVCNT_TYPE_ANY)
(void)printf("%-34s %16s %8s %s\n", "event", "total", "rate",
