Replace various spelling with FALLTHROUGH which is lint()able

7 files changed, 20 insertions, 18 deletions

diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 5be1dca..9baec88 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -458,13 +458,13 @@ dumpino(union dinode *dp, ino_t ino)
 			return;
 		}
 #endif
-		/* fall through */
+		/* FALLTHROUGH */
 
 	case S_IFDIR:
 	case S_IFREG:
 		if (DIP(dp, di_size) > 0)
 			break;
-		/* fall through */
+		/* FALLTHROUGH */
 
 	case S_IFIFO:
 	case S_IFSOCK:
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 597181d..388dc8e 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
 #if 0
+#ifndef lint
 static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
@@ -406,7 +407,7 @@ again:
 		case DSTATE:
 			if (inoinfo(idesc->id_number)->ino_state == DFOUND)
 				inoinfo(dirp->d_ino)->ino_state = DFOUND;
-			/* fall through */
+			/* FALLTHROUGH */
 
 		case DFOUND:
 			inp = getinoinfo(dirp->d_ino);
@@ -431,7 +432,7 @@ again:
 			}
 			if (idesc->id_entryno > 2)
 				inp->i_parent = idesc->id_number;
-			/* fall through */
+			/* FALLTHROUGH */
 
 		case FSTATE:
 			if (dirp->d_type != inoinfo(dirp->d_ino)->ino_type) {
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index 1d81d05..6685e39 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
 #if 0
+#ifndef lint
 static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -215,7 +216,7 @@ pass5(void)
 			case DCLEAR:
 			case DFOUND:
 				newcg->cg_cs.cs_ndir++;
-				/* fall through */
+				/* FALLTHROUGH */
 
 			case FSTATE:
 			case FCLEAR:
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 54f16e3..5bfe821 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -594,7 +594,7 @@ mkentry(char *name, struct direct *dp, struct afile *fp)
 	default:
 		fprintf(stderr, "Warning: undefined file type %d\n",
 		    dp->d_type);
-		/* fall through */
+		/* FALLTHROUGH */
 	case DT_REG:
 		fp->postfix = ' ';
 		break;
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 96f6c2d..8b463a7 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -321,7 +321,7 @@ nodeupdates(char *name, ino_t ino, int type)
 		} else {
 			mktempname(np);
 		}
-		/* fall through */
+		/* FALLTHROUGH */
 
 	/*
 	 * A previously non-existent file.
@@ -352,7 +352,7 @@ nodeupdates(char *name, ino_t ino, int type)
 	case ONTAPE|INOFND:
 		if (type == LEAF && (ip->e_flags & KEEP) == 0)
 			ip->e_flags |= EXTRACT;
-		/* fall through */
+		/* FALLTHROUGH */
 	case INOFND:
 		if ((ip->e_flags & KEEP) == 0) {
 			renameit(myname(ip), name);
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index 0077ba0..cc110ef 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -727,7 +727,7 @@ supply(struct sockaddr_in *dst,
 
 	case OUT_QUERY:
 		ws.state |= WS_ST_QUERY;
-		/* fall through */
+		/* FALLTHROUGH */
 	case OUT_BROADCAST:
 	case OUT_UNICAST:
 		v2buf.type = (vers == RIPv2) ? type : NO_OUT_RIPV2;
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index f499f63..bb5c4c1 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -596,7 +596,7 @@ show_var(int *oid, int nlen)
 				printf("%s%s", name, sep);
 			return ((*func)(len, p));
 		}
-		/* FALL THROUGH */
+		/* FALLTHROUGH */
 	default:
 		if (!oflag && !xflag)
 			return (1);