diff options
55 files changed, 103 insertions, 105 deletions
diff --git a/sys/alpha/alpha/db_disasm.c b/sys/alpha/alpha/db_disasm.c index 5cdfc18..507a73e 100644 --- a/sys/alpha/alpha/db_disasm.c +++ b/sys/alpha/alpha/db_disasm.c @@ -1012,7 +1012,7 @@ foperate: case op_sts: case op_stt: fstore = TRUE; - /* fall through */ + /* FALLTHROUGH */ case op_ldl: case op_ldq: case op_ldl_l: diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c index 1bac257..3d132cc 100644 --- a/sys/alpha/alpha/trap.c +++ b/sys/alpha/alpha/trap.c @@ -404,7 +404,7 @@ trap(a0, a1, a2, entry, framep) ucode = a0; /* exception summary */ break; } - /* FALLTHROUTH */ + /* FALLTHROUGH */ case ALPHA_IF_CODE_BPT: case ALPHA_IF_CODE_BUGCHK: if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 8077d1f..102d54b 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -318,7 +318,7 @@ trap(frame) goto user; break; } - /* FALL THROUGH */ + /* FALLTHROUGH */ case T_SEGNPFLT: /* segment not present fault */ case T_TSSFLT: /* invalid TSS fault */ @@ -593,7 +593,7 @@ trap(frame) goto out; } /* - * Fall through (TRCTRAP kernel mode, kernel address) + * FALLTHROUGH (TRCTRAP kernel mode, kernel address) */ case T_BPTFLT: /* @@ -635,7 +635,7 @@ trap(frame) goto out; } else if (panic_on_nmi == 0) goto out; - /* FALL THROUGH */ + /* FALLTHROUGH */ #endif /* POWERFAIL_NMI */ #endif /* DEV_ISA */ } diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 81b8031..9118aa9 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -6456,7 +6456,7 @@ xpt_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device, || (inq_data->flags & SID_WBus32) != 0) && (cpi.hba_inquiry & PI_WIDE_32) != 0) break; - /* Fall Through to 16-bit */ + /* FALLTHROUGH to 16-bit */ case MSG_EXT_WDTR_BUS_16_BIT: if (((device->flags & CAM_DEV_INQUIRY_DATA_VALID) == 0 || (inq_data->flags & SID_WBus16) != 0) @@ -6464,7 +6464,7 @@ xpt_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device, cts->bus_width = MSG_EXT_WDTR_BUS_16_BIT; break; } - /* Fall Through to 8-bit */ + /* FALLTHROUGH to 8-bit */ default: /* New bus width?? */ case MSG_EXT_WDTR_BUS_8_BIT: /* All targets can do this */ diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index d9d7b4a..dcc6ae8 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -831,7 +831,7 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) state->ks_state &= ~LOCK_MASK; state->ks_state |= KBD_LED_VAL(kbd); } - /* FALL THROUGH */ + /* FALLTHROUGH */ case K_RAW: case K_CODE: if (state->ks_mode != *(int *)arg) { @@ -915,7 +915,7 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) case PIO_KEYMAPENT: /* set keyboard translation table entry */ case PIO_DEADKEYMAP: /* set accent key translation table */ state->ks_accents = 0; - /* FALL THROUGH */ + /* FALLTHROUGH */ default: splx(s); return genkbd_commonioctl(kbd, cmd, arg); diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 9afb9f3..5e95cb5 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -645,7 +645,7 @@ doinitialize(struct psm_softc *sc, mousemode_t *mode) if (verbose) log(LOG_DEBUG, "psm%d: strange result for test aux port (%d).\n", sc->unit, i); - /* fall though */ + /* FALLTHROUGH */ case 0: /* no error */ break; case -1: /* time out */ @@ -1031,7 +1031,7 @@ psmprobe(device_t dev) if (verbose) printf("psm%d: strange result for test aux port (%d).\n", unit, i); - /* fall though */ + /* FALLTHROUGH */ case 0: /* no error */ break; case -1: /* time out */ @@ -2174,7 +2174,7 @@ psmintr(void *arg) break; case 0: /* device type packet - shouldn't happen */ - /* FALL THROUGH */ + /* FALLTHROUGH */ default: x = y = 0; ms.button = ms.obutton; diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index a48d93c..dc10916 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -1336,7 +1336,7 @@ tulip_mii_autonegotiate( sc->tulip_probe_timeout = 3000; sc->tulip_intrmask |= TULIP_STS_ABNRMLINTR|TULIP_STS_NORMALINTR; sc->tulip_probe_state = TULIP_PROBE_PHYRESET; - /* FALL THROUGH */ + /* FALLTHROUGH */ } case TULIP_PROBE_PHYRESET: { u_int32_t status; @@ -1378,7 +1378,7 @@ tulip_mii_autonegotiate( #endif sc->tulip_probe_state = TULIP_PROBE_PHYAUTONEG; sc->tulip_probe_timeout = 3000; - /* FALL THROUGH */ + /* FALLTHROUGH */ } case TULIP_PROBE_PHYAUTONEG: { u_int32_t status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS); diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index 8fc1fd2..ba876fc 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -1537,7 +1537,7 @@ vga_set_mode(video_adapter_t *adp, int mode) #ifdef VGA_WIDTH90 case M_VGA_C90x60: case M_VGA_M90x60: set_width90(¶ms); - /* FALL THROUGH */ + /* FALLTHROUGH */ #endif case M_VGA_C80x60: case M_VGA_M80x60: params.regs[2] = 0x08; @@ -1547,7 +1547,7 @@ vga_set_mode(video_adapter_t *adp, int mode) #ifdef VGA_WIDTH90 case M_VGA_C90x30: case M_VGA_M90x30: set_width90(¶ms); - /* FALL THROUGH */ + /* FALLTHROUGH */ #endif case M_VGA_C80x30: case M_VGA_M80x30: params.regs[19] = 0x4f; @@ -1564,7 +1564,7 @@ special_480l: #ifdef VGA_WIDTH90 case M_VGA_C90x43: case M_VGA_M90x43: set_width90(¶ms); - /* FALL THROUGH */ + /* FALLTHROUGH */ #endif case M_ENH_C80x43: case M_ENH_B80x43: params.regs[28] = 87; @@ -1573,7 +1573,7 @@ special_480l: #ifdef VGA_WIDTH90 case M_VGA_C90x50: case M_VGA_M90x50: set_width90(¶ms); - /* FALL THROUGH */ + /* FALLTHROUGH */ #endif case M_VGA_C80x50: case M_VGA_M80x50: special_80x50: @@ -1584,7 +1584,7 @@ special_80x50: #ifdef VGA_WIDTH90 case M_VGA_C90x25: case M_VGA_M90x25: set_width90(¶ms); - /* FALL THROUGH */ + /* FALLTHROUGH */ #endif case M_VGA_C40x25: case M_VGA_C80x25: case M_VGA_M80x25: diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c index d9d7b4a..dcc6ae8 100644 --- a/sys/dev/kbd/atkbd.c +++ b/sys/dev/kbd/atkbd.c @@ -831,7 +831,7 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) state->ks_state &= ~LOCK_MASK; state->ks_state |= KBD_LED_VAL(kbd); } - /* FALL THROUGH */ + /* FALLTHROUGH */ case K_RAW: case K_CODE: if (state->ks_mode != *(int *)arg) { @@ -915,7 +915,7 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) case PIO_KEYMAPENT: /* set keyboard translation table entry */ case PIO_DEADKEYMAP: /* set accent key translation table */ state->ks_accents = 0; - /* FALL THROUGH */ + /* FALLTHROUGH */ default: splx(s); return genkbd_commonioctl(kbd, cmd, arg); diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c index fd9aa00..2cebf0a 100644 --- a/sys/dev/pdq/pdq.c +++ b/sys/dev/pdq/pdq.c @@ -1149,7 +1149,7 @@ pdq_stop( pdq_do_port_control(csrs, PDQ_PCTL_SUB_CMD); state = PDQ_PSTS_ADAPTER_STATE(PDQ_CSR_READ(csrs, csr_port_status)); PDQ_ASSERT(state == PDQS_DMA_AVAILABLE); - /* FALL THROUGH */ + /* FALLTHROUGH */ } case PDQS_DMA_AVAILABLE: { PDQ_CSR_WRITE(csrs, csr_port_data_a, 0); @@ -1157,7 +1157,7 @@ pdq_stop( pdq_do_port_control(csrs, PDQ_PCTL_DMA_UNINIT); state = PDQ_PSTS_ADAPTER_STATE(PDQ_CSR_READ(csrs, csr_port_status)); PDQ_ASSERT(state == PDQS_DMA_UNAVAILABLE); - /* FALL THROUGH */ + /* FALLTHROUGH */ } case PDQS_DMA_UNAVAILABLE: { break; diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c index 19b5494..d2cf4fd 100644 --- a/sys/dev/ppbus/ppi.c +++ b/sys/dev/ppbus/ppi.c @@ -342,7 +342,7 @@ ppiread(dev_t dev, struct uio *uio, int ioflag) switch (ppb_1284_get_state(ppbus)) { case PPB_PERIPHERAL_IDLE: ppb_peripheral_terminate(ppbus, 0); - /* fall throught */ + /* FALLTHROUGH */ case PPB_FORWARD_IDLE: /* if can't negociate NIBBLE mode then try BYTE mode, diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index 4a003d2..e26d279 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -1357,7 +1357,7 @@ send_cmd(u_int unit, u_char cmd, u_int nargs, ...) switch ((rc = inb(reg)) & 0xf0) { case 0x20: rc = inb(reg); - /* FALL TROUGH */ + /* FALLTHROUGH */ case 0x50: XDEBUG(1, ("scd%d: DEBUG: send_cmd: drive_error=0x%x\n", unit, rc)); return -rc; diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index 9e142d0..8a7656b 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -608,7 +608,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct thread * case SW_TEXT_80x25: case SW_TEXT_80x30: case SW_TEXT_80x43: case SW_TEXT_80x50: case SW_TEXT_80x60: - /* FALL THROUGH */ + /* FALLTHROUGH */ /* VGA TEXT MODES */ case SW_VGA_C40x25: @@ -690,7 +690,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct thread * (*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1); #endif - /* FALL THROUGH */ + /* FALLTHROUGH */ case KD_TEXT1: /* switch to TEXT (known) mode */ /* diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index e2fc59e..775a04d 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1171,7 +1171,7 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) state->ks_state &= ~LOCK_MASK; state->ks_state |= KBD_LED_VAL(kbd); } - /* FALL THROUGH */ + /* FALLTHROUGH */ case K_RAW: case K_CODE: if (state->ks_mode != *(int *)arg) { @@ -1246,7 +1246,7 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) case PIO_KEYMAPENT: /* set keyboard translation table entry */ case PIO_DEADKEYMAP: /* set accent key translation table */ state->ks_accents = 0; - /* FALL THROUGH */ + /* FALLTHROUGH */ default: splx(s); return genkbd_commonioctl(kbd, cmd, arg); diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index fdcb4f6..88f47fa 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -181,7 +181,7 @@ cd9660_rrip_slink(p,ana) case ISO_SUSP_CFLAG_CONTINUE: cont = 1; - /* fall thru */ + /* FALLTHROUGH */ case 0: /* Inserting component */ wlen = isonum_711(pcomp->clen); @@ -253,7 +253,7 @@ cd9660_rrip_altname(p,ana) case ISO_SUSP_CFLAG_CONTINUE: cont = 1; - /* fall thru */ + /* FALLTHROUGH */ case 0: /* Inserting component */ wlen = isonum_711(p->h.length) - 5; @@ -297,7 +297,7 @@ cd9660_rrip_defname(isodir,ana) break; case 1: *ana->outlen = 2; - /* FALL THROUGH */ + /* FALLTHROUGH */ case 0: /* outlen is 1 already */ strcpy(ana->outbuf,".."); diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 8077d1f..102d54b 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -318,7 +318,7 @@ trap(frame) goto user; break; } - /* FALL THROUGH */ + /* FALLTHROUGH */ case T_SEGNPFLT: /* segment not present fault */ case T_TSSFLT: /* invalid TSS fault */ @@ -593,7 +593,7 @@ trap(frame) goto out; } /* - * Fall through (TRCTRAP kernel mode, kernel address) + * FALLTHROUGH (TRCTRAP kernel mode, kernel address) */ case T_BPTFLT: /* @@ -635,7 +635,7 @@ trap(frame) goto out; } else if (panic_on_nmi == 0) goto out; - /* FALL THROUGH */ + /* FALLTHROUGH */ #endif /* POWERFAIL_NMI */ #endif /* DEV_ISA */ } diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c index 12bd038..0084cbe 100644 --- a/sys/i386/ibcs2/ibcs2_signal.c +++ b/sys/i386/ibcs2/ibcs2_signal.c @@ -264,7 +264,7 @@ ibcs2_sigsys(td, uap) sa.sa_flags = 0; goto ibcs2_sigset; } - /* else fallthrough to sighold */ + /* else FALLTHROUGH to sighold */ case IBCS2_SIGHOLD_MASK: { diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c index 4a003d2..e26d279 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/scd.c @@ -1357,7 +1357,7 @@ send_cmd(u_int unit, u_char cmd, u_int nargs, ...) switch ((rc = inb(reg)) & 0xf0) { case 0x20: rc = inb(reg); - /* FALL TROUGH */ + /* FALLTHROUGH */ case 0x50: XDEBUG(1, ("scd%d: DEBUG: send_cmd: drive_error=0x%x\n", unit, rc)); return -rc; diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index ca766c4..77db37f 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -2676,7 +2676,7 @@ static int stl_initeio(stlbrd_t *brdp) switch (status & EIO_IDBITMASK) { case EIO_8PORTM: brdp->clk = EIO_CLK8M; - /* fall thru */ + /* FALLTHROUGH */ case EIO_8PORTRS: case EIO_8PORTDI: brdp->nrports = 8; diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c index e948925..ae5ed80 100644 --- a/sys/i4b/driver/i4b_rbch.c +++ b/sys/i4b/driver/i4b_rbch.c @@ -507,7 +507,7 @@ i4brbchioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) i4b_l4_dialoutnumber(BDRV_RBCH, unit, l, (char *)data); break; } - /* fall through to SDTR */ + /* FALLTHROUGH to SDTR */ } case TIOCSDTR: /* Set DTR */ diff --git a/sys/isa/psm.c b/sys/isa/psm.c index 9afb9f3..5e95cb5 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -645,7 +645,7 @@ doinitialize(struct psm_softc *sc, mousemode_t *mode) if (verbose) log(LOG_DEBUG, "psm%d: strange result for test aux port (%d).\n", sc->unit, i); - /* fall though */ + /* FALLTHROUGH */ case 0: /* no error */ break; case -1: /* time out */ @@ -1031,7 +1031,7 @@ psmprobe(device_t dev) if (verbose) printf("psm%d: strange result for test aux port (%d).\n", unit, i); - /* fall though */ + /* FALLTHROUGH */ case 0: /* no error */ break; case -1: /* time out */ @@ -2174,7 +2174,7 @@ psmintr(void *arg) break; case 0: /* device type packet - shouldn't happen */ - /* FALL THROUGH */ + /* FALLTHROUGH */ default: x = y = 0; ms.button = ms.obutton; diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c index fdcb4f6..88f47fa 100644 --- a/sys/isofs/cd9660/cd9660_rrip.c +++ b/sys/isofs/cd9660/cd9660_rrip.c @@ -181,7 +181,7 @@ cd9660_rrip_slink(p,ana) case ISO_SUSP_CFLAG_CONTINUE: cont = 1; - /* fall thru */ + /* FALLTHROUGH */ case 0: /* Inserting component */ wlen = isonum_711(pcomp->clen); @@ -253,7 +253,7 @@ cd9660_rrip_altname(p,ana) case ISO_SUSP_CFLAG_CONTINUE: cont = 1; - /* fall thru */ + /* FALLTHROUGH */ case 0: /* Inserting component */ wlen = isonum_711(p->h.length) - 5; @@ -297,7 +297,7 @@ cd9660_rrip_defname(isodir,ana) break; case 1: *ana->outlen = 2; - /* FALL THROUGH */ + /* FALLTHROUGH */ case 0: /* outlen is 1 already */ strcpy(ana->outbuf,".."); diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 37dc894..db4e4d4 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -349,7 +349,7 @@ fcntl(td, uap) case F_SETLKW: flg |= F_WAIT; - /* Fall into F_SETLK */ + /* FALLTHROUGH F_SETLK */ case F_SETLK: if (fp->f_type != DTYPE_VNODE) { diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 5189bb7..5705f83 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -272,7 +272,7 @@ debuglockmgr(lkp, flags, interlkp, td, name, file, line) * An alternative would be to fail with EDEADLK. */ sharelock(lkp, 1); - /* fall into downgrade */ + /* FALLTHROUGH downgrade */ case LK_DOWNGRADE: KASSERT(lkp->lk_lockholder == pid && lkp->lk_exclusivecount != 0, @@ -298,7 +298,7 @@ debuglockmgr(lkp, flags, interlkp, td, name, file, line) error = EBUSY; break; } - /* fall into normal upgrade */ + /* FALLTHROUGH normal upgrade */ case LK_UPGRADE: /* @@ -353,7 +353,7 @@ debuglockmgr(lkp, flags, interlkp, td, name, file, line) if ( (lkp->lk_flags & (LK_SHARE_NONZERO|LK_WAIT_NONZERO)) == LK_WAIT_NONZERO) wakeup((void *)lkp); - /* fall into exclusive request */ + /* FALLTHROUGH exclusive request */ case LK_EXCLUSIVE: if (lkp->lk_lockholder == pid && pid != LK_KERNPROC) { diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 54b2423..0ed7c08 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -584,7 +584,7 @@ ptrace(struct thread *td, struct ptrace_args *uap) case PT_WRITE_I: case PT_WRITE_D: write = 1; - /* fallthrough */ + /* FALLTHROUGH */ case PT_READ_I: case PT_READ_D: PROC_UNLOCK(p); diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index e0d623c..7a7317a 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1740,12 +1740,12 @@ restart: nqindex = QUEUE_EMPTYKVA; if ((nbp = TAILQ_FIRST(&bufqueues[QUEUE_EMPTYKVA]))) break; - /* fall through */ + /* FALLTHROUGH */ case QUEUE_EMPTYKVA: nqindex = QUEUE_CLEAN; if ((nbp = TAILQ_FIRST(&bufqueues[QUEUE_CLEAN]))) break; - /* fall through */ + /* FALLTHROUGH */ case QUEUE_CLEAN: /* * nbp is NULL. diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 70d2e4e..5c5f0f0 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -597,12 +597,12 @@ cluster_wbuild_wb(struct vnode *vp, long size, daddr_t start_lbn, int len) if (start_lbn < len) break; start_lbn -= len; - /* fall through */ + /* FALLTHROUGH */ case 1: r = cluster_wbuild(vp, size, start_lbn, len); - /* fall through */ + /* FALLTHROUGH */ default: - /* fall through */ + /* FALLTHROUGH */ break; } return(r); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index d74c12c..300f051 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1761,7 +1761,7 @@ reassignbuf(bp, newvp) delay = metadelay; break; } - /* fall through */ + /* FALLTHROUGH */ default: delay = filedelay; } diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 0c106be..8288b85 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -757,7 +757,7 @@ vn_ioctl(fp, com, data, active_cred, td) } if (com == FIONBIO || com == FIOASYNC) /* XXX */ return (0); /* XXX */ - /* fall into ... */ + /* FALLTHROUGH */ default: #if 0 diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index ec52eaa..5a9184b 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1165,7 +1165,7 @@ sppp_ioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, void *data) case SIOCSIFADDR: /* set the interface "up" when assigning an IP address */ ifp->if_flags |= IFF_UP; - /* fall through... */ + /* FALLTHROUGH */ case SIOCSIFFLAGS: going_up = ifp->if_flags & IFF_UP && @@ -1496,7 +1496,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m) case STATE_OPENED: (cp->tld)(sp); (cp->scr)(sp); - /* fall through... */ + /* FALLTHROUGH */ case STATE_ACK_SENT: case STATE_REQ_SENT: /* @@ -1560,7 +1560,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m) break; case STATE_OPENED: (cp->tld)(sp); - /* fall through */ + /* FALLTHROUGH */ case STATE_ACK_RCVD: (cp->scr)(sp); sppp_cp_change_state(cp, sp, STATE_REQ_SENT); @@ -1615,7 +1615,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m) break; case STATE_OPENED: (cp->tld)(sp); - /* fall through */ + /* FALLTHROUGH */ case STATE_ACK_RCVD: sppp_cp_change_state(cp, sp, STATE_REQ_SENT); (cp->scr)(sp); @@ -1637,7 +1637,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m) case STATE_ACK_RCVD: case STATE_ACK_SENT: sppp_cp_change_state(cp, sp, STATE_REQ_SENT); - /* fall through */ + /* FALLTHROUGH */ case STATE_CLOSED: case STATE_STOPPED: case STATE_CLOSING: @@ -2002,7 +2002,7 @@ sppp_close_event(const struct cp *cp, struct sppp *sp) break; case STATE_OPENED: (cp->tld)(sp); - /* fall through */ + /* FALLTHROUGH */ case STATE_REQ_SENT: case STATE_ACK_RCVD: case STATE_ACK_SENT: @@ -4158,7 +4158,7 @@ sppp_chap_TO(void *cookie) case STATE_OPENED: /* TO* event */ sp->rst_counter[IDX_CHAP] = sp->lcp.max_configure; - /* fall through */ + /* FALLTHROUGH */ case STATE_REQ_SENT: chap.scr(sp); /* sppp_cp_change_state() will restart the timer */ diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 98a042c..37d351b 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -443,9 +443,7 @@ route_output(m, so) rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, &info); if (genmask) rt->rt_genmask = genmask; - /* - * Fall into - */ + /* FALLTHROUGH */ case RTM_LOCK: rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits); rt->rt_rmx.rmx_locks |= diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c index d72d02d..f1d2557 100644 --- a/sys/net/slcompress.c +++ b/sys/net/slcompress.c @@ -333,7 +333,7 @@ sl_compress_tcp(m, ip, comp, compress_cid) ntohs(cs->cs_ip.ip_len) == hlen) break; - /* (fall through) */ + /* FALLTHROUGH */ case SPECIAL_I: case SPECIAL_D: diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c index d684637..f17ae2a 100644 --- a/sys/netatm/atm_cm.c +++ b/sys/netatm/atm_cm.c @@ -2956,7 +2956,7 @@ atm_cm_cpcs_upper(cmd, tok, arg1, arg2) case CPCS_UABORT_SIG: case CPCS_PABORT_SIG: /* - * We don't support these (yet), so just fall thru... + * We don't support these (yet), so just FALLTHROUGH */ default: diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 668038e..8da8339 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -331,7 +331,7 @@ static int pim_assert; switch (xxs) { \ case 2: \ delta += 1000000; \ - /* fall through */ \ + /* FALLTHROUGH */ \ case 1: \ delta += 1000000; \ break; \ diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 07c2340..d8e77b6 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1629,7 +1629,7 @@ trimthenstep6: (void) tcp_reass(tp, (struct tcphdr *)0, 0, (struct mbuf *)0); tp->snd_wl1 = th->th_seq - 1; - /* fall into ... */ + /* FALLTHROUGH */ /* * In ESTABLISHED state: drop duplicate ACKs; ACK out of range diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 07c2340..d8e77b6 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -1629,7 +1629,7 @@ trimthenstep6: (void) tcp_reass(tp, (struct tcphdr *)0, 0, (struct mbuf *)0); tp->snd_wl1 = th->th_seq - 1; - /* fall into ... */ + /* FALLTHROUGH */ /* * In ESTABLISHED state: drop duplicate ACKs; ACK out of range diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c index 4dea458..0fb03f9 100644 --- a/sys/netipx/ipx_ip.c +++ b/sys/netipx/ipx_ip.c @@ -137,7 +137,7 @@ ipxipioctl(ifp, cmd, data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; - /* fall into: */ + /* FALLTHROUGH */ case SIOCSIFDSTADDR: /* diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c index 45e9b8e..55d1a9f 100644 --- a/sys/netns/ns_ip.c +++ b/sys/netns/ns_ip.c @@ -131,7 +131,7 @@ nsipioctl(ifp, cmd, data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; - /* fall into: */ + /* FALLTHROUGH */ case SIOCSIFDSTADDR: /* diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c index a28a272..6efe381 100644 --- a/sys/netns/spp_usrreq.c +++ b/sys/netns/spp_usrreq.c @@ -1458,7 +1458,7 @@ spp_usrreq(so, req, m, nam, controlp) break; } cb->s_oobflags |= SF_SOOB; - /* fall into */ + /* FALLTHROUGH */ case PRU_SEND: if (controlp) { u_short *p = mtod(controlp, u_short *); diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c index e55d50d..b3a5b42 100644 --- a/sys/pc98/cbus/gdc.c +++ b/sys/pc98/cbus/gdc.c @@ -1306,7 +1306,7 @@ gdc_blank_display(video_adapter_t *adp, int mode) outb(0x09a2, 0x80 | 0x40); /* V/H-SYNC mask */ if (inb(0x09a2) == (0x80 | 0x40)) standby = 1; - /* FALL THROUGH */ + /* FALLTHROUGH */ case V_DISPLAY_BLANK: if (epson_machine_id == 0x20) { diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c index 0237da3..60e01a4 100644 --- a/sys/pc98/cbus/pckbd.c +++ b/sys/pc98/cbus/pckbd.c @@ -722,7 +722,7 @@ pckbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) state->ks_state &= ~LOCK_MASK; state->ks_state |= KBD_LED_VAL(kbd); } - /* FALL THROUGH */ + /* FALLTHROUGH */ case K_RAW: case K_CODE: if (state->ks_mode != *(int *)arg) { @@ -779,7 +779,7 @@ pckbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) case PIO_KEYMAPENT: /* set keyboard translation table entry */ case PIO_DEADKEYMAP: /* set accent key translation table */ state->ks_accents = 0; - /* FALL THROUGH */ + /* FALLTHROUGH */ default: splx(s); return genkbd_commonioctl(kbd, cmd, arg); diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c index e55d50d..b3a5b42 100644 --- a/sys/pc98/pc98/pc98gdc.c +++ b/sys/pc98/pc98/pc98gdc.c @@ -1306,7 +1306,7 @@ gdc_blank_display(video_adapter_t *adp, int mode) outb(0x09a2, 0x80 | 0x40); /* V/H-SYNC mask */ if (inb(0x09a2) == (0x80 | 0x40)) standby = 1; - /* FALL THROUGH */ + /* FALLTHROUGH */ case V_DISPLAY_BLANK: if (epson_machine_id == 0x20) { diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c index 0237da3..60e01a4 100644 --- a/sys/pc98/pc98/pc98kbd.c +++ b/sys/pc98/pc98/pc98kbd.c @@ -722,7 +722,7 @@ pckbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) state->ks_state &= ~LOCK_MASK; state->ks_state |= KBD_LED_VAL(kbd); } - /* FALL THROUGH */ + /* FALLTHROUGH */ case K_RAW: case K_CODE: if (state->ks_mode != *(int *)arg) { @@ -779,7 +779,7 @@ pckbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) case PIO_KEYMAPENT: /* set keyboard translation table entry */ case PIO_DEADKEYMAP: /* set accent key translation table */ state->ks_accents = 0; - /* FALL THROUGH */ + /* FALLTHROUGH */ default: splx(s); return genkbd_commonioctl(kbd, cmd, arg); diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index a48d93c..dc10916 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -1336,7 +1336,7 @@ tulip_mii_autonegotiate( sc->tulip_probe_timeout = 3000; sc->tulip_intrmask |= TULIP_STS_ABNRMLINTR|TULIP_STS_NORMALINTR; sc->tulip_probe_state = TULIP_PROBE_PHYRESET; - /* FALL THROUGH */ + /* FALLTHROUGH */ } case TULIP_PROBE_PHYRESET: { u_int32_t status; @@ -1378,7 +1378,7 @@ tulip_mii_autonegotiate( #endif sc->tulip_probe_state = TULIP_PROBE_PHYAUTONEG; sc->tulip_probe_timeout = 3000; - /* FALL THROUGH */ + /* FALLTHROUGH */ } case TULIP_PROBE_PHYAUTONEG: { u_int32_t status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS); diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 8d6fb90..49154fe 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -3128,7 +3128,7 @@ static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int le new = old; break; } - /* fall through */ + /* FALLTHROUGH */ default: panic("ncr_script_copy_and_bind: weird relocation %x @ %d\n", old, (int)(src - start)); break; @@ -4611,14 +4611,14 @@ ncr_wakeup (ncb_p np, u_long code) case HS_DISCONNECT: if(DEBUG_FLAGS & DEBUG_TINY) printf ("D"); - /* fall through */ + /* FALLTHROUGH */ case HS_BUSY: case HS_NEGOTIATE: if (!code) break; cp->host_status = code; - /* fall through */ + /* FALLTHROUGH */ default: ncr_complete (np, cp); @@ -5163,7 +5163,7 @@ ncr_timeout (void *arg) case HS_BUSY: case HS_NEGOTIATE: - /* fall through */ + /* FALLTHROUGH */ case HS_DISCONNECT: cp->host_status=HS_TIMEOUT; }; @@ -6027,7 +6027,7 @@ void ncr_int_sir (ncb_p np) */ OUTB (HS_PRT, HS_BUSY); - /* fall through */ + /* FALLTHROUGH */ case SIR_NEGO_PROTO: /*------------------------------------------------------- @@ -6353,7 +6353,7 @@ void ncr_int_sir (ncb_p np) ncr_freeze_devq(np, cp->ccb->ccb_h.path); ncr_complete(np, cp); - /* FALL THROUGH */ + /* FALLTHROUGH */ case SIR_STALL_RESTART: /*----------------------------------------------- diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c index 442d823..aecfedd 100644 --- a/sys/ufs/ufs/ufs_vfsops.c +++ b/sys/ufs/ufs/ufs_vfsops.c @@ -122,7 +122,7 @@ ufs_quotactl(mp, cmds, uid, arg, td) case Q_GETQUOTA: if (uid == td->td_ucred->cr_ruid) break; - /* fall through */ + /* FALLTHROUGH */ default: if ((error = suser_cred(td->td_ucred, PRISON_ROOT)) != 0) return (error); diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c index 2be228a..270249e 100644 --- a/usr.bin/chat/chat.c +++ b/usr.bin/chat/chat.c @@ -1221,7 +1221,7 @@ int n; case -1: if (need_lf == 0) break; - /* fall through */ + /* FALLTHROUGH */ case '\n': write(STDERR_FILENO, "\n", 1); need_lf = 0; diff --git a/usr.bin/doscmd/trap.c b/usr.bin/doscmd/trap.c index dbf3960..02e9437 100644 --- a/usr.bin/doscmd/trap.c +++ b/usr.bin/doscmd/trap.c @@ -505,7 +505,7 @@ sigbus(struct sigframe *sf) tty_pause(); goto out; /* } */ - /* FALLTHRU */ + /* FALLTHROUGH */ default: dump_regs(REGS); diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c index b81d43b..a7316ba 100644 --- a/usr.bin/lex/initscan.c +++ b/usr.bin/lex/initscan.c @@ -3176,7 +3176,7 @@ static int input() /* Reset buffer status. */ yyrestart( yyin ); - /* fall through */ + /* FALLTHROUGH */ case EOB_ACT_END_OF_FILE: { diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/aux.c index 82ad0dd..fa820b4 100644 --- a/usr.bin/mail/aux.c +++ b/usr.bin/mail/aux.c @@ -488,7 +488,7 @@ skin(name) lastsp = 0; break; } - /* Fall into . . . */ + /* FALLTHROUGH */ default: if (lastsp) { diff --git a/usr.bin/telnet/telnet.c b/usr.bin/telnet/telnet.c index a570a86..27aeaa9 100644 --- a/usr.bin/telnet/telnet.c +++ b/usr.bin/telnet/telnet.c @@ -272,7 +272,7 @@ willoption(int option) case TELOPT_BINARY: case TELOPT_SGA: settimer(modenegotiated); - /* FALL THROUGH */ + /* FALLTHROUGH */ case TELOPT_STATUS: new_state_ok = 1; break; @@ -322,7 +322,7 @@ wontoption(int option) case TELOPT_SGA: if (!kludgelinemode) break; - /* FALL THROUGH */ + /* FALLTHROUGH */ #endif case TELOPT_ECHO: settimer(modenegotiated); @@ -1293,7 +1293,7 @@ env_opt(unsigned char *buf, int len) old_env_var = OLD_ENV_VAR; old_env_value = OLD_ENV_VALUE; } - /* FALL THROUGH */ + /* FALLTHROUGH */ # endif case OLD_ENV_VALUE: /* @@ -1301,7 +1301,7 @@ env_opt(unsigned char *buf, int len) * still recognize it, just in case it is an * old server that has VAR & VALUE mixed up... */ - /* FALL THROUGH */ + /* FALLTHROUGH */ #else case NEW_ENV_VAR: #endif @@ -1314,7 +1314,7 @@ env_opt(unsigned char *buf, int len) break; case ENV_ESC: i++; - /*FALL THROUGH*/ + /*FALLTHROUGH*/ default: if (epc) *epc++ = buf[i]; @@ -1519,7 +1519,7 @@ telrcv(void) TTYADD(c); break; } - /* Else, fall through */ + /* FALLTHROUGH */ case TS_DATA: if (c == IAC) { diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index da60ebc..c507925f 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -544,7 +544,7 @@ char *(*get_userid)(); sprintf(status, "%.6s", pp->ki_wmesg); break; } - /* fall through */ + /* FALLTHROUGH */ default: if (state >= 0 && diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 7482674..26ccf0e 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -225,7 +225,7 @@ stime_arg1(arg, tvp) t->tm_year = ATOI2(arg); t->tm_year *= 100; yearset = 1; - /* FALLTHOUGH */ + /* FALLTHROUGH */ case 10: /* YYMMDDhhmm */ if (yearset) { yearset = ATOI2(arg); diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c index 4426877..c4ffccf 100644 --- a/usr.bin/ul/ul.c +++ b/usr.bin/ul/ul.c @@ -134,7 +134,7 @@ main(argc, argv) default: warnx("trouble reading termcap"); - /* fall through to ... */ + /* FALLTHROUGH */ case 0: /* No such terminal type - assume dumb */ diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c index 3e01e8f..7c1132d 100644 --- a/usr.bin/yacc/reader.c +++ b/usr.bin/yacc/reader.c @@ -283,7 +283,7 @@ nextc() s = cptr; break; } - /* fall through */ + /* FALLTHROUGH */ default: cptr = s; @@ -511,7 +511,7 @@ loop: FREE(t_line); return; } - /* fall through */ + /* FALLTHROUGH */ default: putc(c, f); |
