Module Name: src
Committed By: mrg
Date: Sun Feb 3 03:19:32 UTC 2019
Modified Files:
src/games/backgammon/teachgammon: teach.c
src/games/battlestar: command2.c command3.c
src/games/larn: main.c monster.c movem.c object.c
src/games/mille: move.c
src/games/phantasia: fight.c main.c misc.c
src/games/quiz: quiz.c
src/games/rogue: play.c room.c
src/games/sail: pl_5.c
src/libexec/telnetd: state.c
src/sbin/fsck_ext2fs: main.c
src/sbin/fsck_ffs: quota2.c
src/sbin/fsck_lfs: main.c
src/sbin/restore: interactive.c
src/sys/arch/amd64/amd64: db_disasm.c trap.c
src/sys/arch/i386/i386: process_machdep.c trap.c
src/sys/compat/linux/common: linux_hdio.c
src/sys/compat/ossaudio: ossaudio.c
src/sys/ddb: db_examine.c db_write_cmd.c
src/sys/dev/acpi: acpi_cpu_cstate.c
src/sys/dev/bluetooth: btsco.c
src/sys/dev/ic: adwlib.c elink3.c isp_netbsd.c ncr53c9x.c pdq_ifsubr.c
rtw.c
src/sys/dev/isa: fd.c gus.c if_ate.c sbdsp.c
src/sys/dev/pci: if_bce.c if_bge.c if_dge.c if_ipw.c if_iwi.c if_msk.c
if_sk.c mpii.c pdcsata.c
src/sys/dev/pci/bktr: bktr_core.c
src/sys/dev/pcmcia: if_ray.c pcmcia_cis.c
src/sys/dev/scsipi: atapi_base.c st.c
src/sys/dev/usb: umass.c usb.c
src/sys/dev/wscons: wsdisplay.c
src/sys/kern: kern_rndpool.c kern_synch.c sys_descrip.c
sys_ptrace_common.c
src/sys/net: if_fddisubr.c if_strip.c
src/sys/netbt: hci_ioctl.c
src/sys/nfs: nfs_serv.c nfs_syscalls.c
src/tests/include: t_paths.c
src/tests/lib/libc/sys: t_ptrace_wait.c t_sendrecv.c
src/usr.bin/colcrt: colcrt.c
src/usr.bin/ctags: ctags.c fortran.c
src/usr.bin/deroff: deroff.c
src/usr.bin/fstat: fstat.c
src/usr.bin/ftp: domacro.c
src/usr.bin/indent: indent.c io.c lexi.c parse.c
src/usr.bin/jot: jot.c
src/usr.bin/make: var.c
src/usr.bin/rdist: gram.y server.c
src/usr.bin/rs: rs.c
src/usr.bin/sockstat: sockstat.c
src/usr.bin/ul: ul.c
src/usr.bin/vgrind: vfontedpr.c
src/usr.sbin/acpitools/aml: aml_store.c
src/usr.sbin/bootp/common: readfile.c
src/usr.sbin/btdevctl: db.c
src/usr.sbin/lpr/filters: lpf.c
src/usr.sbin/lpr/lpd: printjob.c
src/usr.sbin/lpr/lprm: lprm.c
src/usr.sbin/makefs: udf.c
src/usr.sbin/map-mbone: mapper.c
src/usr.sbin/mrouted: main.c
src/usr.sbin/mtrace: mtrace.c
src/usr.sbin/npf/npfctl: npfctl.c
src/usr.sbin/rtadvd: advcap.c
src/usr.sbin/sup/source: supfilesrv.c
src/usr.sbin/syslogd: syslogd.c
src/usr.sbin/wsmuxctl: wsmuxctl.c
Log Message:
- add or adjust /* FALLTHROUGH */ where appropriate
- add __unreachable() after functions that can return but won't in
this case, and thus can't be marked __dead easily
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/backgammon/teachgammon/teach.c
cvs rdiff -u -r1.3 -r1.4 src/games/battlestar/command2.c
cvs rdiff -u -r1.4 -r1.5 src/games/battlestar/command3.c
cvs rdiff -u -r1.25 -r1.26 src/games/larn/main.c
cvs rdiff -u -r1.18 -r1.19 src/games/larn/monster.c
cvs rdiff -u -r1.9 -r1.10 src/games/larn/movem.c
cvs rdiff -u -r1.16 -r1.17 src/games/larn/object.c
cvs rdiff -u -r1.18 -r1.19 src/games/mille/move.c
cvs rdiff -u -r1.13 -r1.14 src/games/phantasia/fight.c
cvs rdiff -u -r1.23 -r1.24 src/games/phantasia/main.c
cvs rdiff -u -r1.21 -r1.22 src/games/phantasia/misc.c
cvs rdiff -u -r1.27 -r1.28 src/games/quiz/quiz.c
cvs rdiff -u -r1.9 -r1.10 src/games/rogue/play.c
cvs rdiff -u -r1.13 -r1.14 src/games/rogue/room.c
cvs rdiff -u -r1.25 -r1.26 src/games/sail/pl_5.c
cvs rdiff -u -r1.30 -r1.31 src/libexec/telnetd/state.c
cvs rdiff -u -r1.38 -r1.39 src/sbin/fsck_ext2fs/main.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/fsck_ffs/quota2.c
cvs rdiff -u -r1.52 -r1.53 src/sbin/fsck_lfs/main.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/restore/interactive.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/amd64/amd64/db_disasm.c
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/i386/i386/process_machdep.c
cvs rdiff -u -r1.296 -r1.297 src/sys/arch/i386/i386/trap.c
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/linux/common/linux_hdio.c
cvs rdiff -u -r1.73 -r1.74 src/sys/compat/ossaudio/ossaudio.c
cvs rdiff -u -r1.36 -r1.37 src/sys/ddb/db_examine.c
cvs rdiff -u -r1.27 -r1.28 src/sys/ddb/db_write_cmd.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/acpi/acpi_cpu_cstate.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/bluetooth/btsco.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/adwlib.c
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/ic/elink3.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/ic/isp_netbsd.c
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/ic/ncr53c9x.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/ic/pdq_ifsubr.c
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/ic/rtw.c
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/isa/fd.c
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/isa/gus.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/isa/if_ate.c
cvs rdiff -u -r1.138 -r1.139 src/sys/dev/isa/sbdsp.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/if_bce.c src/sys/dev/pci/if_dge.c
cvs rdiff -u -r1.322 -r1.323 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/if_ipw.c
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/pci/if_iwi.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/pci/if_sk.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/mpii.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/pdcsata.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/bktr/bktr_core.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/pcmcia/if_ray.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pcmcia/pcmcia_cis.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/scsipi/atapi_base.c
cvs rdiff -u -r1.234 -r1.235 src/sys/dev/scsipi/st.c
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.176 -r1.177 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.152 -r1.153 src/sys/dev/wscons/wsdisplay.c
cvs rdiff -u -r1.17 -r1.18 src/sys/kern/kern_rndpool.c
cvs rdiff -u -r1.322 -r1.323 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.31 -r1.32 src/sys/kern/sys_descrip.c
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/sys_ptrace_common.c
cvs rdiff -u -r1.109 -r1.110 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.112 -r1.113 src/sys/net/if_strip.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netbt/hci_ioctl.c
cvs rdiff -u -r1.175 -r1.176 src/sys/nfs/nfs_serv.c
cvs rdiff -u -r1.160 -r1.161 src/sys/nfs/nfs_syscalls.c
cvs rdiff -u -r1.16 -r1.17 src/tests/include/t_paths.c
cvs rdiff -u -r1.69 -r1.70 src/tests/lib/libc/sys/t_ptrace_wait.c
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/sys/t_sendrecv.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/colcrt/colcrt.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/ctags/ctags.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/ctags/fortran.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/deroff/deroff.c
cvs rdiff -u -r1.111 -r1.112 src/usr.bin/fstat/fstat.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/ftp/domacro.c
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/indent/io.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/indent/lexi.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/indent/parse.c
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/jot/jot.c
cvs rdiff -u -r1.221 -r1.222 src/usr.bin/make/var.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/rdist/gram.y
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/rdist/server.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/rs/rs.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/sockstat/sockstat.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/ul/ul.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/vgrind/vfontedpr.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/acpitools/aml/aml_store.c
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/bootp/common/readfile.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/btdevctl/db.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/lpr/filters/lpf.c
cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/lpr/lpd/printjob.c
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/lpr/lprm/lprm.c
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/makefs/udf.c
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/map-mbone/mapper.c
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/mrouted/main.c
cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/mtrace/mtrace.c
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/npf/npfctl/npfctl.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/rtadvd/advcap.c
cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/sup/source/supfilesrv.c
cvs rdiff -u -r1.130 -r1.131 src/usr.sbin/syslogd/syslogd.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/wsmuxctl/wsmuxctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/teachgammon/teach.c
diff -u src/games/backgammon/teachgammon/teach.c:1.24 src/games/backgammon/teachgammon/teach.c:1.25
--- src/games/backgammon/teachgammon/teach.c:1.24 Fri Sep 13 20:46:50 2013
+++ src/games/backgammon/teachgammon/teach.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: teach.c,v 1.24 2013/09/13 20:46:50 joerg Exp $ */
+/* $NetBSD: teach.c,v 1.25 2019/02/03 03:19:25 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)teach.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: teach.c,v 1.24 2013/09/13 20:46:50 joerg Exp $");
+__RCSID("$NetBSD: teach.c,v 1.25 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -98,34 +98,42 @@ main(int argc __unused, char *argv[])
if ((i = wrtext(intro2)) != 0)
break;
+ /* FALLTHROUGH */
case 3:
if ((i = wrtext(moves)) != 0)
break;
+ /* FALLTHROUGH */
case 4:
if ((i = wrtext(removepiece)) != 0)
break;
+ /* FALLTHROUGH */
case 5:
if ((i = wrtext(hits)) != 0)
break;
+ /* FALLTHROUGH */
case 6:
if ((i = wrtext(endgame)) != 0)
break;
+ /* FALLTHROUGH */
case 7:
if ((i = wrtext(doubl)) != 0)
break;
+ /* FALLTHROUGH */
case 8:
if ((i = wrtext(stragy)) != 0)
break;
+ /* FALLTHROUGH */
case 9:
if ((i = wrtext(prog)) != 0)
break;
+ /* FALLTHROUGH */
case 10:
if ((i = wrtext(lastch)) != 0)
break;
Index: src/games/battlestar/command2.c
diff -u src/games/battlestar/command2.c:1.3 src/games/battlestar/command2.c:1.4
--- src/games/battlestar/command2.c:1.3 Fri Jul 1 06:04:54 2005
+++ src/games/battlestar/command2.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: command2.c,v 1.3 2005/07/01 06:04:54 jmc Exp $ */
+/* $NetBSD: command2.c,v 1.4 2019/02/03 03:19:25 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)com2.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: command2.c,v 1.3 2005/07/01 06:04:54 jmc Exp $");
+__RCSID("$NetBSD: command2.c,v 1.4 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -271,6 +271,7 @@ murder(void)
puts("Your fantasy is over.");
die();
}
+ /* FALLTHROUGH */
case -1:
puts("Kill what?");
break;
Index: src/games/battlestar/command3.c
diff -u src/games/battlestar/command3.c:1.4 src/games/battlestar/command3.c:1.5
--- src/games/battlestar/command3.c:1.4 Sun Feb 4 08:48:05 2018
+++ src/games/battlestar/command3.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: command3.c,v 1.4 2018/02/04 08:48:05 mrg Exp $ */
+/* $NetBSD: command3.c,v 1.5 2019/02/03 03:19:25 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)com3.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: command3.c,v 1.4 2018/02/04 08:48:05 mrg Exp $");
+__RCSID("$NetBSD: command3.c,v 1.5 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -145,9 +145,11 @@ bury(void)
case NORMGOD:
printf("She screams as you wrestle her into ");
puts("the hole.");
+ /* FALLTHROUGH */
case TIMER:
power += 7;
ego -= 10;
+ /* FALLTHROUGH */
case AMULET:
case MEDALION:
case TALISMAN:
Index: src/games/larn/main.c
diff -u src/games/larn/main.c:1.25 src/games/larn/main.c:1.26
--- src/games/larn/main.c:1.25 Tue Jun 19 05:30:43 2012
+++ src/games/larn/main.c Sun Feb 3 03:19:25 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: main.c,v 1.25 2012/06/19 05:30:43 dholland Exp $ */
+/* $NetBSD: main.c,v 1.26 2019/02/03 03:19:25 mrg Exp $ */
/* main.c */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.25 2012/06/19 05:30:43 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.26 2019/02/03 03:19:25 mrg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -793,6 +793,7 @@ parse(void)
savegame(savefilename);
wizard = 1;
died(-257); /* save the game - doesn't return */
+ __unreachable();
case 'Z':
yrepcount = 0;
@@ -918,6 +919,7 @@ parse(void)
case 'g':
cursors();
lprintf("\nThe stuff you are carrying presently weighs %ld pounds", (long) packweight());
+ /* FALLTHROUGH */
case ' ':
yrepcount = 0;
nomove = 1;
Index: src/games/larn/monster.c
diff -u src/games/larn/monster.c:1.18 src/games/larn/monster.c:1.19
--- src/games/larn/monster.c:1.18 Tue Jun 19 05:30:43 2012
+++ src/games/larn/monster.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: monster.c,v 1.18 2012/06/19 05:30:43 dholland Exp $ */
+/* $NetBSD: monster.c,v 1.19 2019/02/03 03:19:25 mrg Exp $ */
/*
* monster.c Larn is copyrighted 1986 by Noah Morgan.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: monster.c,v 1.18 2012/06/19 05:30:43 dholland Exp $");
+__RCSID("$NetBSD: monster.c,v 1.19 2019/02/03 03:19:25 mrg Exp $");
#endif /* not lint */
#include <string.h>
@@ -1011,20 +1011,28 @@ dirsub(int *x, int *y)
switch (ttgetch()) {
case 'b':
i++;
+ /* FALLTHROUGH */
case 'n':
i++;
+ /* FALLTHROUGH */
case 'y':
i++;
+ /* FALLTHROUGH */
case 'u':
i++;
+ /* FALLTHROUGH */
case 'h':
i++;
+ /* FALLTHROUGH */
case 'k':
i++;
+ /* FALLTHROUGH */
case 'l':
i++;
+ /* FALLTHROUGH */
case 'j':
i++;
+ /* FALLTHROUGH */
goto out;
};
out:
Index: src/games/larn/movem.c
diff -u src/games/larn/movem.c:1.9 src/games/larn/movem.c:1.10
--- src/games/larn/movem.c:1.9 Tue Jun 19 05:30:43 2012
+++ src/games/larn/movem.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: movem.c,v 1.9 2012/06/19 05:30:43 dholland Exp $ */
+/* $NetBSD: movem.c,v 1.10 2019/02/03 03:19:25 mrg Exp $ */
/*
* movem.c (move monster) Larn is copyrighted 1986 by Noah Morgan.
@@ -12,7 +12,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: movem.c,v 1.9 2012/06/19 05:30:43 dholland Exp $");
+__RCSID("$NetBSD: movem.c,v 1.10 2019/02/03 03:19:25 mrg Exp $");
#endif /* not lint */
#include "header.h"
@@ -185,6 +185,7 @@ movemt(int i, int j)
case OMIRROR:
if (mitem[m][k] == VAMPIRE)
goto smm;
+ /* FALLTHROUGH */
default:
screen[m][k] = 0;
break;
@@ -437,6 +438,7 @@ movsphere(void)
case 1:
case 2: /* change direction to a random one */
sp->dir = rnd(8);
+ /* FALLTHROUGH */
default: /* move in normal direction */
dir = sp->dir;
len = sp->lifetime;
Index: src/games/larn/object.c
diff -u src/games/larn/object.c:1.16 src/games/larn/object.c:1.17
--- src/games/larn/object.c:1.16 Tue Jun 19 05:30:43 2012
+++ src/games/larn/object.c Sun Feb 3 03:19:25 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: object.c,v 1.16 2012/06/19 05:30:43 dholland Exp $ */
+/* $NetBSD: object.c,v 1.17 2019/02/03 03:19:25 mrg Exp $ */
/* object.c Larn is copyrighted 1986 by Noah Morgan. */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: object.c,v 1.16 2012/06/19 05:30:43 dholland Exp $");
+__RCSID("$NetBSD: object.c,v 1.17 2019/02/03 03:19:25 mrg Exp $");
#endif /* not lint */
#include "header.h"
#include "extern.h"
@@ -148,6 +148,7 @@ lookforobject(void)
item[playerx][playery] = OTELEPORTER;
know[playerx][playery] = 1;
+ /* FALLTHROUGH */
case OTELEPORTER:
lprcat("\nZaaaappp! You've been teleported!\n");
beep();
@@ -404,6 +405,7 @@ lookforobject(void)
item[playerx][playery] = OTRAPARROW;
know[playerx][playery] = 0;
+ /* FALLTHROUGH */
case OTRAPARROW:
lprcat("\nYou are hit by an arrow");
beep(); /* for an arrow trap */
@@ -418,6 +420,7 @@ lookforobject(void)
item[playerx][playery] = ODARTRAP;
know[playerx][playery] = 0;
+ /* FALLTHROUGH */
case ODARTRAP:
lprcat("\nYou are hit by a dart");
beep(); /* for a dart trap */
@@ -434,6 +437,7 @@ lookforobject(void)
item[playerx][playery] = OTRAPDOOR;
know[playerx][playery] = 1;
+ /* FALLTHROUGH */
case OTRAPDOOR:
lastnum = 272; /* a trap door */
if ((level == MAXLEVEL - 1) || (level == MAXLEVEL + MAXVLEVEL - 1)) {
Index: src/games/mille/move.c
diff -u src/games/mille/move.c:1.18 src/games/mille/move.c:1.19
--- src/games/mille/move.c:1.18 Wed Aug 31 16:24:56 2011
+++ src/games/mille/move.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.18 2011/08/31 16:24:56 plunky Exp $ */
+/* $NetBSD: move.c,v 1.19 2019/02/03 03:19:25 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: move.c,v 1.18 2011/08/31 16:24:56 plunky Exp $");
+__RCSID("$NetBSD: move.c,v 1.19 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -232,12 +232,15 @@ mustpick:
case C_200:
if (pp->nummiles[C_200] == 2)
return error("only two 200's per hand");
+ /* FALLTHROUGH */
case C_100: case C_75:
if (pp->speed == C_LIMIT)
return error("limit of 50");
+ /* FALLTHROUGH */
case C_50:
if (pp->mileage + Value[card] > End)
return error("puts you over %d", End);
+ /* FALLTHROUGH */
case C_25:
if (!pp->can_go)
return error("cannot move now");
Index: src/games/phantasia/fight.c
diff -u src/games/phantasia/fight.c:1.13 src/games/phantasia/fight.c:1.14
--- src/games/phantasia/fight.c:1.13 Mon Aug 31 08:27:16 2009
+++ src/games/phantasia/fight.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fight.c,v 1.13 2009/08/31 08:27:16 dholland Exp $ */
+/* $NetBSD: fight.c,v 1.14 2019/02/03 03:19:25 mrg Exp $ */
/*
* fight.c Phantasia monster fighting routines
@@ -1316,6 +1316,7 @@ awardtreasure(void)
/* fall through to treasure type 9 if
* no treasure from above */
+ /* FALLTHROUGH */
case 9: /* treasure type 9 */
switch (whichtreasure) {
case 1:
@@ -1326,8 +1327,8 @@ awardtreasure(void)
++Player.p_crowns;
break;
}
- /* fall through otherwise */
+ /* FALLTHROUGH */
case 2:
addstr("You've been blessed!\n");
Player.p_blessing = TRUE;
Index: src/games/phantasia/main.c
diff -u src/games/phantasia/main.c:1.23 src/games/phantasia/main.c:1.24
--- src/games/phantasia/main.c:1.23 Mon Aug 31 08:27:16 2009
+++ src/games/phantasia/main.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.23 2009/08/31 08:27:16 dholland Exp $ */
+/* $NetBSD: main.c,v 1.24 2019/02/03 03:19:25 mrg Exp $ */
/*
* Phantasia 3.3.2 -- Interterminal fantasy game
@@ -108,11 +108,13 @@ main(int argc, char **argv)
case 'a': /* all users */
activelist();
cleanup(TRUE);
+ __unreachable();
/* NOTREACHED */
case 'p': /* purge old players */
purgeoldplayers();
cleanup(TRUE);
+ __unreachable();
/* NOTREACHED */
case 'S': /* set 'Wizard' */
@@ -126,11 +128,13 @@ main(int argc, char **argv)
case 'm': /* monsters */
monstlist();
cleanup(TRUE);
+ __unreachable();
/* NOTREACHED */
case 'b': /* scoreboard */
scorelist();
cleanup(TRUE);
+ __unreachable();
/* NOTREACHED */
}
@@ -143,15 +147,18 @@ main(int argc, char **argv)
if (examine) {
changestats(FALSE);
cleanup(TRUE);
+ __unreachable();
/* NOTREACHED */
}
if (!noheader) {
titlelist();
purgeoldplayers(); /* clean up old characters */
}
- if (headeronly)
+ if (headeronly) {
cleanup(TRUE);
- /* NOTREACHED */
+ __unreachable();
+ /* NOTREACHED */
+ }
do
/* get the player structure filled */
@@ -167,6 +174,7 @@ main(int argc, char **argv)
case 'Q':
cleanup(TRUE);
+ __unreachable();
/* NOTREACHED */
default:
@@ -544,6 +552,7 @@ procmain(void)
case '5': /* good-bye */
leavegame();
+ __unreachable();
/* NOTREACHED */
case '6': /* cloak */
Index: src/games/phantasia/misc.c
diff -u src/games/phantasia/misc.c:1.21 src/games/phantasia/misc.c:1.22
--- src/games/phantasia/misc.c:1.21 Thu Sep 1 07:18:50 2011
+++ src/games/phantasia/misc.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.21 2011/09/01 07:18:50 plunky Exp $ */
+/* $NetBSD: misc.c,v 1.22 2019/02/03 03:19:25 mrg Exp $ */
/*
* misc.c Phantasia miscellaneous support routines
@@ -729,6 +729,7 @@ altercoordinates(double xnew, double yne
ynew = Player.p_y - ROLL(1.0, 5.0);
/* fall through for check */
+ /* FALLTHROUGH */
case A_SPECIFIC: /* just move player */
if (Beyond && fabs(xnew) < D_BEYOND && fabs(ynew) < D_BEYOND)
/*
Index: src/games/quiz/quiz.c
diff -u src/games/quiz/quiz.c:1.27 src/games/quiz/quiz.c:1.28
--- src/games/quiz/quiz.c:1.27 Sun Mar 23 00:07:15 2014
+++ src/games/quiz/quiz.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: quiz.c,v 1.27 2014/03/23 00:07:15 dholland Exp $ */
+/* $NetBSD: quiz.c,v 1.28 2019/02/03 03:19:25 mrg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: quiz.c,v 1.27 2014/03/23 00:07:15 dholland Exp $");
+__RCSID("$NetBSD: quiz.c,v 1.28 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -318,6 +318,7 @@ next_cat(const char *s)
case ':':
if (!esc)
return (s);
+ /* FALLTHROUGH */
default:
esc = 0;
break;
Index: src/games/rogue/play.c
diff -u src/games/rogue/play.c:1.9 src/games/rogue/play.c:1.10
--- src/games/rogue/play.c:1.9 Mon Jan 14 03:50:02 2008
+++ src/games/rogue/play.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: play.c,v 1.9 2008/01/14 03:50:02 dholland Exp $ */
+/* $NetBSD: play.c,v 1.10 2019/02/03 03:19:25 mrg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)play.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: play.c,v 1.9 2008/01/14 03:50:02 dholland Exp $");
+__RCSID("$NetBSD: play.c,v 1.10 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -219,6 +219,7 @@ CH:
break;
case 'Q':
quit(0);
+ __unreachable();
case '0':
case '1':
case '2':
Index: src/games/rogue/room.c
diff -u src/games/rogue/room.c:1.13 src/games/rogue/room.c:1.14
--- src/games/rogue/room.c:1.13 Wed Aug 12 08:44:45 2009
+++ src/games/rogue/room.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: room.c,v 1.13 2009/08/12 08:44:45 dholland Exp $ */
+/* $NetBSD: room.c,v 1.14 2019/02/03 03:19:25 mrg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)room.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: room.c,v 1.13 2009/08/12 08:44:45 dholland Exp $");
+__RCSID("$NetBSD: room.c,v 1.14 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -571,6 +571,7 @@ CH:
opt_go(++i);
break;
}
+ /* FALLTHROUGH */
default:
if (options[i].is_bool) {
sound_bell();
Index: src/games/sail/pl_5.c
diff -u src/games/sail/pl_5.c:1.25 src/games/sail/pl_5.c:1.26
--- src/games/sail/pl_5.c:1.25 Sun Mar 15 03:33:56 2009
+++ src/games/sail/pl_5.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pl_5.c,v 1.25 2009/03/15 03:33:56 dholland Exp $ */
+/* $NetBSD: pl_5.c,v 1.26 2019/02/03 03:19:25 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pl_5.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: pl_5.c,v 1.25 2009/03/15 03:33:56 dholland Exp $");
+__RCSID("$NetBSD: pl_5.c,v 1.26 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -78,6 +78,7 @@ acceptmove(void)
switch (*p) {
case 'l':
dir -= 2;
+ /* FALLTHROUGH */
case 'r':
if (++dir == 0)
dir = 8;
Index: src/libexec/telnetd/state.c
diff -u src/libexec/telnetd/state.c:1.30 src/libexec/telnetd/state.c:1.31
--- src/libexec/telnetd/state.c:1.30 Mon Dec 12 15:58:44 2016
+++ src/libexec/telnetd/state.c Sun Feb 3 03:19:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: state.c,v 1.30 2016/12/12 15:58:44 maya Exp $ */
+/* $NetBSD: state.c,v 1.31 2019/02/03 03:19:25 mrg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: state.c,v 1.30 2016/12/12 15:58:44 maya Exp $");
+__RCSID("$NetBSD: state.c,v 1.31 2019/02/03 03:19:25 mrg Exp $");
#endif
#endif /* not lint */
@@ -531,6 +531,7 @@ willoption(int option)
slctab[SLC_XON].defset.flag |= SLC_DEFAULT;
slctab[SLC_XOFF].defset.flag &= ~SLC_LEVELBITS;
slctab[SLC_XOFF].defset.flag |= SLC_DEFAULT;
+ /* FALLTHROUGH */
case TELOPT_TTYPE:
case TELOPT_SGA:
case TELOPT_NAWS:
Index: src/sbin/fsck_ext2fs/main.c
diff -u src/sbin/fsck_ext2fs/main.c:1.38 src/sbin/fsck_ext2fs/main.c:1.39
--- src/sbin/fsck_ext2fs/main.c:1.38 Mon Aug 27 15:16:49 2018
+++ src/sbin/fsck_ext2fs/main.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.38 2018/08/27 15:16:49 sevan Exp $ */
+/* $NetBSD: main.c,v 1.39 2019/02/03 03:19:26 mrg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -63,7 +63,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#else
-__RCSID("$NetBSD: main.c,v 1.38 2018/08/27 15:16:49 sevan Exp $");
+__RCSID("$NetBSD: main.c,v 1.39 2019/02/03 03:19:26 mrg Exp $");
#endif
#endif /* not lint */
@@ -211,6 +211,7 @@ checkfilesys(const char *filesys, char *
case 0:
if (preen)
pfatal("CAN'T CHECK FILE SYSTEM.");
+ /* FALLTHROUGH */
case -1:
return FSCK_EXIT_OK;
}
Index: src/sbin/fsck_ffs/quota2.c
diff -u src/sbin/fsck_ffs/quota2.c:1.6 src/sbin/fsck_ffs/quota2.c:1.7
--- src/sbin/fsck_ffs/quota2.c:1.6 Sun Aug 26 09:34:42 2012
+++ src/sbin/fsck_ffs/quota2.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2.c,v 1.6 2012/08/26 09:34:42 dholland Exp $ */
+/* $NetBSD: quota2.c,v 1.7 2019/02/03 03:19:26 mrg Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -259,6 +259,7 @@ quota2_check_inode(int type)
break;
case DSTATE:
freei = 1;
+ /* FALLTHROUGH */
case DFOUND:
pwarn("%s QUOTA INODE %" PRIu64 " IS A DIRECTORY",
capstrtype, sblock->fs_quotafile[type]);
Index: src/sbin/fsck_lfs/main.c
diff -u src/sbin/fsck_lfs/main.c:1.52 src/sbin/fsck_lfs/main.c:1.53
--- src/sbin/fsck_lfs/main.c:1.52 Tue Jul 28 05:09:34 2015
+++ src/sbin/fsck_lfs/main.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.52 2015/07/28 05:09:34 dholland Exp $ */
+/* $NetBSD: main.c,v 1.53 2019/02/03 03:19:26 mrg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -217,6 +217,7 @@ checkfilesys(const char *filesys, char *
case 0:
if (preen)
pfatal("CAN'T CHECK FILE SYSTEM.");
+ /* FALLTHROUGH */
case -1:
return FSCK_EXIT_OK;
}
Index: src/sbin/restore/interactive.c
diff -u src/sbin/restore/interactive.c:1.27 src/sbin/restore/interactive.c:1.28
--- src/sbin/restore/interactive.c:1.27 Tue Jan 22 09:39:13 2013
+++ src/sbin/restore/interactive.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: interactive.c,v 1.27 2013/01/22 09:39:13 dholland Exp $ */
+/* $NetBSD: interactive.c,v 1.28 2019/02/03 03:19:26 mrg Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)interactive.c 8.5 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: interactive.c,v 1.27 2013/01/22 09:39:13 dholland Exp $");
+__RCSID("$NetBSD: interactive.c,v 1.28 2019/02/03 03:19:26 mrg Exp $");
#endif
#endif /* not lint */
@@ -188,6 +188,7 @@ loop:
case 'h':
if (strncmp(cmd, "help", strlen(cmd)) != 0)
goto bad;
+ /* FALLTHROUGH */
case '?':
fprintf(stderr, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
"Available commands are:\n",
Index: src/sys/arch/amd64/amd64/db_disasm.c
diff -u src/sys/arch/amd64/amd64/db_disasm.c:1.25 src/sys/arch/amd64/amd64/db_disasm.c:1.26
--- src/sys/arch/amd64/amd64/db_disasm.c:1.25 Sat Sep 8 12:40:17 2018
+++ src/sys/arch/amd64/amd64/db_disasm.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.25 2018/09/08 12:40:17 maxv Exp $ */
+/* $NetBSD: db_disasm.c,v 1.26 2019/02/03 03:19:26 mrg Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.25 2018/09/08 12:40:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.26 2019/02/03 03:19:26 mrg Exp $");
#ifndef _KERNEL
#include <sys/types.h>
@@ -1466,6 +1466,7 @@ db_disasm(db_addr_t loc, bool altfmt)
db_printf("$%s", tbuf);
break;
}
+ /* FALLTHROUGH */
case I:
len = db_lengths[size];
get_value_inc(imm, loc, len, false);/* unsigned */
Index: src/sys/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.115 src/sys/arch/amd64/amd64/trap.c:1.116
--- src/sys/arch/amd64/amd64/trap.c:1.115 Sun Jan 27 02:08:37 2019
+++ src/sys/arch/amd64/amd64/trap.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.115 2019/01/27 02:08:37 pgoyette Exp $ */
+/* $NetBSD: trap.c,v 1.116 2019/02/03 03:19:26 mrg Exp $ */
/*
* Copyright (c) 1998, 2000, 2017 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.115 2019/01/27 02:08:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.116 2019/02/03 03:19:26 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -376,6 +376,7 @@ trap(struct trapframe *frame)
}
}
#endif
+ /* FALLTHROUGH */
case T_TSSFLT|T_USER:
case T_SEGNPFLT|T_USER:
case T_STKFLT|T_USER:
Index: src/sys/arch/i386/i386/process_machdep.c
diff -u src/sys/arch/i386/i386/process_machdep.c:1.91 src/sys/arch/i386/i386/process_machdep.c:1.92
--- src/sys/arch/i386/i386/process_machdep.c:1.91 Sun Sep 17 09:41:35 2017
+++ src/sys/arch/i386/i386/process_machdep.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.91 2017/09/17 09:41:35 maxv Exp $ */
+/* $NetBSD: process_machdep.c,v 1.92 2019/02/03 03:19:26 mrg Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.91 2017/09/17 09:41:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.92 2019/02/03 03:19:26 mrg Exp $");
#include "opt_ptrace.h"
@@ -266,6 +266,7 @@ ptrace_machdep_dorequest(
case PT_SETXMMREGS:
write = 1;
+ /* FALLTHROUGH */
case PT_GETXMMREGS:
/* write = 0 done above. */
if (!process_machdep_validxmmregs(lt->l_proc))
Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.296 src/sys/arch/i386/i386/trap.c:1.297
--- src/sys/arch/i386/i386/trap.c:1.296 Thu Jul 26 09:29:08 2018
+++ src/sys/arch/i386/i386/trap.c Sun Feb 3 03:19:26 2019
@@ -1,5 +1,5 @@
-/* $NetBSD: trap.c,v 1.296 2018/07/26 09:29:08 maxv Exp $ */
+/* $NetBSD: trap.c,v 1.297 2019/02/03 03:19:26 mrg Exp $ */
/*-
* Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.296 2018/07/26 09:29:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.297 2019/02/03 03:19:26 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -461,6 +461,7 @@ kernelfault:
}
}
#endif
+ /* FALLTHROUGH */
case T_TSSFLT|T_USER:
case T_SEGNPFLT|T_USER:
case T_STKFLT|T_USER:
Index: src/sys/compat/linux/common/linux_hdio.c
diff -u src/sys/compat/linux/common/linux_hdio.c:1.17 src/sys/compat/linux/common/linux_hdio.c:1.18
--- src/sys/compat/linux/common/linux_hdio.c:1.17 Tue Dec 8 20:36:14 2015
+++ src/sys/compat/linux/common/linux_hdio.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_hdio.c,v 1.17 2015/12/08 20:36:14 christos Exp $ */
+/* $NetBSD: linux_hdio.c,v 1.18 2019/02/03 03:19:26 mrg Exp $ */
/*
* Copyright (c) 2000 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_hdio.c,v 1.17 2015/12/08 20:36:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_hdio.c,v 1.18 2019/02/03 03:19:26 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,6 +123,7 @@ linux_ioctl_hdio(struct lwp *l, const st
error = linux_machdepioctl(l, uap, retval);
if (error == 0)
break;
+ /* FALLTHROUGH */
case LINUX_HDIO_GETGEO_BIG_RAW:
error = ioctlf(fp, DIOCGDINFO, &label);
error1 = ioctlf(fp, DIOCGPARTINFO, &pi);
Index: src/sys/compat/ossaudio/ossaudio.c
diff -u src/sys/compat/ossaudio/ossaudio.c:1.73 src/sys/compat/ossaudio/ossaudio.c:1.74
--- src/sys/compat/ossaudio/ossaudio.c:1.73 Sat Feb 2 05:02:03 2019
+++ src/sys/compat/ossaudio/ossaudio.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.73 2019/02/02 05:02:03 isaki Exp $ */
+/* $NetBSD: ossaudio.c,v 1.74 2019/02/03 03:19:26 mrg Exp $ */
/*-
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.73 2019/02/02 05:02:03 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.74 2019/02/03 03:19:26 mrg Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -230,7 +230,7 @@ oss_ioctl_audio(struct lwp *l, const str
__func__, idat, error));
goto out;
}
- /* fall into ... */
+ /* FALLTHROUGH */
case OSS_SOUND_PCM_READ_RATE:
error = ioctlf(fp, AUDIO_GETBUFINFO, &tmpinfo);
if (error) {
@@ -372,7 +372,7 @@ oss_ioctl_audio(struct lwp *l, const str
__func__, error));
goto out;
}
- /* fall into ... */
+ /* FALLTHROUGH */
case OSS_SOUND_PCM_READ_BITS:
error = ioctlf(fp, AUDIO_GETBUFINFO, &tmpinfo);
if (error) {
@@ -449,7 +449,7 @@ oss_ioctl_audio(struct lwp *l, const str
__func__, error));
goto out;
}
- /* fall into ... */
+ /* FALLTHROUGH */
case OSS_SOUND_PCM_READ_CHANNELS:
error = ioctlf(fp, AUDIO_GETBUFINFO, &tmpinfo);
if (error) {
Index: src/sys/ddb/db_examine.c
diff -u src/sys/ddb/db_examine.c:1.36 src/sys/ddb/db_examine.c:1.37
--- src/sys/ddb/db_examine.c:1.36 Sat Jun 6 22:06:05 2015
+++ src/sys/ddb/db_examine.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_examine.c,v 1.36 2015/06/06 22:06:05 matt Exp $ */
+/* $NetBSD: db_examine.c,v 1.37 2019/02/03 03:19:26 mrg Exp $ */
/*
* Mach Operating System
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_examine.c,v 1.36 2015/06/06 22:06:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_examine.c,v 1.37 2019/02/03 03:19:26 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,6 +107,7 @@ db_examine(db_addr_t addr, char *fmt, in
db_error("q not supported\n");
/*NOTREACHED*/
}
+ /* FALLTHROUGH */
case 'L': /* implementation maximum */
size = sizeof value;
width = 12 * (sizeof value / 4);
Index: src/sys/ddb/db_write_cmd.c
diff -u src/sys/ddb/db_write_cmd.c:1.27 src/sys/ddb/db_write_cmd.c:1.28
--- src/sys/ddb/db_write_cmd.c:1.27 Sat Jun 6 22:06:05 2015
+++ src/sys/ddb/db_write_cmd.c Sun Feb 3 03:19:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_write_cmd.c,v 1.27 2015/06/06 22:06:05 matt Exp $ */
+/* $NetBSD: db_write_cmd.c,v 1.28 2019/02/03 03:19:26 mrg Exp $ */
/*
* Mach Operating System
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_write_cmd.c,v 1.27 2015/06/06 22:06:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_write_cmd.c,v 1.28 2019/02/03 03:19:26 mrg Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -73,6 +73,7 @@ db_write_cmd(db_expr_t address, bool hav
db_error("q not supported\n");
/*NOTREACHED*/
}
+ /* FALLTHROUGH */
case 'L':
size = sizeof(db_expr_t);
break;
Index: src/sys/dev/acpi/acpi_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.59 src/sys/dev/acpi/acpi_cpu_cstate.c:1.60
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.59 Sat Feb 25 17:22:52 2012
+++ src/sys/dev/acpi/acpi_cpu_cstate.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.59 2012/02/25 17:22:52 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.60 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen <[email protected]>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.59 2012/02/25 17:22:52 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.60 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -348,9 +348,10 @@ acpicpu_cstate_cst_add(struct acpicpu_so
break;
- case ACPI_STATE_C3: /* FALLTHROUGH */
+ case ACPI_STATE_C3:
state.cs_flags = ACPICPU_FLAG_C_BM_STS;
+ /* FALLTHROUGH */
default:
if ((sc->sc_flags & ACPICPU_FLAG_C_FFH) == 0) {
Index: src/sys/dev/bluetooth/btsco.c
diff -u src/sys/dev/bluetooth/btsco.c:1.36 src/sys/dev/bluetooth/btsco.c:1.37
--- src/sys/dev/bluetooth/btsco.c:1.36 Thu Jun 1 02:45:09 2017
+++ src/sys/dev/bluetooth/btsco.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.c,v 1.36 2017/06/01 02:45:09 chs Exp $ */
+/* $NetBSD: btsco.c,v 1.37 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.36 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.37 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -632,7 +632,7 @@ btsco_open(void *hdl, int flags)
case BTSCO_CLOSED: /* disconnected */
err = sc->sc_err;
- /* fall through to */
+ /* FALLTHROUGH */
case BTSCO_WAIT_CONNECT: /* error */
if (sc->sc_sco != NULL)
sco_detach_pcb(&sc->sc_sco);
Index: src/sys/dev/ic/adwlib.c
diff -u src/sys/dev/ic/adwlib.c:1.41 src/sys/dev/ic/adwlib.c:1.42
--- src/sys/dev/ic/adwlib.c:1.41 Thu Sep 12 11:23:37 2013
+++ src/sys/dev/ic/adwlib.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.c,v 1.41 2013/09/12 11:23:37 martin Exp $ */
+/* $NetBSD: adwlib.c,v 1.42 2019/02/03 03:19:27 mrg Exp $ */
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.41 2013/09/12 11:23:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.42 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -463,12 +463,15 @@ XXX TODO!!! if (ASC_PCI_ID2FUNC(sc->cf
case 3:
/* Enable manual control with low on / high on. */
sc->cfg.termination |= ADW_TERM_CTL_L;
+ /* FALLTHROUGH */
case 2:
/* Enable manual control with low off / high on. */
sc->cfg.termination |= ADW_TERM_CTL_H;
+ /* FALLTHROUGH */
case 1:
/* Enable manual control with low off / high off. */
sc->cfg.termination |= ADW_TERM_CTL_SEL;
+ /* FALLTHROUGH */
case 0:
break;
default:
Index: src/sys/dev/ic/elink3.c
diff -u src/sys/dev/ic/elink3.c:1.144 src/sys/dev/ic/elink3.c:1.145
--- src/sys/dev/ic/elink3.c:1.144 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/ic/elink3.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.144 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: elink3.c,v 1.145 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.144 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.145 2019/02/03 03:19:27 mrg Exp $");
#include "opt_inet.h"
@@ -1683,6 +1683,7 @@ epioctl(struct ifnet *ifp, u_long cmd, v
break;
}
+ /* FALLTHROUGH */
default:
error = ether_ioctl(ifp, cmd, data);
Index: src/sys/dev/ic/isp_netbsd.c
diff -u src/sys/dev/ic/isp_netbsd.c:1.90 src/sys/dev/ic/isp_netbsd.c:1.91
--- src/sys/dev/ic/isp_netbsd.c:1.90 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/isp_netbsd.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.c,v 1.90 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: isp_netbsd.c,v 1.91 2019/02/03 03:19:27 mrg Exp $ */
/*
* Platform (NetBSD) dependent common attachment code for Qlogic adapters.
*/
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.90 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.91 2019/02/03 03:19:27 mrg Exp $");
#include <dev/ic/isp_netbsd.h>
#include <dev/ic/isp_ioctl.h>
@@ -1217,6 +1217,7 @@ isp_async(struct ispsoftc *isp, ispasync
ASYNC_EVENT_XFER_MODE, &xm);
break;
}
+ /* FALLTHROUGH */
case ISPASYNC_BUS_RESET:
va_start(ap, cmd);
bus = va_arg(ap, int);
Index: src/sys/dev/ic/ncr53c9x.c
diff -u src/sys/dev/ic/ncr53c9x.c:1.149 src/sys/dev/ic/ncr53c9x.c:1.150
--- src/sys/dev/ic/ncr53c9x.c:1.149 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/ncr53c9x.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9x.c,v 1.149 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: ncr53c9x.c,v 1.150 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.149 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.150 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -372,6 +372,7 @@ ncr53c9x_reset(struct ncr53c9x_softc *sc
case NCR_VARIANT_FAS408:
NCR_WRITE_REG(sc, NCR_CFG5, sc->sc_cfg5 | NCRCFG5_SINT);
NCR_WRITE_REG(sc, NCR_CFG4, sc->sc_cfg4);
+ /* FALLTHROUGH */
case NCR_VARIANT_AM53C974:
case NCR_VARIANT_FAS216:
case NCR_VARIANT_NCR53C94:
@@ -379,9 +380,11 @@ ncr53c9x_reset(struct ncr53c9x_softc *sc
case NCR_VARIANT_ESP200:
sc->sc_features |= NCR_F_HASCFG3;
NCR_WRITE_REG(sc, NCR_CFG3, sc->sc_cfg3);
+ /* FALLTHROUGH */
case NCR_VARIANT_ESP100A:
sc->sc_features |= NCR_F_SELATN3;
NCR_WRITE_REG(sc, NCR_CFG2, sc->sc_cfg2);
+ /* FALLTHROUGH */
case NCR_VARIANT_ESP100:
NCR_WRITE_REG(sc, NCR_CFG1, sc->sc_cfg1);
NCR_WRITE_REG(sc, NCR_CCF, sc->sc_ccf);
Index: src/sys/dev/ic/pdq_ifsubr.c
diff -u src/sys/dev/ic/pdq_ifsubr.c:1.60 src/sys/dev/ic/pdq_ifsubr.c:1.61
--- src/sys/dev/ic/pdq_ifsubr.c:1.60 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/pdq_ifsubr.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pdq_ifsubr.c,v 1.60 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: pdq_ifsubr.c,v 1.61 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <[email protected]>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.60 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.61 2019/02/03 03:19:27 mrg Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -609,55 +609,43 @@ pdq_os_memalloc_contig(
}
switch (steps) {
- case 11: {
+ case 11:
bus_dmamap_unload(sc->sc_dmatag, sc->sc_cbmap);
- /* FALL THROUGH */
- }
- case 10: {
+ /* FALLTHROUGH */
+ case 10:
bus_dmamap_destroy(sc->sc_dmatag, sc->sc_cbmap);
- /* FALL THROUGH */
- }
- case 9: {
+ /* FALLTHROUGH */
+ case 9:
bus_dmamem_unmap(sc->sc_dmatag,
(void *)pdq->pdq_cbp, sizeof(*pdq->pdq_cbp));
- /* FALL THROUGH */
- }
- case 8: {
+ /* FALLTHROUGH */
+ case 8:
bus_dmamap_unload(sc->sc_dmatag, sc->sc_uimap);
- /* FALL THROUGH */
- }
- case 7: {
+ /* FALLTHROUGH */
+ case 7:
bus_dmamap_destroy(sc->sc_dmatag, sc->sc_uimap);
- /* FALL THROUGH */
- }
- case 6: {
+ /* FALLTHROUGH */
+ case 6:
bus_dmamem_unmap(sc->sc_dmatag,
(void *) pdq->pdq_unsolicited_info.ui_events,
PDQ_OS_PAGESIZE);
- /* FALL THROUGH */
- }
- case 5: {
+ /* FALLTHROUGH */
+ case 5:
bus_dmamem_free(sc->sc_dmatag, ui_segs, ui_nsegs);
- /* FALL THROUGH */
- }
- case 4: {
+ /* FALLTHROUGH */
+ case 4:
bus_dmamap_unload(sc->sc_dmatag, sc->sc_dbmap);
- /* FALL THROUGH */
- }
- case 3: {
+ /* FALLTHROUGH */
+ case 3:
bus_dmamap_destroy(sc->sc_dmatag, sc->sc_dbmap);
- /* FALL THROUGH */
- }
- case 2: {
+ /* FALLTHROUGH */
+ case 2:
bus_dmamem_unmap(sc->sc_dmatag,
(void *) pdq->pdq_dbp,
sizeof(*pdq->pdq_dbp));
- /* FALL THROUGH */
- }
- case 1: {
+ /* FALLTHROUGH */
+ case 1:
bus_dmamem_free(sc->sc_dmatag, db_segs, db_nsegs);
- /* FALL THROUGH */
- }
}
return not_ok;
Index: src/sys/dev/ic/rtw.c
diff -u src/sys/dev/ic/rtw.c:1.128 src/sys/dev/ic/rtw.c:1.129
--- src/sys/dev/ic/rtw.c:1.128 Tue Jun 26 06:48:00 2018
+++ src/sys/dev/ic/rtw.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.128 2018/06/26 06:48:00 msaitoh Exp $ */
+/* $NetBSD: rtw.c,v 1.129 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 David Young. All rights
* reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.128 2018/06/26 06:48:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.129 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
@@ -4281,6 +4281,7 @@ rtw_detach(struct rtw_softc *sc)
callout_stop(&sc->sc_scan_ch);
ieee80211_ifdetach(&sc->sc_ic);
if_detach(ifp);
+ /*FALLTHROUGH*/
case FINISH_LED_ATTACH:
rtw_led_detach(&sc->sc_led_state);
/*FALLTHROUGH*/
Index: src/sys/dev/isa/fd.c
diff -u src/sys/dev/isa/fd.c:1.112 src/sys/dev/isa/fd.c:1.113
--- src/sys/dev/isa/fd.c:1.112 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/isa/fd.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.112 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: fd.c,v 1.113 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.112 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.113 2019/02/03 03:19:27 mrg Exp $");
#include "opt_ddb.h"
@@ -1235,6 +1235,7 @@ loop:
case IOTIMEDOUT:
isa_dmaabort(fdc->sc_ic, fdc->sc_drq);
+ /* FALLTHROUGH */
case SEEKTIMEDOUT:
case RECALTIMEDOUT:
case RESETTIMEDOUT:
Index: src/sys/dev/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.113 src/sys/dev/isa/gus.c:1.114
--- src/sys/dev/isa/gus.c:1.113 Sat Jun 23 06:57:24 2018
+++ src/sys/dev/isa/gus.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.113 2018/06/23 06:57:24 maxv Exp $ */
+/* $NetBSD: gus.c,v 1.114 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.113 2018/06/23 06:57:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.114 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1558,6 +1558,7 @@ gus_dmaout_dointr(struct gus_softc *sc)
(sc->sc_nbufs - 1) * sc->sc_chanblocksize - 2,
guspeek(iot, ioh2,
sc->sc_gusaddr + sc->sc_chanblocksize - 2));
+ /* FALLTHROUGH */
case AUDIO_ENCODING_ALAW:
case AUDIO_ENCODING_ULAW:
byte:
Index: src/sys/dev/isa/if_ate.c
diff -u src/sys/dev/isa/if_ate.c:1.50 src/sys/dev/isa/if_ate.c:1.51
--- src/sys/dev/isa/if_ate.c:1.50 Sat Apr 12 06:27:01 2008
+++ src/sys/dev/isa/if_ate.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate.c,v 1.50 2008/04/12 06:27:01 tsutsui Exp $ */
+/* $NetBSD: if_ate.c,v 1.51 2019/02/03 03:19:27 mrg Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.50 2008/04/12 06:27:01 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.51 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,6 +290,7 @@ ate_find(bus_space_tag_t iot, bus_space_
*irq = irqmap[1][n];
break;
}
+ /* FALLTHROUGH */
default:
*irq = irqmap[0][n];
break;
Index: src/sys/dev/isa/sbdsp.c
diff -u src/sys/dev/isa/sbdsp.c:1.138 src/sys/dev/isa/sbdsp.c:1.139
--- src/sys/dev/isa/sbdsp.c:1.138 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/isa/sbdsp.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sbdsp.c,v 1.138 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: sbdsp.c,v 1.139 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.138 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.139 2019/02/03 03:19:27 mrg Exp $");
#include "midi.h"
#include "mpu.h"
@@ -639,7 +639,7 @@ sbdsp_set_params(
hw.encoding = AUDIO_ENCODING_SLINEAR_LE;
swcode = swap_bytes;
}
- /* fall into */
+ /* FALLTHROUGH */
case AUDIO_ENCODING_SLINEAR:
case AUDIO_ENCODING_SLINEAR_LE:
bmode = SB_BMODE_SIGNED;
@@ -650,7 +650,7 @@ sbdsp_set_params(
hw.encoding = AUDIO_ENCODING_ULINEAR_LE;
swcode = swap_bytes;
}
- /* fall into */
+ /* FALLTHROUGH */
case AUDIO_ENCODING_ULINEAR_LE:
bmode = SB_BMODE_UNSIGNED;
break;
@@ -1762,6 +1762,7 @@ sbdsp_mixer_set_port(void *addr, mixer_c
return 0;
}
}
+ /* FALLTHROUGH */
case SB_PCSPEAKER:
case SB_INPUT_GAIN:
case SB_OUTPUT_GAIN:
@@ -1769,12 +1770,14 @@ sbdsp_mixer_set_port(void *addr, mixer_c
error = EINVAL;
break;
}
+ /* FALLTHROUGH */
case SB_MIC_VOL:
case SB_LINE_IN_VOL:
if (sc->sc_mixer_model == SBM_CT1335) {
error = EINVAL;
break;
}
+ /* FALLTHROUGH */
case SB_VOICE_VOL:
case SB_MIDI_VOL:
case SB_CD_VOL:
@@ -1805,7 +1808,7 @@ sbdsp_mixer_set_port(void *addr, mixer_c
error = EINVAL;
break;
}
- /* fall into */
+ /* FALLTHROUGH */
case SB_INPUT_GAIN:
case SB_OUTPUT_GAIN:
lgain = rgain = SB_ADJUST_2_GAIN(sc,
@@ -1976,6 +1979,7 @@ sbdsp_mixer_get_port(void *addr, mixer_c
return 0;
}
}
+ /* FALLTHROUGH */
case SB_PCSPEAKER:
case SB_INPUT_GAIN:
case SB_OUTPUT_GAIN:
@@ -1983,12 +1987,14 @@ sbdsp_mixer_get_port(void *addr, mixer_c
mutex_spin_exit(&sc->sc_intr_lock);
return EINVAL;
}
+ /* FALLTHROUGH */
case SB_MIC_VOL:
case SB_LINE_IN_VOL:
if (sc->sc_mixer_model == SBM_CT1335) {
mutex_spin_exit(&sc->sc_intr_lock);
return EINVAL;
}
+ /* FALLTHROUGH */
case SB_VOICE_VOL:
case SB_MIDI_VOL:
case SB_CD_VOL:
@@ -2000,7 +2006,7 @@ sbdsp_mixer_get_port(void *addr, mixer_c
mutex_spin_exit(&sc->sc_intr_lock);
return EINVAL;
}
- /* fall into */
+ /* FALLTHROUGH */
default:
switch (cp->un.value.num_channels) {
case 1:
Index: src/sys/dev/pci/if_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.50 src/sys/dev/pci/if_bce.c:1.51
--- src/sys/dev/pci/if_bce.c:1.50 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_bce.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.50 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_bce.c,v 1.51 2019/02/03 03:19:27 mrg Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.50 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.51 2019/02/03 03:19:27 mrg Exp $");
#include "vlan.h"
@@ -297,6 +297,7 @@ bce_attach(device_t parent, device_t sel
if (pci_mapreg_map(pa, BCE_PCI_BAR0, memtype, 0, &sc->bce_btag,
&sc->bce_bhandle, &memaddr, &memsize) == 0)
break;
+ /* FALLTHROUGH */
default:
aprint_error_dev(self, "unable to find mem space\n");
return;
Index: src/sys/dev/pci/if_dge.c
diff -u src/sys/dev/pci/if_dge.c:1.50 src/sys/dev/pci/if_dge.c:1.51
--- src/sys/dev/pci/if_dge.c:1.50 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/if_dge.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dge.c,v 1.50 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: if_dge.c,v 1.51 2019/02/03 03:19:27 mrg Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.50 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.51 2019/02/03 03:19:27 mrg Exp $");
@@ -535,10 +535,13 @@ out:
switch (state) {
case 4:
bus_dmamap_unload(sc->sc_dmat, sc->sc_bugmap);
+ /* FALLTHROUGH */
case 3:
bus_dmamap_destroy(sc->sc_dmat, sc->sc_bugmap);
+ /* FALLTHROUGH */
case 2:
bus_dmamem_unmap(sc->sc_dmat, kva, DGE_RXMEM);
+ /* FALLTHROUGH */
case 1:
bus_dmamem_free(sc->sc_dmat, &seg, rseg);
break;
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.322 src/sys/dev/pci/if_bge.c:1.323
--- src/sys/dev/pci/if_bge.c:1.322 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_bge.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.322 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.323 2019/02/03 03:19:27 mrg Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.322 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.323 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1631,11 +1631,14 @@ out:
case 4:
bus_dmamap_unload(sc->bge_dmatag,
sc->bge_cdata.bge_rx_jumbo_map);
+ /* FALLTHROUGH */
case 3:
bus_dmamap_destroy(sc->bge_dmatag,
sc->bge_cdata.bge_rx_jumbo_map);
+ /* FALLTHROUGH */
case 2:
bus_dmamem_unmap(sc->bge_dmatag, kva, BGE_JMEM);
+ /* FALLTHROUGH */
case 1:
bus_dmamem_free(sc->bge_dmatag, &seg, rseg);
break;
@@ -3478,6 +3481,7 @@ bge_attach(device_t parent, device_t sel
}
}
#endif
+ /* FALLTHROUGH */
default:
aprint_error_dev(sc->bge_dev, "can't find mem space\n");
return;
Index: src/sys/dev/pci/if_ipw.c
diff -u src/sys/dev/pci/if_ipw.c:1.71 src/sys/dev/pci/if_ipw.c:1.72
--- src/sys/dev/pci/if_ipw.c:1.71 Sat Dec 22 14:07:53 2018
+++ src/sys/dev/pci/if_ipw.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipw.c,v 1.71 2018/12/22 14:07:53 maxv Exp $ */
+/* $NetBSD: if_ipw.c,v 1.72 2019/02/03 03:19:27 mrg Exp $ */
/* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */
/*-
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.71 2018/12/22 14:07:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.72 2019/02/03 03:19:27 mrg Exp $");
/*-
* Intel(R) PRO/Wireless 2100 MiniPCI driver
@@ -1685,7 +1685,7 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd,
sc->sc_fwname = "ipw2100-1.2.fw";
ipw_free_firmware(sc);
- /* FALLTRHOUGH */
+ /* FALLTHROUGH */
default:
error = ieee80211_ioctl(&sc->sc_ic, cmd, data);
if (error != ENETRESET)
Index: src/sys/dev/pci/if_iwi.c
diff -u src/sys/dev/pci/if_iwi.c:1.110 src/sys/dev/pci/if_iwi.c:1.111
--- src/sys/dev/pci/if_iwi.c:1.110 Sat Dec 22 14:07:53 2018
+++ src/sys/dev/pci/if_iwi.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwi.c,v 1.110 2018/12/22 14:07:53 maxv Exp $ */
+/* $NetBSD: if_iwi.c,v 1.111 2019/02/03 03:19:27 mrg Exp $ */
/* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.110 2018/12/22 14:07:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.111 2019/02/03 03:19:27 mrg Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -1942,8 +1942,8 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd,
error = iwi_cache_firmware(sc);
if (error)
break;
- /* FALLTRHOUGH */
+ /* FALLTHROUGH */
default:
error = ieee80211_ioctl(&sc->sc_ic, cmd, data);
Index: src/sys/dev/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.85 src/sys/dev/pci/if_msk.c:1.86
--- src/sys/dev/pci/if_msk.c:1.85 Sun Jan 27 02:08:42 2019
+++ src/sys/dev/pci/if_msk.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.85 2019/01/27 02:08:42 pgoyette Exp $ */
+/* $NetBSD: if_msk.c,v 1.86 2019/02/03 03:19:27 mrg Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.85 2019/01/27 02:08:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.86 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -657,11 +657,14 @@ out:
case 4:
bus_dmamap_unload(sc->sc_dmatag,
sc_if->sk_cdata.sk_rx_jumbo_map);
+ /* FALLTHROUGH */
case 3:
bus_dmamap_destroy(sc->sc_dmatag,
sc_if->sk_cdata.sk_rx_jumbo_map);
+ /* FALLTHROUGH */
case 2:
bus_dmamem_unmap(sc->sc_dmatag, kva, MSK_JMEM);
+ /* FALLTHROUGH */
case 1:
bus_dmamem_free(sc->sc_dmatag,
&sc_if->sk_cdata.sk_jumbo_seg,
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.93 src/sys/dev/pci/if_sk.c:1.94
--- src/sys/dev/pci/if_sk.c:1.93 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/pci/if_sk.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.93 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_sk.c,v 1.94 2019/02/03 03:19:27 mrg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.93 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.94 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -902,11 +902,14 @@ out:
case 4:
bus_dmamap_unload(sc->sc_dmatag,
sc_if->sk_cdata.sk_rx_jumbo_map);
+ /* FALLTHROUGH */
case 3:
bus_dmamap_destroy(sc->sc_dmatag,
sc_if->sk_cdata.sk_rx_jumbo_map);
+ /* FALLTHROUGH */
case 2:
bus_dmamem_unmap(sc->sc_dmatag, kva, SK_JMEM);
+ /* FALLTHROUGH */
case 1:
bus_dmamem_free(sc->sc_dmatag, &seg, rseg);
break;
@@ -1608,6 +1611,7 @@ skc_attach(device_t parent, device_t sel
memtype, 0, &sc->sk_btag, &sc->sk_bhandle,
&iobase, &iosize) == 0)
break;
+ /* FALLTHROUGH */
default:
aprint_error_dev(sc->sk_dev, "can't find mem space\n");
return;
Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.20 src/sys/dev/pci/mpii.c:1.21
--- src/sys/dev/pci/mpii.c:1.20 Sun Jan 27 02:08:42 2019
+++ src/sys/dev/pci/mpii.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.20 2019/01/27 02:08:42 pgoyette Exp $ */
+/* $NetBSD: mpii.c,v 1.21 2019/02/03 03:19:27 mrg Exp $ */
/* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.20 2019/01/27 02:08:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.21 2019/02/03 03:19:27 mrg Exp $");
#include "bio.h"
@@ -3264,6 +3264,7 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
switch(sie->scsi_status) {
case MPII_SCSIIO_STATUS_CHECK_COND:
xs->error = XS_SENSE;
+ /* FALLTHROUGH */
case MPII_SCSIIO_STATUS_GOOD:
xs->resid = xs->datalen - le32toh(sie->transfer_count);
break;
Index: src/sys/dev/pci/pdcsata.c
diff -u src/sys/dev/pci/pdcsata.c:1.30 src/sys/dev/pci/pdcsata.c:1.31
--- src/sys/dev/pci/pdcsata.c:1.30 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/pdcsata.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pdcsata.c,v 1.30 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: pdcsata.c,v 1.31 2019/02/03 03:19:27 mrg Exp $ */
/*
* Copyright (c) 2004, Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.30 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.31 2019/02/03 03:19:27 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -355,6 +355,7 @@ pdcsata_chip_map(struct pciide_softc *sc
2;
sc->sc_wdcdev.sc_atac.atac_probe = wdc_drvprobe;
+ /* FALLTHROUGH */
default:
aprint_error("unknown promise product 0x%x\n",
sc->sc_pp->ide_product);
Index: src/sys/dev/pci/bktr/bktr_core.c
diff -u src/sys/dev/pci/bktr/bktr_core.c:1.55 src/sys/dev/pci/bktr/bktr_core.c:1.56
--- src/sys/dev/pci/bktr/bktr_core.c:1.55 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/bktr/bktr_core.c Sun Feb 3 03:19:27 2019
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.c,v 1.55 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: bktr_core.c,v 1.56 2019/02/03 03:19:27 mrg Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.55 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.56 2019/02/03 03:19:27 mrg Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -2439,6 +2439,7 @@ common_ioctl(bktr_ptr_t bktr, ioctl_cmd_
break;
}
+ /* FALLTHROUGH */
default:
return(EINVAL);
}
Index: src/sys/dev/pcmcia/if_ray.c
diff -u src/sys/dev/pcmcia/if_ray.c:1.91 src/sys/dev/pcmcia/if_ray.c:1.92
--- src/sys/dev/pcmcia/if_ray.c:1.91 Tue Jan 8 08:47:21 2019
+++ src/sys/dev/pcmcia/if_ray.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.91 2019/01/08 08:47:21 msaitoh Exp $ */
+/* $NetBSD: if_ray.c,v 1.92 2019/02/03 03:19:27 mrg Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.91 2019/01/08 08:47:21 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.92 2019/02/03 03:19:27 mrg Exp $");
#include "opt_inet.h"
@@ -895,6 +895,7 @@ ray_ioctl(struct ifnet *ifp, u_long cmd,
break;
case SIOCADDMULTI:
RAY_DPRINTF(("%s: ioctl: cmd SIOCADDMULTI\n", ifp->if_xname));
+ /* FALLTHROUGH */
case SIOCDELMULTI:
if (cmd == SIOCDELMULTI)
RAY_DPRINTF(("%s: ioctl: cmd SIOCDELMULTI\n",
@@ -907,6 +908,7 @@ ray_ioctl(struct ifnet *ifp, u_long cmd,
break;
case SIOCSIFMEDIA:
RAY_DPRINTF(("%s: ioctl: cmd SIOCSIFMEDIA\n", ifp->if_xname));
+ /* FALLTHROUGH */
case SIOCGIFMEDIA:
if (cmd == SIOCGIFMEDIA)
RAY_DPRINTF(("%s: ioctl: cmd SIOCGIFMEDIA\n",
Index: src/sys/dev/pcmcia/pcmcia_cis.c
diff -u src/sys/dev/pcmcia/pcmcia_cis.c:1.55 src/sys/dev/pcmcia/pcmcia_cis.c:1.56
--- src/sys/dev/pcmcia/pcmcia_cis.c:1.55 Tue May 12 14:42:19 2009
+++ src/sys/dev/pcmcia/pcmcia_cis.c Sun Feb 3 03:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia_cis.c,v 1.55 2009/05/12 14:42:19 cegger Exp $ */
+/* $NetBSD: pcmcia_cis.c,v 1.56 2019/02/03 03:19:27 mrg Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.55 2009/05/12 14:42:19 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.56 2019/02/03 03:19:27 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -408,6 +408,7 @@ pcmcia_scan_cis(device_t dev,
* function. This tuple has structural and
* semantic content.
*/
+ /* FALLTHROUGH */
default:
{
if ((*fct) (&tuple, arg)) {
Index: src/sys/dev/scsipi/atapi_base.c
diff -u src/sys/dev/scsipi/atapi_base.c:1.29 src/sys/dev/scsipi/atapi_base.c:1.30
--- src/sys/dev/scsipi/atapi_base.c:1.29 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/scsipi/atapi_base.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_base.c,v 1.29 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: atapi_base.c,v 1.30 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_base.c,v 1.29 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_base.c,v 1.30 2019/02/03 03:19:28 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,6 +84,7 @@ atapi_interpret_sense(struct scsipi_xfer
switch (key) {
case SKEY_RECOVERED_ERROR:
msg = "soft error (corrected)";
+ /* FALLTHROUGH */
case SKEY_NO_SENSE:
if (xs->resid == xs->datalen)
xs->resid = 0; /* not short read */
Index: src/sys/dev/scsipi/st.c
diff -u src/sys/dev/scsipi/st.c:1.234 src/sys/dev/scsipi/st.c:1.235
--- src/sys/dev/scsipi/st.c:1.234 Sat Mar 24 08:08:19 2018
+++ src/sys/dev/scsipi/st.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.234 2018/03/24 08:08:19 mlelstv Exp $ */
+/* $NetBSD: st.c,v 1.235 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.234 2018/03/24 08:08:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.235 2019/02/03 03:19:28 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -1459,6 +1459,7 @@ stioctl(dev_t dev, u_long cmd, void *arg
break;
case MTBSF: /* backward space file */
number = -number;
+ /* FALLTHROUGH */
case MTFSF: /* forward space file */
error = st_check_eod(st, FALSE, &nmarks, flags);
if (!error)
@@ -1467,6 +1468,7 @@ stioctl(dev_t dev, u_long cmd, void *arg
break;
case MTBSR: /* backward space record */
number = -number;
+ /* FALLTHROUGH */
case MTFSR: /* forward space record */
error = st_check_eod(st, true, &nmarks, flags);
if (!error)
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.167 src/sys/dev/usb/umass.c:1.168
--- src/sys/dev/usb/umass.c:1.167 Tue Jan 22 06:40:49 2019
+++ src/sys/dev/usb/umass.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.167 2019/01/22 06:40:49 skrll Exp $ */
+/* $NetBSD: umass.c,v 1.168 2019/02/03 03:19:28 mrg Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.167 2019/01/22 06:40:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.168 2019/02/03 03:19:28 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1249,7 +1249,8 @@ umass_bbb_state(struct usbd_xfer *xfer,
(uintptr_t)sc, 0, 0, 0);
}
- /* FALLTHROUGH if no data phase, err == 0 */
+ /* if no data phase, err == 0 */
+ /* FALLTHROUGH */
case TSTATE_BBB_DATA:
/* Command transport phase error handling (ignored if no data
* phase (fallthrough from previous state)) */
@@ -1282,7 +1283,8 @@ umass_bbb_state(struct usbd_xfer *xfer,
}
}
- /* FALLTHROUGH, err == 0 (no data phase or successful) */
+ /* err == 0 (no data phase or successful) */
+ /* FALLTHROUGH */
case TSTATE_BBB_DCLEAR: /* stall clear after data phase */
if (sc->transfer_dir == DIR_IN)
memcpy(sc->transfer_data, sc->datain_buffer,
@@ -1292,7 +1294,8 @@ umass_bbb_state(struct usbd_xfer *xfer,
umass_dump_buffer(sc, sc->transfer_data,
sc->transfer_datalen, 48));
- /* FALLTHROUGH, err == 0 (no data phase or successful) */
+ /* err == 0 (no data phase or successful) */
+ /* FALLTHROUGH */
case TSTATE_BBB_SCLEAR: /* stall clear after status phase */
/* Reading of CSW after bulk stall condition in data phase
* (TSTATE_BBB_DATA2) or bulk-in stall condition after
@@ -1719,7 +1722,8 @@ umass_cbi_state(struct usbd_xfer *xfer,
(uintptr_t)sc, 0, 0, 0);
}
- /* FALLTHROUGH if no data phase, err == 0 */
+ /* if no data phase, err == 0 */
+ /* FALLTHROUGH */
case TSTATE_CBI_DATA:
/* Command transport phase error handling (ignored if no data
* phase (fallthrough from previous state)) */
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.176 src/sys/dev/usb/usb.c:1.177
--- src/sys/dev/usb/usb.c:1.176 Tue Jan 29 09:28:50 2019
+++ src/sys/dev/usb/usb.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.176 2019/01/29 09:28:50 pgoyette Exp $ */
+/* $NetBSD: usb.c,v 1.177 2019/02/03 03:19:28 mrg Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.176 2019/01/29 09:28:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.177 2019/02/03 03:19:28 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -671,7 +671,7 @@ usbread(dev_t dev, struct uio *uio, int
case sizeof(struct usb_event_old):
ueo = kmem_zalloc(sizeof(struct usb_event_old), KM_SLEEP);
useold = 1;
- /* FALLTHRU */
+ /* FALLTHROUGH */
case sizeof(struct usb_event):
ue = usb_alloc_event();
break;
@@ -884,6 +884,7 @@ usbioctl(dev_t devt, u_long cmd, void *d
error = EINVAL;
if (error)
goto fail;
+ break;
}
case USB_DEVICESTATS:
Index: src/sys/dev/wscons/wsdisplay.c
diff -u src/sys/dev/wscons/wsdisplay.c:1.152 src/sys/dev/wscons/wsdisplay.c:1.153
--- src/sys/dev/wscons/wsdisplay.c:1.152 Wed Jan 30 11:24:48 2019
+++ src/sys/dev/wscons/wsdisplay.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.152 2019/01/30 11:24:48 jmcneill Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.153 2019/02/03 03:19:28 mrg Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.152 2019/01/30 11:24:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.153 2019/02/03 03:19:28 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_wsdisplay_compat.h"
@@ -1565,7 +1565,7 @@ wsdisplay_cfg_ioctl(struct wsdisplay_sof
if (d->idx == -1 && d->type == WSMUX_KBD)
d->idx = wskbd_pickfree();
#undef d
- /* fall into */
+ /* FALLTHROUGH */
case WSMUXIO_INJECTEVENT:
case WSMUXIO_REMOVE_DEVICE:
case WSMUXIO_LIST_DEVICES:
Index: src/sys/kern/kern_rndpool.c
diff -u src/sys/kern/kern_rndpool.c:1.17 src/sys/kern/kern_rndpool.c:1.18
--- src/sys/kern/kern_rndpool.c:1.17 Mon Sep 3 16:29:35 2018
+++ src/sys/kern/kern_rndpool.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndpool.c,v 1.17 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: kern_rndpool.c,v 1.18 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.17 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.18 2019/02/03 03:19:28 mrg Exp $");
#include <sys/param.h>
#include <sys/rndpool.h>
@@ -182,10 +182,13 @@ rndpool_add_data(rndpool_t *rp,
switch (len) {
case 3:
val = *buf++;
+ /* FALLTHROUGH */
case 2:
val = val << 8 | *buf++;
+ /* FALLTHROUGH */
case 1:
val = val << 8 | *buf++;
+ /* FALLTHROUGH */
}
rndpool_add_one_word(rp, val);
Index: src/sys/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.322 src/sys/kern/kern_synch.c:1.323
--- src/sys/kern/kern_synch.c:1.322 Fri Nov 30 15:05:35 2018
+++ src/sys/kern/kern_synch.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.322 2018/11/30 15:05:35 mlelstv Exp $ */
+/* $NetBSD: kern_synch.c,v 1.323 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.322 2018/11/30 15:05:35 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.323 2019/02/03 03:19:28 mrg Exp $");
#include "opt_kstack.h"
#include "opt_dtrace.h"
@@ -1154,6 +1154,7 @@ sched_pstats(void)
if (l->l_slptime > 1) {
break;
}
+ /* FALLTHROUGH */
case LSRUN:
case LSONPROC:
case LSIDL:
Index: src/sys/kern/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.31 src/sys/kern/sys_descrip.c:1.32
--- src/sys/kern/sys_descrip.c:1.31 Tue Dec 26 08:30:58 2017
+++ src/sys/kern/sys_descrip.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip.c,v 1.31 2017/12/26 08:30:58 kamil Exp $ */
+/* $NetBSD: sys_descrip.c,v 1.32 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.31 2017/12/26 08:30:58 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.32 2019/02/03 03:19:28 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -257,6 +257,7 @@ do_fcntl_lock(int fd, int cmd, struct fl
flg |= F_WAIT;
/* Fall into F_SETLK */
+ /* FALLTHROUGH */
case F_SETLK:
switch (fl->l_type) {
case F_RDLCK:
Index: src/sys/kern/sys_ptrace_common.c
diff -u src/sys/kern/sys_ptrace_common.c:1.46 src/sys/kern/sys_ptrace_common.c:1.47
--- src/sys/kern/sys_ptrace_common.c:1.46 Thu Nov 29 11:45:52 2018
+++ src/sys/kern/sys_ptrace_common.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_ptrace_common.c,v 1.46 2018/11/29 11:45:52 maxv Exp $ */
+/* $NetBSD: sys_ptrace_common.c,v 1.47 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.46 2018/11/29 11:45:52 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.47 2019/02/03 03:19:28 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ptrace.h"
@@ -240,6 +240,7 @@ ptrace_listener_cb(kauth_cred_t cred, ka
break;
}
#endif
+ /* FALLTHROUGH */
case PT_TRACE_ME:
case PT_ATTACH:
case PT_WRITE_I:
@@ -1295,6 +1296,7 @@ do_ptrace(struct ptrace_methods *ptm, st
case PT_SETSTEP:
write = 1;
+ /* FALLTHROUGH */
case PT_CLEARSTEP:
/* write = 0 done above. */
if ((error = ptrace_update_lwp(t, <, data)) != 0)
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.109 src/sys/net/if_fddisubr.c:1.110
--- src/sys/net/if_fddisubr.c:1.109 Wed May 9 06:35:10 2018
+++ src/sys/net/if_fddisubr.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.109 2018/05/09 06:35:10 maxv Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.110 2019/02/03 03:19:28 mrg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.109 2018/05/09 06:35:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.110 2019/02/03 03:19:28 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -358,6 +358,7 @@ fddi_output(struct ifnet *ifp0, struct m
/*FALLTHROUGH*/
}
+ /*FALLTHROUGH*/
case AF_LINK:
{
const struct fddi_header *fh1 =
Index: src/sys/net/if_strip.c
diff -u src/sys/net/if_strip.c:1.112 src/sys/net/if_strip.c:1.113
--- src/sys/net/if_strip.c:1.112 Thu Jan 24 09:33:03 2019
+++ src/sys/net/if_strip.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_strip.c,v 1.112 2019/01/24 09:33:03 knakahara Exp $ */
+/* $NetBSD: if_strip.c,v 1.113 2019/02/03 03:19:28 mrg Exp $ */
/* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.112 2019/01/24 09:33:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.113 2019/02/03 03:19:28 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1011,8 +1011,7 @@ stripinput(int c, struct tty *tp)
if (sc->sc_mp - sc->sc_pktstart == 0)
break;
- /* Fall through to */
-
+ /* FALLTHROUGH */
default:
if (sc->sc_mp < sc->sc_ep) {
*sc->sc_mp++ = c;
@@ -1743,6 +1742,7 @@ StuffData(u_char *src, u_long length, u_
/* else, we only have one so far, so switch to Stuff_Diff code */
code = Stuff_Diff; /* and fall through to Stuff_Diff case below */
+ /* FALLTHROUGH */
case Stuff_Diff: /* Stuff_Diff: We have at least two *different* bytes encoded */
/* If this is a zero, must encode a Stuff_DiffZero, and begin a new block */
if (*src == 0)
Index: src/sys/netbt/hci_ioctl.c
diff -u src/sys/netbt/hci_ioctl.c:1.13 src/sys/netbt/hci_ioctl.c:1.14
--- src/sys/netbt/hci_ioctl.c:1.13 Sat Nov 28 09:04:34 2015
+++ src/sys/netbt/hci_ioctl.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hci_ioctl.c,v 1.13 2015/11/28 09:04:34 plunky Exp $ */
+/* $NetBSD: hci_ioctl.c,v 1.14 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hci_ioctl.c,v 1.13 2015/11/28 09:04:34 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hci_ioctl.c,v 1.14 2019/02/03 03:19:28 mrg Exp $");
#include <sys/param.h>
#include <sys/domain.h>
@@ -168,6 +168,7 @@ hci_ioctl_pcb(unsigned long cmd, void *d
}
/* else fall through and look it up */
+ /* FALLTHROUGH */
case SIOCGBTINFO:
case SIOCSBTFLAGS:
case SIOCSBTPOLICY:
@@ -203,8 +204,9 @@ hci_ioctl_pcb(unsigned long cmd, void *d
break;
}
- /* and fall through to */
+ /* FALLTHROUGH */
case SIOCGBTINFO: /* get unit info */
+ /* FALLTHROUGH */
case SIOCGBTINFOA: /* get info by address */
memset(btr, 0, sizeof(struct btreq));
strlcpy(btr->btr_name, device_xname(unit->hci_dev), HCI_DEVNAME_SIZE);
Index: src/sys/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.175 src/sys/nfs/nfs_serv.c:1.176
--- src/sys/nfs/nfs_serv.c:1.175 Mon Sep 3 16:29:36 2018
+++ src/sys/nfs/nfs_serv.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_serv.c,v 1.175 2018/09/03 16:29:36 riastradh Exp $ */
+/* $NetBSD: nfs_serv.c,v 1.176 2019/02/03 03:19:28 mrg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.175 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.176 2019/02/03 03:19:28 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1467,6 +1467,7 @@ nfsrv_create(struct nfsrv_descript *nfsd
error = EEXIST;
break;
}
+ /* FALLTHROUGH */
case NFSV3CREATE_UNCHECKED:
nfsm_srvsattr(&va);
break;
Index: src/sys/nfs/nfs_syscalls.c
diff -u src/sys/nfs/nfs_syscalls.c:1.160 src/sys/nfs/nfs_syscalls.c:1.161
--- src/sys/nfs/nfs_syscalls.c:1.160 Fri Mar 16 17:25:04 2018
+++ src/sys/nfs/nfs_syscalls.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_syscalls.c,v 1.160 2018/03/16 17:25:04 christos Exp $ */
+/* $NetBSD: nfs_syscalls.c,v 1.161 2019/02/03 03:19:28 mrg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.160 2018/03/16 17:25:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.161 2019/02/03 03:19:28 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -804,6 +804,7 @@ nfssvc_nfsd(struct nfssvc_copy_ops *ops,
nfsrv_updatecache(nd, true, mreq);
nd->nd_mrep = NULL;
}
+ /* FALLTHROUGH */
case RC_REPLY:
m = mreq;
siz = 0;
Index: src/tests/include/t_paths.c
diff -u src/tests/include/t_paths.c:1.16 src/tests/include/t_paths.c:1.17
--- src/tests/include/t_paths.c:1.16 Thu May 7 06:23:23 2015
+++ src/tests/include/t_paths.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_paths.c,v 1.16 2015/05/07 06:23:23 pgoyette Exp $ */
+/* $NetBSD: t_paths.c,v 1.17 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_paths.c,v 1.16 2015/05/07 06:23:23 pgoyette Exp $");
+__RCSID("$NetBSD: t_paths.c,v 1.17 2019/02/03 03:19:28 mrg Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -163,6 +163,7 @@ ATF_TC_BODY(paths, tc)
paths[i].path, errno);
}
+ /* FALLTHROUGH */
case EBUSY: /* FALLTHROUGH */
case ENXIO: /* FALLTHROUGH */
case ENOENT: /* FALLTHROUGH */
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.69 src/tests/lib/libc/sys/t_ptrace_wait.c:1.70
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.69 Tue Jan 22 03:47:45 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.69 2019/01/22 03:47:45 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.70 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.69 2019/01/22 03:47:45 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.70 2019/02/03 03:19:28 mrg Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -113,6 +113,7 @@ traceme_raise(int sigval)
case SIGKILL:
/* NOTREACHED */
FORKEE_ASSERTX(0 && "This shall not be reached");
+ __unreachable();
default:
DPRINTF("Before exiting of the child process\n");
_exit(exitval);
@@ -800,6 +801,7 @@ traceme_vfork_raise(int sigval)
case SIGHUP:
/* NOTREACHED */
FORKEE_ASSERTX(0 && "This shall not be reached");
+ __unreachable();
default:
DPRINTF("Before exiting of the child process\n");
_exit(exitval);
Index: src/tests/lib/libc/sys/t_sendrecv.c
diff -u src/tests/lib/libc/sys/t_sendrecv.c:1.5 src/tests/lib/libc/sys/t_sendrecv.c:1.6
--- src/tests/lib/libc/sys/t_sendrecv.c:1.5 Tue Nov 6 17:55:04 2018
+++ src/tests/lib/libc/sys/t_sendrecv.c Sun Feb 3 03:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sendrecv.c,v 1.5 2018/11/06 17:55:04 christos Exp $ */
+/* $NetBSD: t_sendrecv.c,v 1.6 2019/02/03 03:19:28 mrg Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_sendrecv.c,v 1.5 2018/11/06 17:55:04 christos Exp $");
+__RCSID("$NetBSD: t_sendrecv.c,v 1.6 2019/02/03 03:19:28 mrg Exp $");
#include <atf-c.h>
#include <sys/types.h>
@@ -134,6 +134,7 @@ sendrecv(int rerror)
case -1:
ATF_REQUIRE_MSG(errno == 0,
"socketpair failed (%s)", strerror(errno));
+ __unreachable();
/*NOTREACHED*/
case 0:
sched_yield();
Index: src/usr.bin/colcrt/colcrt.c
diff -u src/usr.bin/colcrt/colcrt.c:1.8 src/usr.bin/colcrt/colcrt.c:1.9
--- src/usr.bin/colcrt/colcrt.c:1.8 Mon Jul 21 14:19:21 2008
+++ src/usr.bin/colcrt/colcrt.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: colcrt.c,v 1.8 2008/07/21 14:19:21 lukem Exp $ */
+/* $NetBSD: colcrt.c,v 1.9 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: colcrt.c,v 1.8 2008/07/21 14:19:21 lukem Exp $");
+__RCSID("$NetBSD: colcrt.c,v 1.9 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -158,6 +158,7 @@ main(int argc, char *argv[])
outcol &= ~7;
outcol--;
c = ' ';
+ /* FALLTHROUGH */
default:
if (outcol >= 132) {
outcol++;
Index: src/usr.bin/ctags/ctags.c
diff -u src/usr.bin/ctags/ctags.c:1.12 src/usr.bin/ctags/ctags.c:1.13
--- src/usr.bin/ctags/ctags.c:1.12 Mon Jul 21 14:19:22 2008
+++ src/usr.bin/ctags/ctags.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ctags.c,v 1.12 2008/07/21 14:19:22 lukem Exp $ */
+/* $NetBSD: ctags.c,v 1.13 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
#endif
-__RCSID("$NetBSD: ctags.c,v 1.12 2008/07/21 14:19:22 lukem Exp $");
+__RCSID("$NetBSD: ctags.c,v 1.13 2019/02/03 03:19:29 mrg Exp $");
#endif /* not lint */
#include <err.h>
@@ -123,6 +123,7 @@ main(int argc, char **argv)
break;
case 'v':
vflag++;
+ /* FALLTHROUGH */
case 'x':
xflag++;
break;
Index: src/usr.bin/ctags/fortran.c
diff -u src/usr.bin/ctags/fortran.c:1.11 src/usr.bin/ctags/fortran.c:1.12
--- src/usr.bin/ctags/fortran.c:1.11 Mon Jul 13 19:05:40 2009
+++ src/usr.bin/ctags/fortran.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fortran.c,v 1.11 2009/07/13 19:05:40 roy Exp $ */
+/* $NetBSD: fortran.c,v 1.12 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: fortran.c,v 1.11 2009/07/13 19:05:40 roy Exp $");
+__RCSID("$NetBSD: fortran.c,v 1.12 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -117,6 +117,7 @@ PF_funcs(void)
case 's':
if (cicmp("subroutine"))
break;
+ /* FALLTHROUGH */
default:
continue;
}
Index: src/usr.bin/deroff/deroff.c
diff -u src/usr.bin/deroff/deroff.c:1.11 src/usr.bin/deroff/deroff.c:1.12
--- src/usr.bin/deroff/deroff.c:1.11 Fri Oct 18 20:47:06 2013
+++ src/usr.bin/deroff/deroff.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: deroff.c,v 1.11 2013/10/18 20:47:06 christos Exp $ */
+/* $NetBSD: deroff.c,v 1.12 2019/02/03 03:19:29 mrg Exp $ */
/* taken from: OpenBSD: deroff.c,v 1.6 2004/06/02 14:58:46 tom Exp */
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: deroff.c,v 1.11 2013/10/18 20:47:06 christos Exp $");
+__RCSID("$NetBSD: deroff.c,v 1.12 2019/02/03 03:19:29 mrg Exp $");
#include <err.h>
#include <limits.h>
@@ -635,6 +635,7 @@ sw:
if (C != '(')
return;
+ /* FALLTHROUGH */
case '(':
if (msflag) {
if (C == 'e') {
Index: src/usr.bin/fstat/fstat.c
diff -u src/usr.bin/fstat/fstat.c:1.111 src/usr.bin/fstat/fstat.c:1.112
--- src/usr.bin/fstat/fstat.c:1.111 Fri Dec 30 21:08:23 2016
+++ src/usr.bin/fstat/fstat.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fstat.c,v 1.111 2016/12/30 21:08:23 christos Exp $ */
+/* $NetBSD: fstat.c,v 1.112 2019/02/03 03:19:29 mrg Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)fstat.c 8.3 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: fstat.c,v 1.111 2016/12/30 21:08:23 christos Exp $");
+__RCSID("$NetBSD: fstat.c,v 1.112 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -1071,6 +1071,7 @@ socktrans(struct socket *sock, int i)
switch (proto.pr_protocol) {
case IPPROTO_UDP:
isdgram = true;
+ /* FALLTHROUGH */
case IPPROTO_TCP:
if (so.so_pcb == NULL)
break;
@@ -1094,6 +1095,7 @@ socktrans(struct socket *sock, int i)
switch (proto.pr_protocol) {
case IPPROTO_UDP:
isdgram = true;
+ /* FALLTHROUGH */
case IPPROTO_TCP:
if (so.so_pcb == NULL)
break;
Index: src/usr.bin/ftp/domacro.c
diff -u src/usr.bin/ftp/domacro.c:1.22 src/usr.bin/ftp/domacro.c:1.23
--- src/usr.bin/ftp/domacro.c:1.22 Sun Apr 12 10:18:52 2009
+++ src/usr.bin/ftp/domacro.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: domacro.c,v 1.22 2009/04/12 10:18:52 lukem Exp $ */
+/* $NetBSD: domacro.c,v 1.23 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)domacro.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: domacro.c,v 1.22 2009/04/12 10:18:52 lukem Exp $");
+__RCSID("$NetBSD: domacro.c,v 1.23 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -102,7 +102,7 @@ domacro(int argc, char *argv[])
}
break;
}
- /* intentional drop through */
+ /* FALLTHROUGH */
default:
*cp2++ = *cp1;
break;
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.23 src/usr.bin/indent/indent.c:1.24
--- src/usr.bin/indent/indent.c:1.23 Mon Sep 5 00:40:29 2016
+++ src/usr.bin/indent/indent.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.23 2016/09/05 00:40:29 sevan Exp $ */
+/* $NetBSD: indent.c,v 1.24 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -75,7 +75,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985 Sun
#if 0
static char sccsid[] = "@(#)indent.c 5.17 (Berkeley) 6/7/93";
#else
-__RCSID("$NetBSD: indent.c,v 1.23 2016/09/05 00:40:29 sevan Exp $");
+__RCSID("$NetBSD: indent.c,v 1.24 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -346,6 +346,7 @@ main(int argc, char **argv)
case newline:
++line_no;
flushed_nl = true;
+ /* FALLTHROUGH */
case form_feed:
break; /* form feeds and newlines found here
* will be ignored */
@@ -365,6 +366,7 @@ main(int argc, char **argv)
goto sw_buffer; /* go to common code to
* get out of this loop */
}
+ /* FALLTHROUGH */
case comment: /* we have a comment, so we must copy
* it into the buffer */
if (!flushed_nl || sc_end != 0) {
@@ -406,6 +408,7 @@ main(int argc, char **argv)
fill_buffer();
break;
}
+ /* FALLTHROUGH */
default: /* it is the start of a normal
* statment */
if (flushed_nl) /* if we flushed a newline,
Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.17 src/usr.bin/indent/io.c:1.18
--- src/usr.bin/indent/io.c:1.17 Thu Feb 25 13:23:27 2016
+++ src/usr.bin/indent/io.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.17 2016/02/25 13:23:27 ginsbach Exp $ */
+/* $NetBSD: io.c,v 1.18 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: io.c,v 1.17 2016/02/25 13:23:27 ginsbach Exp $");
+__RCSID("$NetBSD: io.c,v 1.18 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -232,6 +232,7 @@ dump_line(void)
break;
case '\\':
putc('\\', output);
+ /* FALLTHROUGH */
default:
putc(*follow, output);
}
Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.14 src/usr.bin/indent/lexi.c:1.15
--- src/usr.bin/indent/lexi.c:1.14 Sun Jun 5 18:35:32 2016
+++ src/usr.bin/indent/lexi.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lexi.c,v 1.14 2016/06/05 18:35:32 dholland Exp $ */
+/* $NetBSD: lexi.c,v 1.15 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)lexi.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lexi.c,v 1.14 2016/06/05 18:35:32 dholland Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.15 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -313,6 +313,7 @@ lexi(void)
* Next time around, we will want to know that we have had a
* 'struct'
*/
+ /* FALLTHROUGH */
case 4:/* one of the declaration keywords */
if (ps.p_l_follow) {
ps.cast_mask |= 1 << ps.p_l_follow;
@@ -329,6 +330,7 @@ lexi(void)
case 7:
ps.sizeof_keyword = true;
+ /* FALLTHROUGH */
default: /* all others are treated like any
* other identifier */
return (ident);
Index: src/usr.bin/indent/parse.c
diff -u src/usr.bin/indent/parse.c:1.7 src/usr.bin/indent/parse.c:1.8
--- src/usr.bin/indent/parse.c:1.7 Thu Aug 7 11:14:09 2003
+++ src/usr.bin/indent/parse.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.7 2003/08/07 11:14:09 agc Exp $ */
+/* $NetBSD: parse.c,v 1.8 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: parse.c,v 1.7 2003/08/07 11:14:09 agc Exp $");
+__RCSID("$NetBSD: parse.c,v 1.8 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -125,6 +125,7 @@ parse(int tk)
case ifstmt: /* scanned if (...) */
if (ps.p_stack[ps.tos] == elsehead && ps.else_if) /* "else if ..." */
ps.i_l_follow = ps.il[ps.tos];
+ /* FALLTHROUGH */
case dolit: /* 'do' */
case forstmt: /* for (...) */
ps.p_stack[++ps.tos] = tk;
@@ -327,6 +328,7 @@ reduce(void)
/* <switch> <stmt> */
case_ind = ps.cstk[ps.tos - 1];
+ /* FALLTHROUGH */
case decl: /* finish of a declaration */
case elsehead:
/* <<if> <stmt> else> <stmt> */
Index: src/usr.bin/jot/jot.c
diff -u src/usr.bin/jot/jot.c:1.26 src/usr.bin/jot/jot.c:1.27
--- src/usr.bin/jot/jot.c:1.26 Mon Jun 25 14:29:17 2018
+++ src/usr.bin/jot/jot.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: jot.c,v 1.26 2018/06/25 14:29:17 christos Exp $ */
+/* $NetBSD: jot.c,v 1.27 2019/02/03 03:19:29 mrg Exp $ */
/*-
* Copyright (c) 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: jot.c,v 1.26 2018/06/25 14:29:17 christos Exp $");
+__RCSID("$NetBSD: jot.c,v 1.27 2019/02/03 03:19:29 mrg Exp $");
#endif /* not lint */
/*
@@ -190,6 +190,7 @@ getargs(int argc, char *argv[])
argv[3]);
have |= STEP;
}
+ /* FALLTHROUGH */
case 3:
if (!is_default(argv[2])) {
if (!sscanf(argv[2], "%lf", &ender))
@@ -198,6 +199,7 @@ getargs(int argc, char *argv[])
if (prec < 0)
n = getprec(argv[2]);
}
+ /* FALLTHROUGH */
case 2:
if (!is_default(argv[1])) {
if (!sscanf(argv[1], "%lf", &begin))
@@ -208,6 +210,7 @@ getargs(int argc, char *argv[])
if (n > prec) /* maximum precision */
prec = n;
}
+ /* FALLTHROUGH */
case 1:
if (!is_default(argv[0])) {
reps = strtoul(argv[0], &ep, 0);
@@ -216,6 +219,7 @@ getargs(int argc, char *argv[])
argv[0]);
have |= REPS;
}
+ /* FALLTHROUGH */
case 0:
break;
default:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.221 src/usr.bin/make/var.c:1.222
--- src/usr.bin/make/var.c:1.221 Fri Dec 21 05:50:19 2018
+++ src/usr.bin/make/var.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.221 2018/12/21 05:50:19 sjg Exp $ */
+/* $NetBSD: var.c,v 1.222 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.221 2018/12/21 05:50:19 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.222 2019/02/03 03:19:29 mrg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.221 2018/12/21 05:50:19 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.222 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
#endif
@@ -2400,8 +2400,10 @@ VarHash(char *str)
break;
case 3:
k |= (ustr[2] << 16);
+ /* FALLTHROUGH */
case 2:
k |= (ustr[1] << 8);
+ /* FALLTHROUGH */
case 1:
k |= ustr[0];
len = 0;
Index: src/usr.bin/rdist/gram.y
diff -u src/usr.bin/rdist/gram.y:1.13 src/usr.bin/rdist/gram.y:1.14
--- src/usr.bin/rdist/gram.y:1.13 Mon Apr 13 04:35:36 2009
+++ src/usr.bin/rdist/gram.y Sun Feb 3 03:19:29 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: gram.y,v 1.13 2009/04/13 04:35:36 lukem Exp $ */
+/* $NetBSD: gram.y,v 1.14 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)gram.y 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: gram.y,v 1.13 2009/04/13 04:35:36 lukem Exp $");
+__RCSID("$NetBSD: gram.y,v 1.14 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -219,8 +219,10 @@ again:
;
if (c == EOF)
return(0);
+ /* FALLTHROUGH */
case '\n':
yylineno++;
+ /* FALLTHROUGH */
case ' ':
case '\t': /* skip blanks */
goto again;
Index: src/usr.bin/rdist/server.c
diff -u src/usr.bin/rdist/server.c:1.32 src/usr.bin/rdist/server.c:1.33
--- src/usr.bin/rdist/server.c:1.32 Fri Oct 18 20:41:49 2013
+++ src/usr.bin/rdist/server.c Sun Feb 3 03:19:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.32 2013/10/18 20:41:49 christos Exp $ */
+/* $NetBSD: server.c,v 1.33 2019/02/03 03:19:29 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93";
#else
-__RCSID("$NetBSD: server.c,v 1.32 2013/10/18 20:41:49 christos Exp $");
+__RCSID("$NetBSD: server.c,v 1.33 2019/02/03 03:19:29 mrg Exp $");
#endif
#endif /* not lint */
@@ -231,6 +231,7 @@ server(void)
default:
error("server: unknown command '%s'\n", cp);
+ /* FALLTHROUGH */
case '\0':
continue;
}
@@ -1542,7 +1543,7 @@ response(void)
default:
s--;
- /* fall into... */
+ /* FALLTHROUGH */
case '\1':
case '\2':
nerrs++;
Index: src/usr.bin/rs/rs.c
diff -u src/usr.bin/rs/rs.c:1.15 src/usr.bin/rs/rs.c:1.16
--- src/usr.bin/rs/rs.c:1.15 Tue Sep 6 18:28:58 2011
+++ src/usr.bin/rs/rs.c Sun Feb 3 03:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rs.c,v 1.15 2011/09/06 18:28:58 joerg Exp $ */
+/* $NetBSD: rs.c,v 1.16 2019/02/03 03:19:30 mrg Exp $ */
/*-
* Copyright (c) 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)rs.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: rs.c,v 1.15 2011/09/06 18:28:58 joerg Exp $");
+__RCSID("$NetBSD: rs.c,v 1.16 2019/02/03 03:19:30 mrg Exp $");
#endif
#endif /* not lint */
@@ -400,11 +400,13 @@ getargs(int ac, char *av[])
switch (*p) {
case 'T':
flags |= MTRANSPOSE;
+ /* FALLTHROUGH */
case 't':
flags |= TRANSPOSE;
break;
case 'c': /* input col. separator */
flags |= ONEISEPONLY;
+ /* FALLTHROUGH */
case 's': /* one or more allowed */
if (p[1])
isep = *++p;
@@ -413,6 +415,7 @@ getargs(int ac, char *av[])
break;
case 'C':
flags |= ONEOSEPONLY;
+ /* FALLTHROUGH */
case 'S':
if (p[1])
osep = *++p;
@@ -426,6 +429,7 @@ getargs(int ac, char *av[])
break;
case 'K': /* skip N lines */
flags |= SKIPPRINT;
+ /* FALLTHROUGH */
case 'k': /* skip, do not print */
p = getnum(&skip, p, 0);
if (!skip)
@@ -457,6 +461,7 @@ getargs(int ac, char *av[])
break;
case 'H': /* print shape only */
flags |= DETAILSHAPE;
+ /* FALLTHROUGH */
case 'h':
flags |= SHAPEONLY;
break;
@@ -485,10 +490,13 @@ getargs(int ac, char *av[])
switch (ac) {
/*case 3:
opages = atoi(av[2]);*/
+ /* FALLTHROUGH */
case 2:
ocols = atoi(av[1]);
+ /* FALLTHROUGH */
case 1:
orows = atoi(av[0]);
+ /* FALLTHROUGH */
case 0:
break;
default:
Index: src/usr.bin/sockstat/sockstat.c
diff -u src/usr.bin/sockstat/sockstat.c:1.19 src/usr.bin/sockstat/sockstat.c:1.20
--- src/usr.bin/sockstat/sockstat.c:1.19 Sat Jan 14 01:01:48 2017
+++ src/usr.bin/sockstat/sockstat.c Sun Feb 3 03:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sockstat.c,v 1.19 2017/01/14 01:01:48 christos Exp $ */
+/* $NetBSD: sockstat.c,v 1.20 2019/02/03 03:19:30 mrg Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: sockstat.c,v 1.19 2017/01/14 01:01:48 christos Exp $");
+__RCSID("$NetBSD: sockstat.c,v 1.20 2019/02/03 03:19:30 mrg Exp $");
#endif
#define _KMEMUSER
@@ -251,6 +251,7 @@ parse_ports(const char *l)
switch (*e) {
case ',':
e++;
+ /* FALLTHROUGH */
case '\0':
bit_set(portmap, i);
s = e;
Index: src/usr.bin/ul/ul.c
diff -u src/usr.bin/ul/ul.c:1.19 src/usr.bin/ul/ul.c:1.20
--- src/usr.bin/ul/ul.c:1.19 Thu Jun 23 03:58:13 2016
+++ src/usr.bin/ul/ul.c Sun Feb 3 03:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ul.c,v 1.19 2016/06/23 03:58:13 abhinav Exp $ */
+/* $NetBSD: ul.c,v 1.20 2019/02/03 03:19:30 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: ul.c,v 1.19 2016/06/23 03:58:13 abhinav Exp $");
+__RCSID("$NetBSD: ul.c,v 1.20 2019/02/03 03:19:30 mrg Exp $");
#endif /* not lint */
#include <err.h>
@@ -222,6 +222,7 @@ filter(FILE *f)
obuf[col].c_mode |= UNDERL | mode;
else
obuf[col].c_char = '_';
+ /* FALLTHROUGH */
case ' ':
col++;
if (col > maxcol)
Index: src/usr.bin/vgrind/vfontedpr.c
diff -u src/usr.bin/vgrind/vfontedpr.c:1.17 src/usr.bin/vgrind/vfontedpr.c:1.18
--- src/usr.bin/vgrind/vfontedpr.c:1.17 Mon Sep 5 00:40:30 2016
+++ src/usr.bin/vgrind/vfontedpr.c Sun Feb 3 03:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfontedpr.c,v 1.17 2016/09/05 00:40:30 sevan Exp $ */
+/* $NetBSD: vfontedpr.c,v 1.18 2019/02/03 03:19:30 mrg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)vfontedpr.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: vfontedpr.c,v 1.17 2016/09/05 00:40:30 sevan Exp $");
+__RCSID("$NetBSD: vfontedpr.c,v 1.18 2019/02/03 03:19:30 mrg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -660,6 +660,7 @@ putcp(int c)
default:
if (c < 040)
putchar('^'), c |= '@';
+ /* FALLTHROUGH */
case '\t':
case '\n':
putchar(c);
Index: src/usr.sbin/acpitools/aml/aml_store.c
diff -u src/usr.sbin/acpitools/aml/aml_store.c:1.1 src/usr.sbin/acpitools/aml/aml_store.c:1.2
--- src/usr.sbin/acpitools/aml/aml_store.c:1.1 Sun Jan 14 04:36:13 2007
+++ src/usr.sbin/acpitools/aml/aml_store.c Sun Feb 3 03:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: aml_store.c,v 1.1 2007/01/14 04:36:13 christos Exp $ */
+/* $NetBSD: aml_store.c,v 1.2 2019/02/03 03:19:30 mrg Exp $ */
/*-
* Copyright (c) 1999 Takanori Watanabe
@@ -30,7 +30,7 @@
* $FreeBSD: src/usr.sbin/acpi/amldb/aml/aml_store.c,v 1.3 2000/11/09 06:24:45 iwasaki Exp $
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: aml_store.c,v 1.1 2007/01/14 04:36:13 christos Exp $");
+__RCSID("$NetBSD: aml_store.c,v 1.2 2019/02/03 03:19:30 mrg Exp $");
#include <sys/param.h>
@@ -348,6 +348,7 @@ aml_store_to_name(struct aml_environ *en
case aml_t_num:
if (name == &env->tempname)
break;
+ /* FALLTHROUGH */
default:
aml_store_to_object(env, obj, name->property);
break;
Index: src/usr.sbin/bootp/common/readfile.c
diff -u src/usr.sbin/bootp/common/readfile.c:1.20 src/usr.sbin/bootp/common/readfile.c:1.21
--- src/usr.sbin/bootp/common/readfile.c:1.20 Wed Jan 11 12:18:22 2017
+++ src/usr.sbin/bootp/common/readfile.c Sun Feb 3 03:19:30 2019
@@ -22,7 +22,7 @@ SOFTWARE.
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: readfile.c,v 1.20 2017/01/11 12:18:22 joerg Exp $");
+__RCSID("$NetBSD: readfile.c,v 1.21 2019/02/03 03:19:30 mrg Exp $");
#endif
@@ -603,6 +603,7 @@ read_entry(FILE *fp, char *buffer, unsig
}
}
/* fall through if "other" character */
+ /* FALLTHROUGH */
default:
*buffer++ = c; /* Store other characters */
length++;
Index: src/usr.sbin/btdevctl/db.c
diff -u src/usr.sbin/btdevctl/db.c:1.4 src/usr.sbin/btdevctl/db.c:1.5
--- src/usr.sbin/btdevctl/db.c:1.4 Fri Aug 17 17:59:16 2007
+++ src/usr.sbin/btdevctl/db.c Sun Feb 3 03:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db.c,v 1.4 2007/08/17 17:59:16 pavel Exp $ */
+/* $NetBSD: db.c,v 1.5 2019/02/03 03:19:30 mrg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: db.c,v 1.4 2007/08/17 17:59:16 pavel Exp $");
+__RCSID("$NetBSD: db.c,v 1.5 2019/02/03 03:19:30 mrg Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -77,7 +77,9 @@ db_get(bdaddr_t *laddr, bdaddr_t *raddr,
obj = prop_dictionary_get(db, "btdevctl-version");
switch(prop_number_integer_value(obj)) {
case 0: db_update0();
+ /* FALLTHROUGH */
case 1: db_update1();
+ /* FALLTHROUGH */
case BTDEVCTL_VERSION:
break;
Index: src/usr.sbin/lpr/filters/lpf.c
diff -u src/usr.sbin/lpr/filters/lpf.c:1.14 src/usr.sbin/lpr/filters/lpf.c:1.15
--- src/usr.sbin/lpr/filters/lpf.c:1.14 Tue Aug 30 19:27:37 2011
+++ src/usr.sbin/lpr/filters/lpf.c Sun Feb 3 03:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lpf.c,v 1.14 2011/08/30 19:27:37 joerg Exp $ */
+/* $NetBSD: lpf.c,v 1.15 2019/02/03 03:19:30 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -35,7 +35,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)lpf.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lpf.c,v 1.14 2011/08/30 19:27:37 joerg Exp $");
+__RCSID("$NetBSD: lpf.c,v 1.15 2019/02/03 03:19:30 mrg Exp $");
#endif
#endif /* not lint */
@@ -135,6 +135,7 @@ main(int argc, char *argv[])
case '\f':
lineno = length;
+ /* FALLTHROUGH */
case '\n':
if (crnl && prch != '\r')
need_cr = 1;
@@ -171,6 +172,7 @@ main(int argc, char *argv[])
ch = '\031';
}
+ /* FALLTHROUGH */
default:
if (col >= width || (!literal && ch < ' ')) {
col++;
Index: src/usr.sbin/lpr/lpd/printjob.c
diff -u src/usr.sbin/lpr/lpd/printjob.c:1.56 src/usr.sbin/lpr/lpd/printjob.c:1.57
--- src/usr.sbin/lpr/lpd/printjob.c:1.56 Tue Aug 30 19:27:37 2011
+++ src/usr.sbin/lpr/lpd/printjob.c Sun Feb 3 03:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: printjob.c,v 1.56 2011/08/30 19:27:37 joerg Exp $ */
+/* $NetBSD: printjob.c,v 1.57 2019/02/03 03:19:30 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
#else
-__RCSID("$NetBSD: printjob.c,v 1.56 2011/08/30 19:27:37 joerg Exp $");
+__RCSID("$NetBSD: printjob.c,v 1.57 2019/02/03 03:19:30 mrg Exp $");
#endif
#endif /* not lint */
@@ -605,6 +605,7 @@ print(int format, char *file)
return(ERROR);
}
fi = p[0]; /* use pipe for input */
+ /* FALLTHROUGH */
case 'f': /* print plain text file */
prog = IF;
av[1] = width;
@@ -850,6 +851,7 @@ sendit(char *file)
return(REPRINT);
case ACCESS:
sendmail(logname, ACCESS);
+ /* FALLTHROUGH */
case ERROR:
err = ERROR;
}
Index: src/usr.sbin/lpr/lprm/lprm.c
diff -u src/usr.sbin/lpr/lprm/lprm.c:1.19 src/usr.sbin/lpr/lprm/lprm.c:1.20
--- src/usr.sbin/lpr/lprm/lprm.c:1.19 Mon Jul 21 13:36:58 2008
+++ src/usr.sbin/lpr/lprm/lprm.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lprm.c,v 1.19 2008/07/21 13:36:58 lukem Exp $ */
+/* $NetBSD: lprm.c,v 1.20 2019/02/03 03:19:31 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lprm.c,v 1.19 2008/07/21 13:36:58 lukem Exp $");
+__RCSID("$NetBSD: lprm.c,v 1.20 2019/02/03 03:19:31 mrg Exp $");
#endif
#endif /* not lint */
@@ -129,6 +129,7 @@ main(int argc, char *argv[])
users = -1;
break;
}
+ /* FALLTHROUGH */
default:
usage();
}
Index: src/usr.sbin/makefs/udf.c
diff -u src/usr.sbin/makefs/udf.c:1.18 src/usr.sbin/makefs/udf.c:1.19
--- src/usr.sbin/makefs/udf.c:1.18 Wed Feb 8 21:33:12 2017
+++ src/usr.sbin/makefs/udf.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.18 2017/02/08 21:33:12 christos Exp $ */
+/* $NetBSD: udf.c,v 1.19 2019/02/03 03:19:31 mrg Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: udf.c,v 1.18 2017/02/08 21:33:12 christos Exp $");
+__RCSID("$NetBSD: udf.c,v 1.19 2019/02/03 03:19:31 mrg Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -201,7 +201,7 @@ udf_emulate_discinfo(fsinfo_t *fsopts, s
case 0x10: /* DVDROM */
case 0x40: /* BDROM */
req_enable |= FORMAT_READONLY;
- /* FALLTROUGH */
+ /* FALLTHROUGH */
case 0x01: /* disc */
/* set up a disc info profile for partitions/files */
di->mmc_class = MMC_CLASS_DISC;
@@ -878,6 +878,7 @@ udf_estimate_walk(fsinfo_t *fsopts,
case S_IFDIR:
if (strcmp(cur->name, ".") == 0)
continue;
+ /* FALLTHROUGH */
case S_IFLNK:
case S_IFREG:
/* create dummy FID to see how long name will become */
Index: src/usr.sbin/map-mbone/mapper.c
diff -u src/usr.sbin/map-mbone/mapper.c:1.27 src/usr.sbin/map-mbone/mapper.c:1.28
--- src/usr.sbin/map-mbone/mapper.c:1.27 Sun Feb 4 09:01:13 2018
+++ src/usr.sbin/map-mbone/mapper.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mapper.c,v 1.27 2018/02/04 09:01:13 mrg Exp $ */
+/* $NetBSD: mapper.c,v 1.28 2019/02/03 03:19:31 mrg Exp $ */
/* Mapper for connections between MRouteD multicast routers.
* Written by Pavel Curtis <[email protected]>
@@ -173,8 +173,11 @@ logit(int severity, int syserr, const ch
switch (debug) {
case 0: if (severity > LOG_WARNING) return;
+ /* FALLTHROUGH */
case 1: if (severity > LOG_NOTICE ) return;
+ /* FALLTHROUGH */
case 2: if (severity > LOG_INFO ) return;
+ /* FALLTHROUGH */
default:
fmt[0] = '\0';
if (severity == LOG_WARNING)
Index: src/usr.sbin/mrouted/main.c
diff -u src/usr.sbin/mrouted/main.c:1.25 src/usr.sbin/mrouted/main.c:1.26
--- src/usr.sbin/mrouted/main.c:1.25 Wed Aug 31 16:24:59 2011
+++ src/usr.sbin/mrouted/main.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.25 2011/08/31 16:24:59 plunky Exp $ */
+/* $NetBSD: main.c,v 1.26 2019/02/03 03:19:31 mrg Exp $ */
/*
* The mrouted program is covered by the license in the accompanying file
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("@(#) $NetBSD: main.c,v 1.25 2011/08/31 16:24:59 plunky Exp $");
+__RCSID("@(#) $NetBSD: main.c,v 1.26 2019/02/03 03:19:31 mrg Exp $");
#endif
#include <ctype.h>
@@ -643,7 +643,9 @@ logit(int severity, int syserr, const ch
switch (debug) {
case 0: break;
case 1: if (severity > LOG_NOTICE) break;
+ /* FALLTHROUGH */
case 2: if (severity > LOG_INFO ) break;
+ /* FALLTHROUGH */
default:
gettimeofday(&now,NULL);
t = now.tv_sec;
Index: src/usr.sbin/mtrace/mtrace.c
diff -u src/usr.sbin/mtrace/mtrace.c:1.41 src/usr.sbin/mtrace/mtrace.c:1.42
--- src/usr.sbin/mtrace/mtrace.c:1.41 Sun Mar 13 19:47:59 2016
+++ src/usr.sbin/mtrace/mtrace.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mtrace.c,v 1.41 2016/03/13 19:47:59 christos Exp $ */
+/* $NetBSD: mtrace.c,v 1.42 2019/02/03 03:19:31 mrg Exp $ */
/*
* mtrace.c
@@ -52,7 +52,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mtrace.c,v 1.41 2016/03/13 19:47:59 christos Exp $");
+__RCSID("$NetBSD: mtrace.c,v 1.42 2019/02/03 03:19:31 mrg Exp $");
#endif
#include <sys/types.h>
@@ -1672,8 +1672,11 @@ logit(int severity, int syserr, const ch
switch (debug) {
case 0: if (severity > LOG_WARNING) return;
+ /* FALLTHROUGH */
case 1: if (severity > LOG_NOTICE) return;
+ /* FALLTHROUGH */
case 2: if (severity > LOG_INFO ) return;
+ /* FALLTHROUGH */
default:
if (severity == LOG_WARNING)
fprintf(stderr, "warning - ");
Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.57 src/usr.sbin/npf/npfctl/npfctl.c:1.58
--- src/usr.sbin/npf/npfctl/npfctl.c:1.57 Sat Jan 19 21:19:32 2019
+++ src/usr.sbin/npf/npfctl/npfctl.c Sun Feb 3 03:19:31 2019
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npfctl.c,v 1.57 2019/01/19 21:19:32 rmind Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.58 2019/02/03 03:19:31 mrg Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -651,6 +651,7 @@ npfctl_conn_list(int fd, int argc, char
break;
case 'h':
header = false;
+ break;
case 'i':
f.ifname = optarg;
break;
Index: src/usr.sbin/rtadvd/advcap.c
diff -u src/usr.sbin/rtadvd/advcap.c:1.17 src/usr.sbin/rtadvd/advcap.c:1.18
--- src/usr.sbin/rtadvd/advcap.c:1.17 Mon Nov 6 15:15:04 2017
+++ src/usr.sbin/rtadvd/advcap.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: advcap.c,v 1.17 2017/11/06 15:15:04 christos Exp $ */
+/* $NetBSD: advcap.c,v 1.18 2019/02/03 03:19:31 mrg Exp $ */
/* $KAME: advcap.c,v 1.11 2003/05/19 09:46:50 keiichi Exp $ */
/*
@@ -282,6 +282,7 @@ tskip(char *bp)
;
} else
bp++;
+ /* FALLTHROUGH */
case '"':
dquote = (dquote ? 0 : 1);
bp++;
Index: src/usr.sbin/sup/source/supfilesrv.c
diff -u src/usr.sbin/sup/source/supfilesrv.c:1.51 src/usr.sbin/sup/source/supfilesrv.c:1.52
--- src/usr.sbin/sup/source/supfilesrv.c:1.51 Thu May 4 16:26:10 2017
+++ src/usr.sbin/sup/source/supfilesrv.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: supfilesrv.c,v 1.51 2017/05/04 16:26:10 sevan Exp $ */
+/* $NetBSD: supfilesrv.c,v 1.52 2019/02/03 03:19:31 mrg Exp $ */
/*
* Copyright (c) 1992 Carnegie Mellon University
@@ -1285,6 +1285,7 @@ denyone(TREE * t, void *v __unused)
}
if (update)
t->Tflags |= FUPDATE;
+ /* FALLTHROUGH */
case S_IFDIR:
t->Tuid = sbuf.st_uid;
t->Tgid = sbuf.st_gid;
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.130 src/usr.sbin/syslogd/syslogd.c:1.131
--- src/usr.sbin/syslogd/syslogd.c:1.130 Mon Nov 5 10:27:06 2018
+++ src/usr.sbin/syslogd/syslogd.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.130 2018/11/05 10:27:06 martin Exp $ */
+/* $NetBSD: syslogd.c,v 1.131 2019/02/03 03:19:31 mrg Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.130 2018/11/05 10:27:06 martin Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.131 2019/02/03 03:19:31 mrg Exp $");
#endif
#endif /* not lint */
@@ -2333,6 +2333,7 @@ fprintlog(struct filed *f, struct buf_ms
(buffer->host ? buffer->host : buffer->recvhost),
buffer->timestamp);
ADDEV();
+ /* FALLTHROUGH */
case F_USERS: /* fallthrough */
/* filter non-ASCII */
p = line;
Index: src/usr.sbin/wsmuxctl/wsmuxctl.c
diff -u src/usr.sbin/wsmuxctl/wsmuxctl.c:1.11 src/usr.sbin/wsmuxctl/wsmuxctl.c:1.12
--- src/usr.sbin/wsmuxctl/wsmuxctl.c:1.11 Tue Aug 30 21:03:31 2011
+++ src/usr.sbin/wsmuxctl/wsmuxctl.c Sun Feb 3 03:19:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmuxctl.c,v 1.11 2011/08/30 21:03:31 joerg Exp $ */
+/* $NetBSD: wsmuxctl.c,v 1.12 2019/02/03 03:19:31 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -132,6 +132,7 @@ main(int argc, char **argv)
break;
case 'L':
recursive++;
+ /* FALLTHROUGH */
case 'l':
list++;
break;
