summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/ppp/ppp/async.c4
-rw-r--r--usr.sbin/ppp/ppp/datalink.c18
-rw-r--r--usr.sbin/ppp/ppp/fsm.c4
-rw-r--r--usr.sbin/ppp/ppp/prompt.c4
-rw-r--r--usr.sbin/ppp/ppp/slcompress.c4
5 files changed, 17 insertions, 17 deletions
diff --git a/usr.sbin/ppp/ppp/async.c b/usr.sbin/ppp/ppp/async.c
index 8e7825ff037..e17aff919a3 100644
--- a/usr.sbin/ppp/ppp/async.c
+++ b/usr.sbin/ppp/ppp/async.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenBSD: async.c,v 1.12 2004/11/16 14:47:02 brad Exp $
+ * $OpenBSD: async.c,v 1.13 2005/07/17 20:24:45 brad Exp $
*/
#include <sys/types.h>
@@ -164,7 +164,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/ppp/datalink.c b/usr.sbin/ppp/ppp/datalink.c
index bb6f6c67c16..dcac70fb90a 100644
--- a/usr.sbin/ppp/ppp/datalink.c
+++ b/usr.sbin/ppp/ppp/datalink.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenBSD: datalink.c,v 1.45 2005/07/17 19:13:24 brad Exp $
+ * $OpenBSD: datalink.c,v 1.46 2005/07/17 20:24:45 brad Exp $
*/
#include <sys/param.h>
@@ -269,7 +269,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) {
@@ -623,7 +623,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 */
@@ -758,12 +758,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);
@@ -982,7 +982,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:
@@ -1006,7 +1006,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:
@@ -1032,7 +1032,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:
@@ -1040,7 +1040,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/ppp/fsm.c b/usr.sbin/ppp/ppp/fsm.c
index 73f73142ef7..f34d2ce0cbc 100644
--- a/usr.sbin/ppp/ppp/fsm.c
+++ b/usr.sbin/ppp/ppp/fsm.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenBSD: fsm.c,v 1.23 2002/06/15 08:02:41 brian Exp $
+ * $OpenBSD: fsm.c,v 1.24 2005/07/17 20:24:45 brad Exp $
*/
#include <sys/param.h>
@@ -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/ppp/prompt.c b/usr.sbin/ppp/ppp/prompt.c
index 0d37ca287df..47f2fef4b39 100644
--- a/usr.sbin/ppp/ppp/prompt.c
+++ b/usr.sbin/ppp/ppp/prompt.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenBSD: prompt.c,v 1.16 2005/07/11 22:36:17 brad Exp $
+ * $OpenBSD: prompt.c,v 1.17 2005/07/17 20:24:45 brad Exp $
*/
#include <sys/param.h>
@@ -228,7 +228,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/ppp/slcompress.c b/usr.sbin/ppp/ppp/slcompress.c
index ad4d4227333..7094bf05efb 100644
--- a/usr.sbin/ppp/ppp/slcompress.c
+++ b/usr.sbin/ppp/ppp/slcompress.c
@@ -36,7 +36,7 @@
* Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
* - Initial distribution.
*
- * $OpenBSD: slcompress.c,v 1.19 2005/07/17 19:13:25 brad Exp $
+ * $OpenBSD: slcompress.c,v 1.20 2005/07/17 20:24:45 brad Exp $
*/
#include <sys/param.h>
@@ -334,7 +334,7 @@ found:
ntohs(cs->cs_ip.ip_len) == hlen)
break;
- /* (fall through) */
+ /* FALLTHROUGH */
case SPECIAL_I:
case SPECIAL_D: