Re: git: 0050289464fa - main - style(9): white space after ; and around binary operators
Date: Thu, 16 Oct 2025 23:29:57 UTC
On Thu, Oct 16, 2025 at 4:21 PM Rick Macklem <rick.macklem@gmail.com> wrote:
>
> Please be aware of the following snippets from "man 9 style":
>
> In general code can be considered "new code" when it makes up about 50%
> or more of the file(s) involved. This is enough to break precedents in
> the existing code and use the current style guidelines.
>
> Stylistic changes (including whitespace changes) are hard on the source
> repository and are to be avoided without good reason.
>
> rick
Just to be clear, I am not asking that this commit be reverted.
I am just suggesting that you be aware that style(9) changes to
extant code is not, in general, encouraged, afaik unless you are
re-writing a large portion of the code (over 50%).
rick
>
> On Thu, Oct 16, 2025 at 3:05 PM David E. O'Brien <obrien@freebsd.org> wrote:
> >
> > CAUTION: This email originated from outside of the University of Guelph. Do not click links or open attachments unless you recognize the sender and know the content is safe. If in doubt, forward suspicious emails to IThelp@uoguelph.ca.
> >
> > The branch main has been updated by obrien:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=0050289464fa56ec79e060b8d8378b9ff7145a0e
> >
> > commit 0050289464fa56ec79e060b8d8378b9ff7145a0e
> > Author: David E. O'Brien <obrien@FreeBSD.org>
> > AuthorDate: 2025-10-15 05:22:00 +0000
> > Commit: David E. O'Brien <obrien@FreeBSD.org>
> > CommitDate: 2025-10-16 22:02:50 +0000
> >
> > style(9): white space after ; and around binary operators
> >
> > in for() loops. Also, use 'while', where only the
> > conditional test of 'for' was used.
> >
> > Reviewed by: sjg
> > ---
> > sys/arm/allwinner/aw_sid.c | 2 +-
> > sys/cam/scsi/scsi_all.c | 2 +-
> > sys/cam/scsi/scsi_enc_ses.c | 6 +++---
> > sys/crypto/chacha20/chacha.c | 6 +++---
> > sys/crypto/openssl/ossl_sha256.c | 4 ++--
> > sys/dev/aic7xxx/aic79xx.c | 4 ++--
> > sys/dev/aic7xxx/aic7xxx.c | 4 ++--
> > sys/dev/enetc/if_enetc.c | 6 +++---
> > sys/dev/hptmv/entry.c | 33 ++++++++++++++++-----------------
> > sys/dev/hptmv/gui_lib.c | 12 +++++-------
> > sys/dev/hptmv/hptproc.c | 2 +-
> > sys/dev/mps/mps_sas.c | 4 ++--
> > sys/dev/mpt/mpt_raid.c | 4 ++--
> > sys/dev/nfe/if_nfe.c | 4 ++--
> > sys/dev/ocs_fc/ocs_mgmt.c | 14 +++++++-------
> > sys/dev/ppc/ppc.c | 2 +-
> > sys/dev/smartpqi/smartpqi_event.c | 6 +++---
> > sys/dev/smartpqi/smartpqi_queue.c | 4 ++--
> > sys/dev/sym/sym_hipd.c | 12 ++++++------
> > sys/dev/tws/tws.c | 13 ++++++-------
> > sys/dev/tws/tws_services.c | 2 +-
> > sys/fs/devfs/devfs_dir.c | 2 +-
> > sys/fs/udf/osta.c | 4 ++--
> > sys/i386/i386/in_cksum_machdep.c | 2 +-
> > sys/kern/kern_exit.c | 2 +-
> > sys/kern/kern_malloc.c | 2 +-
> > sys/kern/subr_devstat.c | 2 +-
> > sys/kern/subr_prf.c | 2 +-
> > sys/netinet/siftr.c | 2 +-
> > sys/netpfil/ipfw/ip_dummynet.c | 4 ++--
> > 30 files changed, 82 insertions(+), 86 deletions(-)
> >
> > diff --git a/sys/arm/allwinner/aw_sid.c b/sys/arm/allwinner/aw_sid.c
> > index ba5faca33c5e..932c2f189e51 100644
> > --- a/sys/arm/allwinner/aw_sid.c
> > +++ b/sys/arm/allwinner/aw_sid.c
> > @@ -297,7 +297,7 @@ aw_sid_attach(device_t dev)
> > /* Register ourself so device can resolve who we are */
> > OF_device_register_xref(OF_xref_from_node(node), dev);
> >
> > - for (i = 0; i < sc->sid_conf->nfuses ;i++) {\
> > + for (i = 0; i < sc->sid_conf->nfuses; i++) {
> > SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
> > SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
> > OID_AUTO, sc->sid_conf->efuses[i].name,
> > diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
> > index 9c097f52d136..fd128e69f1f1 100644
> > --- a/sys/cam/scsi/scsi_all.c
> > +++ b/sys/cam/scsi/scsi_all.c
> > @@ -686,7 +686,7 @@ scsi_op_desc(uint16_t opcode, struct scsi_inquiry_data *inq_data)
> > opmask = 1 << pd_type;
> >
> > for (j = 0; j < num_tables; j++) {
> > - for (i = 0;i < num_ops[j] && table[j][i].opcode <= opcode; i++){
> > + for (i = 0; i < num_ops[j] && table[j][i].opcode <= opcode; i++) {
> > if ((table[j][i].opcode == opcode)
> > && ((table[j][i].opmask & opmask) != 0))
> > return(table[j][i].desc);
> > diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c
> > index 435874a9874a..3a362eaf11a4 100644
> > --- a/sys/cam/scsi/scsi_enc_ses.c
> > +++ b/sys/cam/scsi/scsi_enc_ses.c
> > @@ -2302,7 +2302,7 @@ ses_print_addl_data_sas_type0(char *sesname, struct sbuf *sbp,
> > sbuf_putc(sbp, '\n');
> > if (addl->proto_data.sasdev_phys == NULL)
> > return;
> > - for (i = 0;i < addl->proto_hdr.sas->base_hdr.num_phys;i++) {
> > + for (i = 0; i < addl->proto_hdr.sas->base_hdr.num_phys; i++) {
> > phy = &addl->proto_data.sasdev_phys[i];
> > sbuf_printf(sbp, "%s: phy %d:", sesname, i);
> > if (ses_elm_sas_dev_phy_sata_dev(phy))
> > @@ -2349,7 +2349,7 @@ ses_print_addl_data_sas_type1(char *sesname, struct sbuf *sbp,
> > sbuf_printf(sbp, "Expander: %d phys", num_phys);
> > if (addl->proto_data.sasexp_phys == NULL)
> > return;
> > - for (i = 0;i < num_phys;i++) {
> > + for (i = 0; i < num_phys; i++) {
> > exp_phy = &addl->proto_data.sasexp_phys[i];
> > sbuf_printf(sbp, "%s: phy %d: connector %d other %d\n",
> > sesname, i, exp_phy->connector_index,
> > @@ -2360,7 +2360,7 @@ ses_print_addl_data_sas_type1(char *sesname, struct sbuf *sbp,
> > sbuf_printf(sbp, "Port: %d phys", num_phys);
> > if (addl->proto_data.sasport_phys == NULL)
> > return;
> > - for (i = 0;i < num_phys;i++) {
> > + for (i = 0; i < num_phys; i++) {
> > port_phy = &addl->proto_data.sasport_phys[i];
> > sbuf_printf(sbp,
> > "%s: phy %d: id %d connector %d other %d\n",
> > diff --git a/sys/crypto/chacha20/chacha.c b/sys/crypto/chacha20/chacha.c
> > index 52f7e18c651c..cb06003b0ecf 100644
> > --- a/sys/crypto/chacha20/chacha.c
> > +++ b/sys/crypto/chacha20/chacha.c
> > @@ -138,7 +138,7 @@ chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes)
> > for (;;) {
> > if (bytes < 64) {
> > #ifndef KEYSTREAM_ONLY
> > - for (i = 0;i < bytes;++i) tmp[i] = m[i];
> > + for (i = 0; i < bytes; ++i) tmp[i] = m[i];
> > m = tmp;
> > #endif
> > ctarget = c;
> > @@ -160,7 +160,7 @@ chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes)
> > x13 = j13;
> > x14 = j14;
> > x15 = j15;
> > - for (i = 20;i > 0;i -= 2) {
> > + for (i = 20; i > 0; i -= 2) {
> > QUARTERROUND( x0, x4, x8,x12)
> > QUARTERROUND( x1, x5, x9,x13)
> > QUARTERROUND( x2, x6,x10,x14)
> > @@ -240,7 +240,7 @@ chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes)
> >
> > if (bytes <= 64) {
> > if (bytes < 64) {
> > - for (i = 0;i < bytes;++i) ctarget[i] = c[i];
> > + for (i = 0; i < bytes; ++i) ctarget[i] = c[i];
> > }
> > x->input[12] = j12;
> > x->input[13] = j13;
> > diff --git a/sys/crypto/openssl/ossl_sha256.c b/sys/crypto/openssl/ossl_sha256.c
> > index 4613a9409b44..50cb9739d114 100644
> > --- a/sys/crypto/openssl/ossl_sha256.c
> > +++ b/sys/crypto/openssl/ossl_sha256.c
> > @@ -74,11 +74,11 @@ ossl_sha256_init(void *c_)
> > unsigned int nn; \
> > switch ((c)->md_len) \
> > { case SHA224_DIGEST_LENGTH: \
> > - for (nn=0;nn<SHA224_DIGEST_LENGTH/4;nn++) \
> > + for (nn=0; nn < SHA224_DIGEST_LENGTH / 4; nn++) \
> > { ll=(c)->h[nn]; (void)HOST_l2c(ll,(s)); } \
> > break; \
> > case SHA256_DIGEST_LENGTH: \
> > - for (nn=0;nn<SHA256_DIGEST_LENGTH/4;nn++) \
> > + for (nn=0; nn < SHA256_DIGEST_LENGTH / 4; nn++) \
> > { ll=(c)->h[nn]; (void)HOST_l2c(ll,(s)); } \
> > break; \
> > default: \
> > diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
> > index 2b5015b20e41..cee45fa5cc8a 100644
> > --- a/sys/dev/aic7xxx/aic79xx.c
> > +++ b/sys/dev/aic7xxx/aic79xx.c
> > @@ -7788,8 +7788,8 @@ ahd_abort_scbs(struct ahd_softc *ahd, int target, char channel,
> > }
> >
> > if (role != ROLE_TARGET) {
> > - for (;i < maxtarget; i++) {
> > - for (j = minlun;j < maxlun; j++) {
> > + for (; i < maxtarget; i++) {
> > + for (j = minlun; j < maxlun; j++) {
> > u_int scbid;
> > u_int tcl;
> >
> > diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
> > index c09876e9f589..18f68b806948 100644
> > --- a/sys/dev/aic7xxx/aic7xxx.c
> > +++ b/sys/dev/aic7xxx/aic7xxx.c
> > @@ -5903,8 +5903,8 @@ ahc_abort_scbs(struct ahc_softc *ahc, int target, char channel,
> > }
> >
> > if (role != ROLE_TARGET) {
> > - for (;i < maxtarget; i++) {
> > - for (j = minlun;j < maxlun; j++) {
> > + for (; i < maxtarget; i++) {
> > + for (j = minlun; j < maxlun; j++) {
> > u_int scbid;
> > u_int tcl;
> >
> > diff --git a/sys/dev/enetc/if_enetc.c b/sys/dev/enetc/if_enetc.c
> > index 808397b229a7..53002f9d73ce 100644
> > --- a/sys/dev/enetc/if_enetc.c
> > +++ b/sys/dev/enetc/if_enetc.c
> > @@ -848,7 +848,7 @@ enetc_hash_vid(uint16_t vid)
> > bool bit;
> > int i;
> >
> > - for (i = 0;i < 6;i++) {
> > + for (i = 0; i < 6; i++) {
> > bit = vid & BIT(i);
> > bit ^= !!(vid & BIT(i + 6));
> > hash |= bit << i;
> > @@ -1020,7 +1020,7 @@ enetc_msix_intr_assign(if_ctx_t ctx, int msix)
> > ENETC_RBICR0_ICEN | ENETC_RBICR0_SET_ICPT(ENETC_RX_INTR_PKT_THR));
> > }
> > vector = 0;
> > - for (i = 0;i < sc->tx_num_queues; i++, vector++) {
> > + for (i = 0; i < sc->tx_num_queues; i++, vector++) {
> > tx_queue = &sc->tx_queues[i];
> > snprintf(irq_name, sizeof(irq_name), "txq%d", i);
> > iflib_softirq_alloc_generic(ctx, &tx_queue->irq,
> > @@ -1130,7 +1130,7 @@ enetc_isc_txd_encap(void *data, if_pkt_info_t ipi)
> > }
> >
> > /* Now add remaining descriptors. */
> > - for (;i < ipi->ipi_nsegs; i++) {
> > + for (; i < ipi->ipi_nsegs; i++) {
> > desc = &queue->ring[pidx];
> > bzero(desc, sizeof(*desc));
> > desc->addr = segs[i].ds_addr;
> > diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
> > index 5c4718bf582f..f3d58f285b39 100644
> > --- a/sys/dev/hptmv/entry.c
> > +++ b/sys/dev/hptmv/entry.c
> > @@ -430,7 +430,7 @@ static void device_change(IAL_ADAPTER_T *pAdapter , MV_U8 channelIndex, int plug
> > if(pVDev->pParent)
> > {
> > int iMember;
> > - for(iMember = 0; iMember < pVDev->pParent->u.array.bArnMember; iMember++)
> > + for (iMember = 0; iMember < pVDev->pParent->u.array.bArnMember; iMember++)
> > if((PVDevice)pVDev->pParent->u.array.pMember[iMember] == pVDev)
> > pVDev->pParent->u.array.pMember[iMember] = NULL;
> > pVDev->pParent = NULL;
> > @@ -984,7 +984,7 @@ fRegisterVdevice(IAL_ADAPTER_T *pAdapter)
> > PVBus pVBus;
> > int i,j;
> >
> > - for(i=0;i<MV_SATA_CHANNELS_NUM;i++) {
> > + for (i = 0; i < MV_SATA_CHANNELS_NUM; i++) {
> > pPhysical = &(pAdapter->VDevices[i]);
> > pLogical = pPhysical;
> > while (pLogical->pParent) pLogical = pLogical->pParent;
> > @@ -1027,8 +1027,7 @@ GetSpareDisk(_VBUS_ARG PVDevice pArray)
> > PVDevice pVDevice, pFind = NULL;
> > int i;
> >
> > - for(i=0;i<MV_SATA_CHANNELS_NUM;i++)
> > - {
> > + for (i=0; i < MV_SATA_CHANNELS_NUM; i++) {
> > pVDevice = &pAdapter->VDevices[i];
> > if(!pVDevice)
> > continue;
> > @@ -1356,7 +1355,7 @@ unregister:
> > goto unregister;
> > }
> >
> > - for (i=0; i<MAX_COMMAND_BLOCKS_FOR_EACH_VBUS; i++) {
> > + for (i = 0; i < MAX_COMMAND_BLOCKS_FOR_EACH_VBUS; i++) {
> > FreeCommand(_VBUS_P &(pAdapter->pCommandBlocks[i]));
> > }
> >
> > @@ -1370,7 +1369,7 @@ unregister:
> >
> > memset((void *)pAdapter->pbus_dmamap, 0, sizeof(struct _BUS_DMAMAP) * MAX_QUEUE_COMM);
> > pAdapter->pbus_dmamap_list = 0;
> > - for (i=0; i < MAX_QUEUE_COMM; i++) {
> > + for (i = 0; i < MAX_QUEUE_COMM; i++) {
> > PBUS_DMAMAP pmap = &(pAdapter->pbus_dmamap[i]);
> > pmap->pAdapter = pAdapter;
> > dmamap_put(pmap);
> > @@ -1398,7 +1397,7 @@ unregister:
> > pAdapter->prdTableAlignedAddr = (PUCHAR)(((ULONG_PTR)pAdapter->prdTableAddr + 0x1f) & ~(ULONG_PTR)0x1fL);
> > {
> > PUCHAR PRDTable = pAdapter->prdTableAlignedAddr;
> > - for (i=0; i<PRD_TABLES_FOR_VBUS; i++)
> > + for (i = 0; i < PRD_TABLES_FOR_VBUS; i++)
> > {
> > /* KdPrint(("i=%d,pAdapter->pFreePRDLink=%p\n",i,pAdapter->pFreePRDLink)); */
> > FreePRDTable(pAdapter, PRDTable);
> > @@ -1447,7 +1446,7 @@ unregister:
> > }
> >
> > #ifdef SUPPORT_ARRAY
> > - for(i = MAX_ARRAY_DEVICE - 1; i >= 0; i--) {
> > + for (i = MAX_ARRAY_DEVICE - 1; i >= 0; i--) {
> > pVDev = ArrayTables(i);
> > mArFreeArrayTable(pVDev);
> > }
> > @@ -1467,7 +1466,7 @@ unregister:
> > _vbus_p->nInstances = 1;
> > fRegisterVdevice(pAdapter);
> >
> > - for (channel=0;channel<MV_SATA_CHANNELS_NUM;channel++) {
> > + for (channel = 0; channel < MV_SATA_CHANNELS_NUM; channel++) {
> > pVDev = _vbus_p->pVDevice[channel];
> > if (pVDev && pVDev->vf_online)
> > fCheckBootable(pVDev);
> > @@ -1567,7 +1566,7 @@ fResetActiveCommands(PVBus _vbus_p)
> > {
> > MV_SATA_ADAPTER *pMvSataAdapter = &((IAL_ADAPTER_T *)_vbus_p->OsExt)->mvSataAdapter;
> > MV_U8 channel;
> > - for (channel=0;channel< MV_SATA_CHANNELS_NUM;channel++) {
> > + for (channel = 0; channel < MV_SATA_CHANNELS_NUM; channel++) {
> > if (pMvSataAdapter->sataChannel[channel] && pMvSataAdapter->sataChannel[channel]->outstandingCommands)
> > MvSataResetChannel(pMvSataAdapter,channel);
> > }
> > @@ -1590,7 +1589,7 @@ check_cmds:
> > dataxfer_poll();
> > xor_poll();
> > #endif
> > - for (channel=0;channel< MV_SATA_CHANNELS_NUM;channel++) {
> > + for (channel = 0; channel < MV_SATA_CHANNELS_NUM; channel++) {
> > pMvSataChannel = pMvSataAdapter->sataChannel[channel];
> > if (pMvSataChannel && pMvSataChannel->outstandingCommands)
> > {
> > @@ -1716,7 +1715,7 @@ fDeviceSendCommand(_VBUS_ARG PCommand pCmd)
> >
> > MV_BOOLEAN is48bit;
> > MV_U8 channel;
> > - int i=0;
> > + int i = 0;
> >
> > DECLARE_BUFFER(FPSCAT_GATH, tmpSg);
> >
> > @@ -2141,7 +2140,7 @@ FlushAdapter(IAL_ADAPTER_T *pAdapter)
> > hpt_printk(("flush all devices\n"));
> >
> > /* flush all devices */
> > - for (i=0; i<MAX_VDEVICE_PER_VBUS; i++) {
> > + for (i = 0; i < MAX_VDEVICE_PER_VBUS; i++) {
> > PVDevice pVDev = pAdapter->VBus.pVDevice[i];
> > if(pVDev) fFlushVDev(pVDev);
> > }
> > @@ -2174,7 +2173,7 @@ Check_Idle_Call(IAL_ADAPTER_T *pAdapter)
> > {
> > int i;
> > PVDevice pArray;
> > - for(i = 0; i < MAX_ARRAY_PER_VBUS; i++){
> > + for (i = 0; i < MAX_ARRAY_PER_VBUS; i++) {
> > if ((pArray=ArrayTables(i))->u.array.dArStamp==0)
> > continue;
> > else if (pArray->u.array.rf_auto_rebuild) {
> > @@ -2378,7 +2377,7 @@ hpt_free_ccb(union ccb **ccb_Q, union ccb *ccb)
> > static void hpt_worker_thread(void)
> > {
> >
> > - for(;;) {
> > + for (;;) {
> > mtx_lock(&DpcQueue_Lock);
> > while (DpcQueue_First!=DpcQueue_Last) {
> > ST_HPT_DPC p;
> > @@ -2418,7 +2417,7 @@ static void hpt_worker_thread(void)
> > mtx_lock(&pAdapter->lock);
> > _vbus_p = &pAdapter->VBus;
> >
> > - for (i=0;i<MAX_ARRAY_PER_VBUS;i++)
> > + for (i = 0; i < MAX_ARRAY_PER_VBUS; i++)
> > {
> > if ((pArray=ArrayTables(i))->u.array.dArStamp==0)
> > continue;
> > @@ -2472,7 +2471,7 @@ launch_worker_thread(void)
> > int i;
> > PVDevice pVDev;
> >
> > - for(i = 0; i < MAX_ARRAY_PER_VBUS; i++)
> > + for (i = 0; i < MAX_ARRAY_PER_VBUS; i++)
> > if ((pVDev=ArrayTables(i))->u.array.dArStamp==0)
> > continue;
> > else{
> > diff --git a/sys/dev/hptmv/gui_lib.c b/sys/dev/hptmv/gui_lib.c
> > index d78fdcca69d2..f11044db733a 100644
> > --- a/sys/dev/hptmv/gui_lib.c
> > +++ b/sys/dev/hptmv/gui_lib.c
> > @@ -86,8 +86,7 @@ check_VDevice_valid(PVDevice p)
> > while(pAdapter != NULL)
> > {
> > _vbus_p = &pAdapter->VBus;
> > - for (i=0;i<MAX_ARRAY_PER_VBUS;i++)
> > - {
> > + for (i = 0; i<MAX_ARRAY_PER_VBUS; i++) {
> > pVDevice=ArrayTables(i);
> > if ((pVDevice->u.array.dArStamp != 0) && (pVDevice == p))
> > return 0;
> > @@ -244,9 +243,9 @@ static void get_array_info(PVDevice pVDevice, PHPT_ARRAY_INFO pArrayInfo)
> > if(pVDevice->u.array.pMember[i] != NULL)
> > pArrayInfo->Members[pArrayInfo->nDisk++] = VDEV_TO_ID(pVDevice->u.array.pMember[i]);
> >
> > - for(i=pArrayInfo->nDisk; i<MAX_ARRAY_MEMBERS; i++)
> > + for (i = pArrayInfo->nDisk; i < MAX_ARRAY_MEMBERS; i++)
> > pArrayInfo->Members[i] = INVALID_DEVICEID;
> > - }
> > +}
> >
> > static void get_array_info_v2(PVDevice pVDevice, PHPT_ARRAY_INFO_V2 pArrayInfo)
> > {
> > @@ -266,7 +265,7 @@ static void get_array_info_v2(PVDevice pVDevice, PHPT_ARRAY_INFO_V2 pArrayInfo)
> > if(pVDevice->u.array.pMember[i] != NULL)
> > pArrayInfo->Members[pArrayInfo->nDisk++] = VDEV_TO_ID(pVDevice->u.array.pMember[i]);
> >
> > - for(i=pArrayInfo->nDisk; i<MAX_ARRAY_MEMBERS_V2; i++)
> > + for (i = pArrayInfo->nDisk; i < MAX_ARRAY_MEMBERS_V2; i++)
> > pArrayInfo->Members[i] = INVALID_DEVICEID;
> > }
> > #endif
> > @@ -461,8 +460,7 @@ found:
> > pInfo->IoPort = 0;
> > pInfo->ControlPort = 0;
> >
> > - for (i=0; i<2 ;i++)
> > - {
> > + for (i = 0; i < 2; i++) {
> > pInfo->Devices[i] = (DEVICEID)INVALID_DEVICEID;
> > }
> >
> > diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c
> > index 38fe61ee7e04..328750d9034c 100644
> > --- a/sys/dev/hptmv/hptproc.c
> > +++ b/sys/dev/hptmv/hptproc.c
> > @@ -107,7 +107,7 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
> > return -EINVAL;
> > }
> >
> > - for (i=0;i<MV_SATA_CHANNELS_NUM;i++)
> > + for (i = 0; i < MV_SATA_CHANNELS_NUM; i++)
> > if(i == ichan)
> > goto rebuild;
> >
> > diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c
> > index d69c8ea5fded..fa0f817ed67b 100644
> > --- a/sys/dev/mps/mps_sas.c
> > +++ b/sys/dev/mps/mps_sas.c
> > @@ -858,7 +858,7 @@ mps_detach_sas(struct mps_softc *sc)
> > if (sassc->devq != NULL)
> > cam_simq_free(sassc->devq);
> >
> > - for(i=0; i< sassc->maxtargets ;i++) {
> > + for (i = 0; i < sassc->maxtargets; i++) {
> > targ = &sassc->targets[i];
> > SLIST_FOREACH_SAFE(lun, &targ->luns, lun_link, lun_tmp) {
> > free(lun, M_MPT2);
> > @@ -3396,7 +3396,7 @@ mpssas_realloc_targets(struct mps_softc *sc, int maxtargets)
> > * the allocated LUNs for each target and then the target buffer
> > * itself.
> > */
> > - for (i=0; i< maxtargets; i++) {
> > + for (i = 0; i < maxtargets; i++) {
> > targ = &sassc->targets[i];
> > SLIST_FOREACH_SAFE(lun, &targ->luns, lun_link, lun_tmp) {
> > free(lun, M_MPT2);
> > diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c
> > index 5ff08ffcf2b3..2b868f6ef070 100644
> > --- a/sys/dev/mpt/mpt_raid.c
> > +++ b/sys/dev/mpt/mpt_raid.c
> > @@ -830,7 +830,7 @@ mpt_is_raid_volume(struct mpt_softc *mpt, target_id_t tgt)
> > }
> > ioc_vol = mpt->ioc_page2->RaidVolume;
> > ioc_last_vol = ioc_vol + mpt->ioc_page2->NumActiveVolumes;
> > - for (;ioc_vol != ioc_last_vol; ioc_vol++) {
> > + for (; ioc_vol != ioc_last_vol; ioc_vol++) {
> > if (ioc_vol->VolumeID == tgt) {
> > return (1);
> > }
> > @@ -1406,7 +1406,7 @@ mpt_refresh_raid_data(struct mpt_softc *mpt)
> >
> > ioc_vol = mpt->ioc_page2->RaidVolume;
> > ioc_last_vol = ioc_vol + mpt->ioc_page2->NumActiveVolumes;
> > - for (;ioc_vol != ioc_last_vol; ioc_vol++) {
> > + for (; ioc_vol != ioc_last_vol; ioc_vol++) {
> > struct mpt_raid_volume *mpt_vol;
> >
> > mpt_vol = mpt->raid_volumes + ioc_vol->VolumePageNumber;
> > diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
> > index 4625c2616562..265181ef7ad0 100644
> > --- a/sys/dev/nfe/if_nfe.c
> > +++ b/sys/dev/nfe/if_nfe.c
> > @@ -2078,7 +2078,7 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
> > bus_dmamap_sync(sc->rxq.rx_desc_tag, sc->rxq.rx_desc_map,
> > BUS_DMASYNC_POSTREAD);
> >
> > - for (prog = 0;;NFE_INC(sc->rxq.cur, NFE_RX_RING_COUNT), vtag = 0) {
> > + for (prog = 0; ; NFE_INC(sc->rxq.cur, NFE_RX_RING_COUNT), vtag = 0) {
> > if (count <= 0)
> > break;
> > count--;
> > @@ -2192,7 +2192,7 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
> > bus_dmamap_sync(sc->jrxq.jrx_desc_tag, sc->jrxq.jrx_desc_map,
> > BUS_DMASYNC_POSTREAD);
> >
> > - for (prog = 0;;NFE_INC(sc->jrxq.jcur, NFE_JUMBO_RX_RING_COUNT),
> > + for (prog = 0; ; NFE_INC(sc->jrxq.jcur, NFE_JUMBO_RX_RING_COUNT),
> > vtag = 0) {
> > if (count <= 0)
> > break;
> > diff --git a/sys/dev/ocs_fc/ocs_mgmt.c b/sys/dev/ocs_fc/ocs_mgmt.c
> > index 726b499f28ba..5b7f6557c017 100644
> > --- a/sys/dev/ocs_fc/ocs_mgmt.c
> > +++ b/sys/dev/ocs_fc/ocs_mgmt.c
> > @@ -226,7 +226,7 @@ ocs_mgmt_get_list(ocs_t *ocs, ocs_textbuf_t *textbuf)
> >
> > ocs_mgmt_start_unnumbered_section(textbuf, "ocs");
> >
> > - for (i=0;i<ARRAY_SIZE(mgmt_table);i++) {
> > + for (i = 0; i < ARRAY_SIZE(mgmt_table); i++) {
> > access = 0;
> > if (mgmt_table[i].get_handler) {
> > access |= MGMT_MODE_RD;
> > @@ -305,7 +305,7 @@ ocs_mgmt_get(ocs_t *ocs, char *name, ocs_textbuf_t *textbuf)
> > if (ocs_strncmp(name, qualifier, strlen(qualifier)) == 0) {
> > char *unqualified_name = name + strlen(qualifier) + 1;
> >
> > - for (i=0;i<ARRAY_SIZE(mgmt_table);i++) {
> > + for (i = 0; i < ARRAY_SIZE(mgmt_table); i++) {
> > if (ocs_strcmp(unqualified_name, mgmt_table[i].name) == 0) {
> > if (mgmt_table[i].get_handler) {
> > mgmt_table[i].get_handler(ocs, name, textbuf);
> > @@ -387,7 +387,7 @@ ocs_mgmt_set(ocs_t *ocs, char *name, char *value)
> > char *unqualified_name = name + strlen(qualifier) +1;
> >
> > /* See if it's a value I can set */
> > - for (i=0;i<ARRAY_SIZE(mgmt_table);i++) {
> > + for (i = 0; i < ARRAY_SIZE(mgmt_table); i++) {
> > if (ocs_strcmp(unqualified_name, mgmt_table[i].name) == 0) {
> > if (mgmt_table[i].set_handler) {
> > return mgmt_table[i].set_handler(ocs, name, value);
> > @@ -469,7 +469,7 @@ ocs_mgmt_exec(ocs_t *ocs, char *action, void *arg_in,
> > char *unqualified_name = action + strlen(qualifier) +1;
> >
> > /* See if it's an action I can perform */
> > - for (i=0;i<ARRAY_SIZE(mgmt_table); i++) {
> > + for (i = 0; i < ARRAY_SIZE(mgmt_table); i++) {
> > if (ocs_strcmp(unqualified_name, mgmt_table[i].name) == 0) {
> > if (mgmt_table[i].action_handler) {
> > return mgmt_table[i].action_handler(ocs, action, arg_in, arg_in_length,
> > @@ -527,7 +527,7 @@ ocs_mgmt_get_all(ocs_t *ocs, ocs_textbuf_t *textbuf)
> >
> > ocs_mgmt_start_unnumbered_section(textbuf, "ocs");
> >
> > - for (i=0;i<ARRAY_SIZE(mgmt_table);i++) {
> > + for (i = 0; i < ARRAY_SIZE(mgmt_table); i++) {
> > if (mgmt_table[i].get_handler) {
> > mgmt_table[i].get_handler(ocs, mgmt_table[i].name, textbuf);
> > } else if (mgmt_table[i].action_handler) {
> > @@ -1212,7 +1212,7 @@ get_sfp_a2(ocs_t *ocs, char *name, ocs_textbuf_t *textbuf)
> > int buffer_remaining = (SFP_PAGE_SIZE * 3) + 1;
> > int bytes_added;
> >
> > - for (i=0; i < bytes_read; i++) {
> > + for (i = 0; i < bytes_read; i++) {
> > bytes_added = ocs_snprintf(d, buffer_remaining, "%02x ", *s);
> > ++s;
> > d += bytes_added;
> > @@ -2040,7 +2040,7 @@ get_profile_list(ocs_t *ocs, char *name, ocs_textbuf_t *textbuf)
> > result_buf = ocs_malloc(ocs, BUFFER_SIZE, OCS_M_ZERO);
> > bytes_left = BUFFER_SIZE;
> >
> > - for (i=0; i<result.list->num_descriptors; i++) {
> > + for (i = 0; i < result.list->num_descriptors; i++) {
> > sprintf(result_line, "0x%02x:%s\n", result.list->descriptors[i].profile_id,
> > result.list->descriptors[i].profile_description);
> > if (strlen(result_line) < bytes_left) {
> > diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
> > index 9870379e2eba..de75f4747709 100644
> > --- a/sys/dev/ppc/ppc.c
> > +++ b/sys/dev/ppc/ppc.c
> > @@ -1389,7 +1389,7 @@ ppc_exec_microseq(device_t dev, struct ppb_microseq **p_msq)
> >
> > /* let's suppose the next instr. is the same */
> > prefetch:
> > - for (;mi->opcode == MS_OP_RASSERT; INCR_PC)
> > + for (; mi->opcode == MS_OP_RASSERT; INCR_PC)
> > w_reg(mi->arg[0].i, ppc, (char)mi->arg[1].i);
> >
> > if (mi->opcode == MS_OP_DELAY) {
> > diff --git a/sys/dev/smartpqi/smartpqi_event.c b/sys/dev/smartpqi/smartpqi_event.c
> > index f000d9ce9db3..88dcf45dd08a 100644
> > --- a/sys/dev/smartpqi/smartpqi_event.c
> > +++ b/sys/dev/smartpqi/smartpqi_event.c
> > @@ -115,7 +115,7 @@ pqisrc_ack_all_events(void *arg1)
> >
> >
> > pending_event = &softs->pending_events[0];
> > - for (i=0; i < PQI_NUM_SUPPORTED_EVENTS; i++) {
> > + for (i = 0; i < PQI_NUM_SUPPORTED_EVENTS; i++) {
> > if (pending_event->pending == true) {
> > pending_event->pending = false;
> > pqisrc_acknowledge_event(softs, pending_event);
> > @@ -417,7 +417,7 @@ pqisrc_report_event_config(pqisrc_softstate_t *softs)
> > softs->event_config.num_event_descriptors = MIN(event_config_p->num_event_descriptors,
> > PQI_MAX_EVENT_DESCRIPTORS) ;
> >
> > - for (i=0; i < softs->event_config.num_event_descriptors ;i++){
> > + for (i = 0; i < softs->event_config.num_event_descriptors; i++) {
> > softs->event_config.descriptors[i].event_type =
> > event_config_p->descriptors[i].event_type;
> > }
> > @@ -477,7 +477,7 @@ pqisrc_set_event_config(pqisrc_softstate_t *softs)
> > event_config_p->num_event_descriptors = softs->event_config.num_event_descriptors;
> >
> >
> > - for (i=0; i < softs->event_config.num_event_descriptors ; i++){
> > + for (i = 0; i < softs->event_config.num_event_descriptors; i++) {
> > event_config_p->descriptors[i].event_type =
> > softs->event_config.descriptors[i].event_type;
> > if( pqisrc_event_type_to_event_index(event_config_p->descriptors[i].event_type) != -1)
> > diff --git a/sys/dev/smartpqi/smartpqi_queue.c b/sys/dev/smartpqi/smartpqi_queue.c
> > index 2e80b01b5436..f05c951cd4f9 100644
> > --- a/sys/dev/smartpqi/smartpqi_queue.c
> > +++ b/sys/dev/smartpqi/smartpqi_queue.c
> > @@ -700,7 +700,7 @@ pqisrc_create_op_obq(pqisrc_softstate_t *softs,
> > } else {
> > int i = 0;
> > DBG_WARN("Error Status Descriptors\n");
> > - for(i = 0; i < 4;i++)
> > + for (i = 0; i < 4; i++)
> > DBG_WARN(" %x ",admin_resp.resp_type.create_op_oq.status_desc[i]);
> > }
> >
> > @@ -743,7 +743,7 @@ pqisrc_create_op_ibq(pqisrc_softstate_t *softs,
> > } else {
> > int i = 0;
> > DBG_WARN("Error Status Decsriptors\n");
> > - for(i = 0; i < 4;i++)
> > + for (i = 0; i < 4; i++)
> > DBG_WARN(" %x ",admin_resp.resp_type.create_op_iq.status_desc[i]);
> > }
> >
> > diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
> > index fa65d544e17d..b4e5c1075fb4 100644
> > --- a/sys/dev/sym/sym_hipd.c
> > +++ b/sys/dev/sym/sym_hipd.c
> > @@ -3266,7 +3266,7 @@ static void sym_init (hcb_p np, int reason)
> > * Reinitialize usrwide.
> > * Prepare sync negotiation according to actual SCSI bus mode.
> > */
> > - for (i=0;i<SYM_CONF_MAX_TARGET;i++) {
> > + for (i = 0; i < SYM_CONF_MAX_TARGET; i++) {
> > tcb_p tp = &np->target[i];
> >
> > tp->to_reset = 0;
> > @@ -3715,7 +3715,7 @@ static void sym_log_hard_error(hcb_p np, u_short sist, u_char dstat)
> > }
> >
> > printf ("%s: regdump:", sym_name(np));
> > - for (i=0; i<24;i++)
> > + for (i = 0; i < 24; i++)
> > printf (" %02x", (unsigned)INB_OFF(i));
> > printf (".\n");
> >
> > @@ -5527,8 +5527,8 @@ static int sym_show_msg (u_char * msg)
> > u_char i;
> > printf ("%x",*msg);
> > if (*msg==M_EXTENDED) {
> > - for (i=1;i<8;i++) {
> > - if (i-1>msg[1]) break;
> > + for (i = 1; i < 8; i++) {
> > + if (i - 1 > msg[1]) break;
> > printf ("-%x",msg[i]);
> > }
> > return (i+1);
> > @@ -6744,10 +6744,10 @@ restart_test:
> > /*
> > * Wait 'til done (with timeout)
> > */
> > - for (i=0; i<SYM_SNOOP_TIMEOUT; i++)
> > + for (i = 0; i < SYM_SNOOP_TIMEOUT; i++)
> > if (INB(nc_istat) & (INTF|SIP|DIP))
> > break;
> > - if (i>=SYM_SNOOP_TIMEOUT) {
> > + if (i >= SYM_SNOOP_TIMEOUT) {
> > printf ("CACHE TEST FAILED: timeout.\n");
> > return (0x20);
> > }
> > diff --git a/sys/dev/tws/tws.c b/sys/dev/tws/tws.c
> > index af151c8c4f06..fccd6689a6aa 100644
> > --- a/sys/dev/tws/tws.c
> > +++ b/sys/dev/tws/tws.c
> > @@ -311,7 +311,7 @@ attach_fail_4:
> > if (sc->cmd_tag)
> > bus_dma_tag_destroy(sc->cmd_tag);
> > attach_fail_3:
> > - for(i=0;i<sc->irqs;i++) {
> > + for (i = 0; i < sc->irqs; i++) {
> > if ( sc->irq_res[i] ){
> > if (bus_release_resource(sc->tws_dev,
> > SYS_RES_IRQ, sc->irq_res_id[i], sc->irq_res[i]))
> > @@ -369,7 +369,7 @@ tws_detach(device_t dev)
> > tws_teardown_intr(sc);
> >
> > /* Release irq resource */
> > - for(i=0;i<sc->irqs;i++) {
> > + for (i = 0; i < sc->irqs; i++) {
> > if ( sc->irq_res[i] ){
> > if (bus_release_resource(sc->tws_dev,
> > SYS_RES_IRQ, sc->irq_res_id[i], sc->irq_res[i]))
> > @@ -402,7 +402,7 @@ tws_detach(device_t dev)
> > TWS_TRACE(sc, "bus release mem resource", 0, sc->reg_res_id);
> > }
> >
> > - for ( i=0; i< tws_queue_depth; i++) {
> > + for (i = 0; i < tws_queue_depth; i++) {
> > if (sc->reqs[i].dma_map)
> > bus_dmamap_destroy(sc->data_tag, sc->reqs[i].dma_map);
> > callout_drain(&sc->reqs[i].timeout);
> > @@ -432,7 +432,7 @@ tws_setup_intr(struct tws_softc *sc, int irqs)
> > {
> > int i, error;
> >
> > - for(i=0;i<irqs;i++) {
> > + for (i = 0; i < irqs; i++) {
> > if (!(sc->intr_handle[i])) {
> > if ((error = bus_setup_intr(sc->tws_dev, sc->irq_res[i],
> > INTR_TYPE_CAM | INTR_MPSAFE,
> > @@ -452,7 +452,7 @@ tws_teardown_intr(struct tws_softc *sc)
> > {
> > int i;
> >
> > - for(i=0;i<sc->irqs;i++) {
> > + for (i = 0; i < sc->irqs; i++) {
> > if (sc->intr_handle[i]) {
> > bus_teardown_intr(sc->tws_dev,
> > sc->irq_res[i], sc->intr_handle[i]);
> > @@ -669,8 +669,7 @@ tws_init_reqs(struct tws_softc *sc, u_int32_t dma_mem_size)
> > bzero(cmd_buf, dma_mem_size);
> > TWS_TRACE_DEBUG(sc, "phy cmd", sc->dma_mem_phys, 0);
> > mtx_lock(&sc->q_lock);
> > - for ( i=0; i< tws_queue_depth; i++)
> > - {
> > + for (i = 0; i < tws_queue_depth; i++) {
> > if (bus_dmamap_create(sc->data_tag, 0, &sc->reqs[i].dma_map)) {
> > /* log a ENOMEM failure msg here */
> > mtx_unlock(&sc->q_lock);
> > diff --git a/sys/dev/tws/tws_services.c b/sys/dev/tws/tws_services.c
> > index da8bbacc39f7..e5c3d45c533f 100644
> > --- a/sys/dev/tws/tws_services.c
> > +++ b/sys/dev/tws/tws_services.c
> > @@ -200,7 +200,7 @@ tws_init_qs(struct tws_softc *sc)
> > {
> >
> > mtx_lock(&sc->q_lock);
> > - for(int i=0;i<TWS_MAX_QS;i++) {
> > + for (int i = 0; i < TWS_MAX_QS; i++) {
> > sc->q_head[i] = NULL;
> > sc->q_tail[i] = NULL;
> > }
> > diff --git a/sys/fs/devfs/devfs_dir.c b/sys/fs/devfs/devfs_dir.c
> > index 3dc87538017d..aad87606e738 100644
> > --- a/sys/fs/devfs/devfs_dir.c
> > +++ b/sys/fs/devfs/devfs_dir.c
> > @@ -162,7 +162,7 @@ int
> > devfs_pathpath(const char *p1, const char *p2)
> > {
> >
> > - for (;;p1++, p2++) {
> > + for (;; p1++, p2++) {
> > if (*p1 != *p2) {
> > if (*p1 == '/' && *p2 == '\0')
> > return (1);
> > diff --git a/sys/fs/udf/osta.c b/sys/fs/udf/osta.c
> > index f79b86993367..1a083d8c26b1 100644
> > --- a/sys/fs/udf/osta.c
> > +++ b/sys/fs/udf/osta.c
> > @@ -383,7 +383,7 @@ int UDFTransName(
> > int maxFilenameLen;
> > /* Translate extension, and store it in ext. */
> > for(index = 0; index<EXT_SIZE &&
> > - extIndex + index +1 < udfLen; index++ ) {
> > + extIndex + index +1 < udfLen; index++) {
> > current = udfName[extIndex + index + 1];
> > if (IsIllegal(current) ||
> > !UnicodeIsPrint(current)) {
> > @@ -432,7 +432,7 @@ int UDFTransName(
> > /* Place a translated extension at end, if found. */
> > if (hasExt) {
> > newName[newIndex++] = PERIOD;
> > - for (index = 0;index < localExtIndex ;index++ ) {
> > + for (index = 0; index < localExtIndex; index++) {
> > newName[newIndex++] = ext[index];
> > }
> > }
> > diff --git a/sys/i386/i386/in_cksum_machdep.c b/sys/i386/i386/in_cksum_machdep.c
> > index 27ab09d82da0..b658d85bc892 100644
> > --- a/sys/i386/i386/in_cksum_machdep.c
> > +++ b/sys/i386/i386/in_cksum_machdep.c
> > @@ -84,7 +84,7 @@ in_cksum_skip(struct mbuf *m, int len, int skip)
> > }
> > }
> >
> > - for (;m && len; m = m->m_next) {
> > + for (; m && len; m = m->m_next) {
> > if (m->m_len == 0)
> > continue;
> > w = mtod(m, u_short *);
> > diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
> > index ab8ed32ad189..c4b1c8201ff2 100644
> > --- a/sys/kern/kern_exit.c
> > +++ b/sys/kern/kern_exit.c
> > @@ -807,7 +807,7 @@ kern_abort2(struct thread *td, const char *why, int nargs, void **uargs)
> > }
> > if (nargs > 0) {
> > sbuf_putc(sb, '(');
> > - for (i = 0;i < nargs; i++)
> > + for (i = 0; i < nargs; i++)
> > sbuf_printf(sb, "%s%p", i == 0 ? "" : ", ", uargs[i]);
> > sbuf_putc(sb, ')');
> > }
> > diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
> > index e919b15543b2..fcbfbe64f854 100644
> > --- a/sys/kern/kern_malloc.c
> > +++ b/sys/kern/kern_malloc.c
> > @@ -1302,7 +1302,7 @@ mallocinit(void *dummy)
> > #endif
> > align, UMA_ZONE_MALLOC);
> > }
> > - for (;i <= size; i+= KMEM_ZBASE)
> > + for (; i <= size; i+= KMEM_ZBASE)
> > kmemsize[i >> KMEM_ZSHIFT] = indx;
> > }
> > }
> > diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
> > index 07a9cc0f57be..c4d0223d484f 100644
> > --- a/sys/kern/subr_devstat.c
> > +++ b/sys/kern/subr_devstat.c
> > @@ -415,7 +415,7 @@ sysctl_devstat(SYSCTL_HANDLER_ARGS)
> > if (error != 0)
> > return (error);
> >
> > - for (;nds != NULL;) {
> > + while (nds != NULL) {
> > error = SYSCTL_OUT(req, nds, sizeof(struct devstat));
> > if (error != 0)
> > return (error);
> > diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
> > index db0ceb17b9f0..e2070ae3f865 100644
> > --- a/sys/kern/subr_prf.c
> > +++ b/sys/kern/subr_prf.c
> > @@ -766,7 +766,7 @@ reswitch: switch (ch = (u_char)*fmt++) {
> > PCHAR(hex2ascii(*up & 0x0f));
> > up++;
> > if (width)
> > - for (q=p;*q;q++)
> > + for (q = p; *q; q++)
> > PCHAR(*q);
> > }
> > break;
> > diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c
> > index 374b5595fcbc..5b89ca026e85 100644
> > --- a/sys/netinet/siftr.c
> > +++ b/sys/netinet/siftr.c
> > @@ -519,7 +519,7 @@ siftr_pkt_manager_thread(void *arg)
> > if (log_buf != NULL) {
> > alq_post_flags(siftr_alq, log_buf, 0);
> > }
> > - for (;cnt > 0; cnt--) {
> > + for (; cnt > 0; cnt--) {
> > pkt_node = STAILQ_FIRST(&tmp_pkt_queue);
> > STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes);
> > free(pkt_node, M_SIFTR_PKTNODE);
> > diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c
> > index b3f52322425f..d522f9da0fbe 100644
> > --- a/sys/netpfil/ipfw/ip_dummynet.c
> > +++ b/sys/netpfil/ipfw/ip_dummynet.c
> > @@ -1150,7 +1150,7 @@ copy_data_helper(void *_o, void *_arg)
> > return 0; /* not a pipe */
> >
> > /* see if the object is within one of our ranges */
> > - for (;r < lim; r += 2) {
> > + for (; r < lim; r += 2) {
> > if (n < r[0] || n > r[1])
> > continue;
> > /* Found a valid entry, copy and we are done */
> > @@ -1183,7 +1183,7 @@ copy_data_helper(void *_o, void *_arg)
> > if (n >= DN_MAX_ID)
> > return 0;
> > /* see if the object is within one of our ranges */
> > - for (;r < lim; r += 2) {
> > + for (; r < lim; r += 2) {
> > if (n < r[0] || n > r[1])
> > continue;
> > if (copy_flowset(a, fs, 0))