8 files changed, 22 insertions, 20 deletions

diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 78f655e1d857..5595fd3321fb 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -733,7 +733,7 @@ main(int argc, char *argv[])
     case MOUSE_PROTO_INPORT:
         /* INPORT and BUS are the same... */
 	rodent.rtype = MOUSE_PROTO_BUS;
-	/* FALL THROUGH */
+	/* FALLTHROUGH */
     case MOUSE_PROTO_BUS:
 	if (!rodent.portname)
 	    rodent.portname = "/dev/mse0";
@@ -1398,7 +1398,7 @@ r_init(void)
     case MOUSE_PROTO_SYSMOUSE:
 	if (rodent.hw.iftype == MOUSE_IF_SYSMOUSE)
 	    setmousespeed(1200, rodent.baudrate, rodentcflags[rodent.rtype]);
-	/* fall through */
+	/* FALLTHROUGH */
 
     case MOUSE_PROTO_BUS:
     case MOUSE_PROTO_INPORT:
@@ -1877,7 +1877,7 @@ r_protocol(u_char rBuf, mousestatus_t *act)
 		    break;
 		case 0:
 		    /* device type packet - shouldn't happen */
-		    /* FALL THROUGH */
+		    /* FALLTHROUGH */
 		default:
 		    act->dx = act->dy = 0;
 		    act->button = act->obutton;
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index f28e2f68c6f9..0fcf865264fb 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -25,9 +25,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 
 #include <string.h>
@@ -160,7 +162,7 @@ async_Decode(struct async *async, u_char c)
       async->mode |= MODE_ESC;
       break;
     }
-    /* Fall into ... */
+    /* FALLTHROUGH */
   default:
     if (async->length >= HDLCSIZE) {
       /* packet is too large, discard it */
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index 048a21b7c24d..a9a05b8fda1f 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -267,7 +267,7 @@ datalink_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w, fd_set *e,
         datalink_Up(dl, 1, 1);
       else
         break;
-      /* fall through */
+      /* FALLTHROUGH */
 
     case DATALINK_OPENING:
       if (dl->dial.timer.state != TIMER_RUNNING) {
@@ -621,7 +621,7 @@ datalink_NCPUp(struct datalink *dl)
         /* First link in the bundle */
         auth_Select(dl->bundle, dl->peer.authname);
         bundle_CalculateBandwidth(dl->bundle);
-        /* fall through */
+        /* FALLTHROUGH */
       case MP_ADDED:
         /* We're in multilink mode ! */
         dl->physical->link.ccp.fsm.open_mode = OPEN_PASSIVE;	/* override */
@@ -756,12 +756,12 @@ datalink_LayerDown(void *v, struct fsm *fp)
         fsm2initial(&dl->physical->link.ccp.fsm);
         datalink_NewState(dl, DATALINK_LCP);  /* before parent TLD */
         (*dl->parent->LayerDown)(dl->parent->object, fp);
-        /* fall through (just in case) */
+        /* FALLTHROUGH (just in case) */
 
       case DATALINK_CBCP:
         if (!dl->cbcp.required)
           cbcp_Down(&dl->cbcp);
-        /* fall through (just in case) */
+        /* FALLTHROUGH (just in case) */
 
       case DATALINK_AUTH:
         timer_Stop(&dl->pap.authtimer);
@@ -980,7 +980,7 @@ datalink_Up(struct datalink *dl, int runscripts, int packetmode)
     case DATALINK_OPENING:
       if (!dl->script.run && runscripts)
         dl->script.run = 1;
-      /* fall through */
+      /* FALLTHROUGH */
 
     case DATALINK_DIAL:
     case DATALINK_LOGIN:
@@ -1004,7 +1004,7 @@ datalink_Close(struct datalink *dl, int how)
     case DATALINK_OPEN:
       peerid_Init(&dl->peer);
       fsm2initial(&dl->physical->link.ccp.fsm);
-      /* fall through */
+      /* FALLTHROUGH */
 
     case DATALINK_CBCP:
     case DATALINK_AUTH:
@@ -1030,7 +1030,7 @@ datalink_Down(struct datalink *dl, int how)
     case DATALINK_OPEN:
       peerid_Init(&dl->peer);
       fsm2initial(&dl->physical->link.ccp.fsm);
-      /* fall through */
+      /* FALLTHROUGH */
 
     case DATALINK_CBCP:
     case DATALINK_AUTH:
@@ -1038,7 +1038,7 @@ datalink_Down(struct datalink *dl, int how)
       fsm2initial(&dl->physical->link.lcp.fsm);
       if (dl->state == DATALINK_OPENING)
         return;			/* we're doing a callback... */
-      /* fall through */
+      /* FALLTHROUGH */
 
     default:
       datalink_ComeDown(dl, how);
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index eea7b7d90a71..685e5f107df6 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -556,7 +556,7 @@ FsmRecvConfigReq(struct fsm *fp, struct fsmheader *lhp, struct mbuf *bp)
        */
     (*fp->fn->LayerStart)(fp);
     (*fp->parent->LayerStart)(fp->parent->object, fp);
-    /* Fall through */
+    /* FALLTHROUGH */
 
   case ST_OPENED:
     if (ackaction)
diff --git a/usr.sbin/ppp/prompt.c b/usr.sbin/ppp/prompt.c
index 7f1f94e78afc..09317065b7db 100644
--- a/usr.sbin/ppp/prompt.c
+++ b/usr.sbin/ppp/prompt.c
@@ -223,7 +223,7 @@ prompt_Read(struct fdescriptor *d, struct bundle *bundle, const fd_set *fdset)
       prompt_TtyCommandMode(p);
       p->nonewline = 0;
       /* We'll get a prompt because of our status change */
-      /* Fall through */
+      /* FALLTHROUGH */
 
     default:
       /* Wait 'till we're in a state we care about */
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index 299530140f1a..5bf45e5ad4be 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -317,7 +317,7 @@ found:
 	ntohs(cs->cs_ip.ip_len) == hlen)
       break;
 
-    /* (fall through) */
+    /* FALLTHROUGH */
 
   case SPECIAL_I:
   case SPECIAL_D:
diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c
index a1fd948d3617..7f5882c28ecd 100644
--- a/usr.sbin/pppd/fsm.c
+++ b/usr.sbin/pppd/fsm.c
@@ -170,7 +170,7 @@ fsm_open(f)
 
     case CLOSING:
 	f->state = STOPPING;
-	/* fall through */
+	/* FALLTHROUGH */
     case STOPPED:
     case OPENED:
 	if( f->flags & OPT_RESTART ){
@@ -674,7 +674,7 @@ fsm_protreject(f)
     switch( f->state ){
     case CLOSING:
 	UNTIMEOUT(fsm_timeout, f);	/* Cancel timeout */
-	/* fall through */
+	/* FALLTHROUGH */
     case CLOSED:
 	f->state = CLOSED;
 	if( f->callbacks->finished )
@@ -686,7 +686,7 @@ fsm_protreject(f)
     case ACKRCVD:
     case ACKSENT:
 	UNTIMEOUT(fsm_timeout, f);	/* Cancel timeout */
-	/* fall through */
+	/* FALLTHROUGH */
     case STOPPED:
 	f->state = STOPPED;
 	if( f->callbacks->finished )
diff --git a/usr.sbin/stallion/stlstats/stlstats.c b/usr.sbin/stallion/stlstats/stlstats.c
index 59fedbd89be8..160a12f49ccc 100644
--- a/usr.sbin/stallion/stlstats/stlstats.c
+++ b/usr.sbin/stallion/stlstats/stlstats.c
@@ -308,7 +308,7 @@ void menuport()
 		case 'e':
 		case 'f':
 			ch = (ch - 'a' + '0' + 10);
-			/* fall thru */
+			/* FALLTHROUGH */
 		case '0':
 		case '1':
 		case '2':