kernel: Use NELEM() in some more places.

diff --git a/sys/bus/cam/cam.c b/sys/bus/cam/cam.c
index 1d9b653..c26284b 100644 (file)
--- a/sys/bus/cam/cam.c
+++ b/sys/bus/cam/cam.c
@@ -101,8 +101,7 @@ const struct cam_status_entry cam_status_table[] = {
        { CAM_SCSI_BUSY,         "SCSI Bus Busy"                             },
 };
 
-const int num_cam_status_entries =
-    sizeof(cam_status_table)/sizeof(*cam_status_table);
+const int num_cam_status_entries = NELEM(cam_status_table);
 
 #ifdef _KERNEL
 SYSCTL_NODE(_kern, OID_AUTO, cam, CTLFLAG_RD, 0, "CAM Subsystem");

diff --git a/sys/bus/cam/cam_xpt.c b/sys/bus/cam/cam_xpt.c
index b7b8c45..cc37fbf 100644 (file)
--- a/sys/bus/cam/cam_xpt.c
+++ b/sys/bus/cam/cam_xpt.c
@@ -620,8 +620,7 @@ static struct xpt_quirk_entry xpt_quirk_table[] =
        },
 };
 
-static const int xpt_quirk_table_size =
-       sizeof(xpt_quirk_table) / sizeof(*xpt_quirk_table);
+static const int xpt_quirk_table_size = NELEM(xpt_quirk_table);
 
 typedef enum {
        DM_RET_COPY             = 0x01,
@@ -6401,7 +6400,7 @@ xpt_find_quirk(struct cam_ed *device)
 
        match = cam_quirkmatch((caddr_t)&device->inq_data,
                               (caddr_t)xpt_quirk_table,
-                              sizeof(xpt_quirk_table)/sizeof(*xpt_quirk_table),
+                              NELEM(xpt_quirk_table),
                               sizeof(*xpt_quirk_table), scsi_inquiry_match);
 
        if (match == NULL)

diff --git a/sys/bus/cam/scsi/scsi_all.c b/sys/bus/cam/scsi/scsi_all.c
index e56f951..f709b55 100644 (file)
--- a/sys/bus/cam/scsi/scsi_all.c
+++ b/sys/bus/cam/scsi/scsi_all.c
@@ -144,7 +144,7 @@ static struct scsi_op_quirk_entry scsi_op_quirk_table[] = {
                 * feel free to change this quirk entry.
                 */
                {T_CDROM, SIP_MEDIA_REMOVABLE, "PLEXTOR", "CD-ROM PX*", "*"},
-               sizeof(plextor_cd_ops)/sizeof(struct op_table_entry),
+               NELEM(plextor_cd_ops),
                plextor_cd_ops
        }
 };
@@ -617,8 +617,7 @@ scsi_op_desc(u_int16_t opcode, struct scsi_inquiry_data *inq_data)
 
        match = cam_quirkmatch((caddr_t)inq_data,
                               (caddr_t)scsi_op_quirk_table,
-                              sizeof(scsi_op_quirk_table)/
-                              sizeof(*scsi_op_quirk_table),
+                              NELEM(scsi_op_quirk_table),
                               sizeof(*scsi_op_quirk_table),
                               scsi_inquiry_match);
 
@@ -727,7 +726,7 @@ static struct scsi_sense_quirk_entry sense_quirk_table[] = {
                 */
                {T_DIRECT, SIP_MEDIA_FIXED, "QUANTUM", "FIREBALL S*", "*"},
                /*num_sense_keys*/0,
-               sizeof(quantum_fireball_entries)/sizeof(struct asc_table_entry),
+               NELEM(quantum_fireball_entries),
                /*sense key entries*/NULL,
                quantum_fireball_entries
        },
@@ -738,7 +737,7 @@ static struct scsi_sense_quirk_entry sense_quirk_table[] = {
                 */
                {T_DIRECT, SIP_MEDIA_REMOVABLE, "SONY", "SMO-*", "*"},
                /*num_sense_keys*/0,
-               sizeof(sony_mo_entries)/sizeof(struct asc_table_entry),
+               NELEM(sony_mo_entries),
                /*sense key entries*/NULL,
                sony_mo_entries
        }

diff --git a/sys/bus/cam/scsi/scsi_cd.c b/sys/bus/cam/scsi/scsi_cd.c
index d27ea38..ef9d82b 100644 (file)
--- a/sys/bus/cam/scsi/scsi_cd.c
+++ b/sys/bus/cam/scsi/scsi_cd.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.31.2.16 2003/10/21 22:26:11 thomas Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.44 2008/07/18 00:07:23 dillon Exp $
  */
 /*
  * Portions of this driver taken from the original FreeBSD cd driver.
@@ -702,7 +701,7 @@ cdregister(struct cam_periph *periph, void *arg)
         */
        match = cam_quirkmatch((caddr_t)&cgd->inq_data,
                               (caddr_t)cd_quirk_table,
-                              sizeof(cd_quirk_table)/sizeof(*cd_quirk_table),
+                              NELEM(cd_quirk_table),
                               sizeof(*cd_quirk_table), scsi_inquiry_match);
 
        if (match != NULL)
@@ -1869,8 +1868,7 @@ cdgetpagesize(int page_num)
 {
        int i;
 
-       for (i = 0; i < (sizeof(cd_page_size_table)/
-           sizeof(cd_page_size_table[0])); i++) {
+       for (i = 0; i < NELEM(cd_page_size_table); i++) {
                if (cd_page_size_table[i].page == page_num)
                        return (cd_page_size_table[i].page_size);
        }

diff --git a/sys/bus/cam/scsi/scsi_da.c b/sys/bus/cam/scsi/scsi_da.c
index 574c879..2a566fc 100644 (file)
--- a/sys/bus/cam/scsi/scsi_da.c
+++ b/sys/bus/cam/scsi/scsi_da.c
@@ -1176,7 +1176,7 @@ daregister(struct cam_periph *periph, void *arg)
         */
        match = cam_quirkmatch((caddr_t)&cgd->inq_data,
                               (caddr_t)da_quirk_table,
-                              sizeof(da_quirk_table)/sizeof(*da_quirk_table),
+                              NELEM(da_quirk_table),
                               sizeof(*da_quirk_table), scsi_inquiry_match);
 
        if (match != NULL)

diff --git a/sys/bus/cam/scsi/scsi_sa.c b/sys/bus/cam/scsi/scsi_sa.c
index dee5b7e..4ffc4ab 100644 (file)
--- a/sys/bus/cam/scsi/scsi_sa.c
+++ b/sys/bus/cam/scsi/scsi_sa.c
@@ -1489,7 +1489,7 @@ saregister(struct cam_periph *periph, void *arg)
         */
        match = cam_quirkmatch((caddr_t)&cgd->inq_data,
                               (caddr_t)sa_quirk_table,
-                              sizeof(sa_quirk_table)/sizeof(*sa_quirk_table),
+                              NELEM(sa_quirk_table),
                               sizeof(*sa_quirk_table), scsi_inquiry_match);
 
        if (match != NULL) {

diff --git a/sys/dev/disk/advansys/adv_isa.c b/sys/dev/disk/advansys/adv_isa.c
index 8de61ba..1f1d765 100644 (file)
--- a/sys/dev/disk/advansys/adv_isa.c
+++ b/sys/dev/disk/advansys/adv_isa.c
@@ -90,7 +90,7 @@ static u_int16_t adv_isa_ioports[] =
        0x330   /* Eighth and default selection in BIOS setup */
 };
 
-#define MAX_ISA_IOPORT_INDEX (sizeof(adv_isa_ioports)/sizeof(u_int16_t) - 1)
+#define MAX_ISA_IOPORT_INDEX (NELEM(adv_isa_ioports) - 1)
 
 static int     adv_isa_probe(device_t dev);
 static  int    adv_isa_attach(device_t dev);

diff --git a/sys/dev/disk/advansys/advlib.c b/sys/dev/disk/advansys/advlib.c
index 5ef01ff..3c40e47 100644 (file)
--- a/sys/dev/disk/advansys/advlib.c
+++ b/sys/dev/disk/advansys/advlib.c
@@ -307,7 +307,7 @@ advasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg)
 
                target_mask = ADV_TID_TO_TARGET_MASK(cgd->ccb_h.target_id);
 
-               num_entries = sizeof(adv_quirk_table)/sizeof(*adv_quirk_table);
+               num_entries = NELEM(adv_quirk_table);
                match = cam_quirkmatch((caddr_t)&cgd->inq_data,
                                       (caddr_t)adv_quirk_table,
                                       num_entries, sizeof(*adv_quirk_table),

diff --git a/sys/dev/disk/advansys/adw_pci.c b/sys/dev/disk/advansys/adw_pci.c
index 9aefc52..71728d9 100644 (file)
--- a/sys/dev/disk/advansys/adw_pci.c
+++ b/sys/dev/disk/advansys/adw_pci.c
@@ -114,8 +114,7 @@ struct adw_pci_identity adw_pci_ident_table[] =
 #endif
 };
 
-static const int adw_num_pci_devs =
-       sizeof(adw_pci_ident_table) / sizeof(*adw_pci_ident_table);
+static const int adw_num_pci_devs = NELEM(adw_pci_ident_table);
 
 #define ADW_PCI_MAX_DMA_ADDR    (0xFFFFFFFFUL)
 #define ADW_PCI_MAX_DMA_COUNT   (0xFFFFFFFFUL)

diff --git a/sys/dev/disk/isp/isp.c b/sys/dev/disk/isp/isp.c
index b483918..4d388ca 100644 (file)
--- a/sys/dev/disk/isp/isp.c
+++ b/sys/dev/disk/isp/isp.c
@@ -1,5 +1,4 @@
 /* $FreeBSD: src/sys/dev/isp/isp.c,v 1.41.2.23 2002/10/11 17:34:28 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/disk/isp/isp.c,v 1.5 2007/05/13 22:25:42 swildner Exp $ */
 /*
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
@@ -5245,10 +5244,10 @@ isp_mboxcmd_qnw(struct ispsoftc *isp, mbreg_t *mbp, int nodelay)
 
        if (IS_FC(isp)) {
                mcp = mbpfc;
-               lim = (sizeof (mbpfc) / sizeof (mbpfc[0]));
+               lim = NELEM(mbpfc);
        } else {
                mcp = mbpscsi;
-               lim = (sizeof (mbpscsi) / sizeof (mbpscsi[0]));
+               lim = NELEM(mbpscsi);
        }
        opcode = mbp->param[0];
        ibits = HIBYT(mcp[opcode]) & NMBOX_BMASK(isp);
@@ -5286,10 +5285,10 @@ isp_mboxcmd(struct ispsoftc *isp, mbreg_t *mbp, int logmask)
 
        if (IS_FC(isp)) {
                mcp = mbpfc;
-               lim = (sizeof (mbpfc) / sizeof (mbpfc[0]));
+               lim = NELEM(mbpfc);
        } else {
                mcp = mbpscsi;
-               lim = (sizeof (mbpscsi) / sizeof (mbpscsi[0]));
+               lim = NELEM(mbpscsi);
        }
 
        if ((opcode = mbp->param[0]) >= lim) {

diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c
index fcf7bb8..6737ed1 100644 (file)
--- a/sys/dev/misc/psm/psm.c
+++ b/sys/dev/misc/psm/psm.c
@@ -468,8 +468,7 @@ static struct {
        { MOUSE_MODEL_GENERIC,
          0xc0, MOUSE_PS2_PACKETSIZE, NULL },
 };
-#define        GENERIC_MOUSE_ENTRY     \
-    ((sizeof(vendortype) / sizeof(*vendortype)) - 1)
+#define        GENERIC_MOUSE_ENTRY     (NELEM(vendortype) - 1)
 
 /* device driver declarateion */
 static device_method_t psm_methods[] = {

diff --git a/sys/dev/netif/ae/if_ae.c b/sys/dev/netif/ae/if_ae.c
index e39bea0..d4ba61a 100644 (file)
--- a/sys/dev/netif/ae/if_ae.c
+++ b/sys/dev/netif/ae/if_ae.c
@@ -213,8 +213,8 @@ struct {
        STATS_ENTRY("truncated", "frames truncated due to Rx FIFO inderrun",
            rx_trunc)
 };
-#define AE_STATS_RX_LEN (sizeof(ae_stats_rx) / sizeof(*ae_stats_rx))
-#define AE_STATS_TX_LEN (sizeof(ae_stats_tx) / sizeof(*ae_stats_tx))
+#define AE_STATS_RX_LEN NELEM(ae_stats_rx)
+#define AE_STATS_TX_LEN NELEM(ae_stats_tx)
 
 static void
 ae_stop(struct ae_softc *sc)

diff --git a/sys/dev/netif/lnc/if_lnc_isa.c b/sys/dev/netif/lnc/if_lnc_isa.c
index 38318c3..a5d83f2 100644 (file)
--- a/sys/dev/netif/lnc/if_lnc_isa.c
+++ b/sys/dev/netif/lnc/if_lnc_isa.c
@@ -252,8 +252,7 @@ le_isa_probe(device_t dev)
        case 0:
                return (-20);
        case ENOENT:
-               for (i = 0; i < sizeof(le_isa_params) /
-                   sizeof(le_isa_params[0]); i++) {
+               for (i = 0; i < NELEM(le_isa_params); i++) {
                        if (le_isa_probe_legacy(dev, &le_isa_params[i]) == 0) {
                                device_set_desc(dev, le_isa_params[i].name);
                                return (-20);
@@ -288,8 +287,7 @@ le_isa_attach(device_t dev)
                macstride = 1;
                break;
        case ENOENT:
-               for (i = 0; i < sizeof(le_isa_params) /
-                   sizeof(le_isa_params[0]); i++) {
+               for (i = 0; i < NELEM(le_isa_params); i++) {
                        if (le_isa_probe_legacy(dev, &le_isa_params[i]) == 0) {
                                lesc->sc_rres = bus_alloc_resource(dev,
                                    SYS_RES_IOPORT, &lesc->sc_rrid, 0, ~0,

diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c
index a552339..82ace01 100644 (file)
--- a/sys/dev/netif/mxge/if_mxge.c
+++ b/sys/dev/netif/mxge/if_mxge.c
@@ -2862,9 +2862,7 @@ mxge_media_probe(mxge_softc_t *sc)
        if (*ptr == 'R') {
                /* -R is XFP */
                mxge_media_types = mxge_xfp_media_types;
-               mxge_media_type_entries = 
-                       sizeof (mxge_xfp_media_types) /
-                       sizeof (mxge_xfp_media_types[0]);
+               mxge_media_type_entries = NELEM(mxge_xfp_media_types);
                byte = MXGE_XFP_COMPLIANCE_BYTE;
                cage_type = "XFP";
        }
@@ -2872,9 +2870,7 @@ mxge_media_probe(mxge_softc_t *sc)
        if (*ptr == 'S' || *(ptr +1) == 'S') {
                /* -S or -2S is SFP+ */
                mxge_media_types = mxge_sfp_media_types;
-               mxge_media_type_entries = 
-                       sizeof (mxge_sfp_media_types) /
-                       sizeof (mxge_sfp_media_types[0]);
+               mxge_media_type_entries = NELEM(mxge_sfp_media_types);
                cage_type = "SFP+";
                byte = 3;
        }

diff --git a/sys/dev/netif/ndis/if_ndis.c b/sys/dev/netif/ndis/if_ndis.c
index 0d2f22a..37dc7e5 100644 (file)
--- a/sys/dev/netif/ndis/if_ndis.c
+++ b/sys/dev/netif/ndis/if_ndis.c
@@ -2244,7 +2244,7 @@ ndis_setstate_80211(struct ndis_softc *sc)
 
        /* Set TX power */
        if ((ic->ic_caps & IEEE80211_C_TXPMGT) &&
-           ic->ic_txpowlimit < (sizeof(dBm2mW) / sizeof(dBm2mW[0]))) {
+           ic->ic_txpowlimit < NELEM(dBm2mW)) {
                arg = dBm2mW[ic->ic_txpowlimit];
                len = sizeof(arg);
                ndis_set_info(sc, OID_802_11_TX_POWER_LEVEL, &arg, &len);
@@ -2665,7 +2665,7 @@ ndis_getstate_80211(struct ndis_softc *sc)
        if (ic->ic_caps & IEEE80211_C_TXPMGT) {
                len = sizeof(arg);
                ndis_get_info(sc, OID_802_11_TX_POWER_LEVEL, &arg, &len);
-               for (i = 0; i < (sizeof(dBm2mW) / sizeof(dBm2mW[0])); i++)
+               for (i = 0; i < NELEM(dBm2mW); i++)
                        if (dBm2mW[i] >= arg)
                                break;
                ic->ic_txpowlimit = i;

diff --git a/sys/dev/serial/rp/rp.c b/sys/dev/serial/rp/rp.c
index 4c8c35b..355c80d 100644 (file)
--- a/sys/dev/serial/rp/rp.c
+++ b/sys/dev/serial/rp/rp.c
@@ -942,10 +942,10 @@ rp_releaseresource(CONTROLLER_t *ctlp)
 
        if (ctlp->rp != NULL) {
                crit_enter();
-               for (i = 0 ; i < sizeof(p_rp_addr) / sizeof(*p_rp_addr) ; i++)
+               for (i = 0 ; i < NELEM(p_rp_addr) ; i++)
                        if (p_rp_addr[i] == ctlp->rp)
                                p_rp_addr[i] = NULL;
-               for (i = 0 ; i < sizeof(p_rp_table) / sizeof(*p_rp_table) ; i++)
+               for (i = 0 ; i < NELEM(p_rp_table) ; i++)
                        if (p_rp_table[i] == ctlp->rp)
                                p_rp_table[i] = NULL;
                crit_exit();

diff --git a/sys/dev/serial/stl/stallion.c b/sys/dev/serial/stl/stallion.c
index c87ad40..c8d4235 100644 (file)
--- a/sys/dev/serial/stl/stallion.c
+++ b/sys/dev/serial/stl/stallion.c
@@ -410,7 +410,7 @@ static      stlpcibrd_t     stl_pcibrds[] = {
        { STL_PCINSVENDID, STL_PCINSDEVID, BRD_ECHPCI },
 };
 
-static int      stl_nrpcibrds = sizeof(stl_pcibrds) / sizeof(stlpcibrd_t);
+static int      stl_nrpcibrds = NELEM(stl_pcibrds);
 
 /*****************************************************************************/
 
@@ -702,7 +702,7 @@ static unsigned int sc26198_baudtable[] = {
        230400, 460800
 };
 
-#define        SC26198_NRBAUDS (sizeof(sc26198_baudtable) / sizeof(unsigned int))
+#define        SC26198_NRBAUDS NELEM(sc26198_baudtable)
 
 /*
  *      Define the maximum baud rate of the sc26198 devices.

diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index d938401..7eaac29 100644 (file)
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -479,7 +479,7 @@ alloc_resource(sc_p scp)
                        base = isa_get_port(scp->dev);
                else
                        base = 0;
-               for (i = 0 ; i < sizeof(scp->io) / sizeof(*scp->io) ; i++) {
+               for (i = 0 ; i < NELEM(scp->io) ; i++) {
                        if (scp->io[i] == NULL) {
                                scp->io_rid[i] = i;
                                if (base == 0)
@@ -505,7 +505,7 @@ alloc_resource(sc_p scp)
                                return (1);
                        scp->irq_alloced = 0;
                }
-               for (i = 0 ; i < sizeof(scp->drq) / sizeof(*scp->drq) ; i++) {
+               for (i = 0 ; i < NELEM(scp->drq) ; i++) {
                        if (scp->drq[i] == NULL) {
                                scp->drq_rid[i] = i;
                                if (base == 0 || i == 0)
@@ -577,7 +577,7 @@ release_resource(sc_p scp)
        switch(lid) {
        case LOGICALID_PCM:
        case LOGICALID_NOPNP:           /* XXX Non-PnP */
-               for (i = 0 ; i < sizeof(scp->io) / sizeof(*scp->io) ; i++) {
+               for (i = 0 ; i < NELEM(scp->io) ; i++) {
                        if (scp->io[i] != NULL) {
                                bus_release_resource(scp->dev, SYS_RES_IOPORT, scp->io_rid[i], scp->io[i]);
                                scp->io[i] = NULL;
@@ -587,7 +587,7 @@ release_resource(sc_p scp)
                        bus_release_resource(scp->dev, SYS_RES_IRQ, scp->irq_rid, scp->irq);
                        scp->irq = NULL;
                }
-               for (i = 0 ; i < sizeof(scp->drq) / sizeof(*scp->drq) ; i++) {
+               for (i = 0 ; i < NELEM(scp->drq) ; i++) {
                        if (scp->drq[i] != NULL) {
                                bus_release_resource(scp->dev, SYS_RES_DRQ, scp->drq_rid[i], scp->drq[i]);
                                scp->drq[i] = NULL;

diff --git a/sys/dev/usbmisc/uchcom/uchcom.c b/sys/dev/usbmisc/uchcom/uchcom.c
index 9c9bc7e..c357eef 100644 (file)
--- a/sys/dev/usbmisc/uchcom/uchcom.c
+++ b/sys/dev/usbmisc/uchcom/uchcom.c
@@ -165,7 +165,7 @@ static const struct uchcom_divider_record dividers[] =
        {    2941,    368,               93750, { 1,    0, 0 } },
        {     367,      1,               11719, { 0,    0, 0 } },
 };
-#define NUM_DIVIDERS   (sizeof (dividers) / sizeof (dividers[0]))
+#define NUM_DIVIDERS   NELEM(dividers)
 
 static void    uchcom_get_status(void *, int, u_char *, u_char *);
 static void    uchcom_set(void *, int, int, int);

diff --git a/sys/dev/video/bktr/bktr_core.c b/sys/dev/video/bktr/bktr_core.c
index 962543c..a757a93 100644 (file)
--- a/sys/dev/video/bktr/bktr_core.c
+++ b/sys/dev/video/bktr/bktr_core.c
@@ -274,8 +274,7 @@ static struct {
     },
 
 };
-#define METEOR_PIXFMT_TABLE_SIZE ( sizeof(meteor_pixfmt_table) / \
-                                  sizeof(meteor_pixfmt_table[0]) )
+#define METEOR_PIXFMT_TABLE_SIZE NELEM(meteor_pixfmt_table)
 
 
 #define BSWAP (BT848_COLOR_CTL_BSWAP_ODD | BT848_COLOR_CTL_BSWAP_EVEN)

diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c b/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c
index 74ed39d..0fb4e4f 100644 (file)
--- a/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c
+++ b/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c
@@ -546,7 +546,7 @@ linprocfs_doprocstatus(struct proc *curp, struct proc *p, struct pfsnode *pfs,
        ps = psbuf;
 
        lwkt_gettoken(&p->p_token);
-       if (p->p_stat > sizeof state_str / sizeof *state_str)
+       if (p->p_stat > NELEM(state_str))
                state = state_str[0];
        else
                state = state_str[(int)p->p_stat];

diff --git a/sys/emulation/linux/i386/linux_sysvec.c b/sys/emulation/linux/i386/linux_sysvec.c
index 0d83610..2fa4a40 100644 (file)
--- a/sys/emulation/linux/i386/linux_sysvec.c
+++ b/sys/emulation/linux/i386/linux_sysvec.c
@@ -174,7 +174,7 @@ static int _bsd_to_linux_trapcode[] = {
        15                      /* 30 T_RESERVED */
 };
 #define bsd_to_linux_trapcode(code) \
-    ((code)<sizeof(_bsd_to_linux_trapcode)/sizeof(*_bsd_to_linux_trapcode)? \
+    ((code)<NELEM(_bsd_to_linux_trapcode)? \
      _bsd_to_linux_trapcode[(code)]: \
      LINUX_T_UNKNOWN)
 

diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index 8a33c62..e9d19ad 100644 (file)
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -39,7 +39,6 @@
  *
  *     @(#)tty_conf.c  8.4 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/tty_conf.c,v 1.16.2.1 2002/03/11 01:14:55 dd Exp $
- * $DragonFly: src/sys/kern/tty_conf.c,v 1.6 2006/12/23 23:47:54 swildner Exp $
  */
 
 #include "opt_compat.h"
@@ -89,7 +88,7 @@ struct        linesw linesw[MAXLDISC] =
        NODISC(8),              /* loadable */
 };
 
-int    nlinesw = sizeof (linesw) / sizeof (linesw[0]);
+int    nlinesw = NELEM(linesw);
 
 static struct linesw nodisc = NODISC(0);
 

diff --git a/sys/net/pf/pf.c b/sys/net/pf/pf.c
index b6f0a6f..fa3425a 100644 (file)
--- a/sys/net/pf/pf.c
+++ b/sys/net/pf/pf.c
@@ -2111,8 +2111,7 @@ pf_step_into_anchor(int *depth, struct pf_ruleset **rs, int n,
        (*r)->anchor->match = 0;
        if (match)
                *match = 0;
-       if (*depth >= sizeof(pf_anchor_stack) /
-           sizeof(pf_anchor_stack[0])) {
+       if (*depth >= NELEM(pf_anchor_stack)) {
                kprintf("pf_step_into_anchor: stack overflow\n");
                *r = TAILQ_NEXT(*r, entries);
                return;

diff --git a/sys/netbt/hci_event.c b/sys/netbt/hci_event.c
index 4fc2779..8d3035d 100644 (file)
--- a/sys/netbt/hci_event.c
+++ b/sys/netbt/hci_event.c
@@ -1,4 +1,3 @@
-/* $DragonFly: src/sys/netbt/hci_event.c,v 1.2 2008/03/18 13:41:42 hasso Exp $ */
 /* $OpenBSD: src/sys/netbt/hci_event.c,v 1.7 2008/02/24 21:34:48 uwe Exp $ */
 /* $NetBSD: hci_event.c,v 1.14 2008/02/10 17:40:54 plunky Exp $ */
 
@@ -136,7 +135,7 @@ static const char *
 hci_eventstr(unsigned int event)
 {
 
-       if (event < (sizeof(hci_eventnames) / sizeof(*hci_eventnames)))
+       if (event < NELEM(hci_eventnames))
                return hci_eventnames[event];
 
        switch (event) {

diff --git a/sys/netgraph/iface/ng_iface.c b/sys/netgraph/iface/ng_iface.c
index 8228aba..b9f5cc2 100644 (file)
--- a/sys/netgraph/iface/ng_iface.c
+++ b/sys/netgraph/iface/ng_iface.c
@@ -97,7 +97,7 @@ static const struct iffam gFamilies[] = {
        { AF_NATM,      NG_IFACE_HOOK_NATM      },
        { AF_NS,        NG_IFACE_HOOK_NS        },
 };
-#define NUM_FAMILIES           (sizeof(gFamilies) / sizeof(*gFamilies))
+#define NUM_FAMILIES           NELEM(gFamilies)
 
 /* Node private data */
 struct ng_iface_private {

diff --git a/sys/netgraph7/ng_gif_demux.c b/sys/netgraph7/ng_gif_demux.c
index 300f855..1acc3a4 100644 (file)
--- a/sys/netgraph7/ng_gif_demux.c
+++ b/sys/netgraph7/ng_gif_demux.c
@@ -110,7 +110,7 @@ const static struct iffam gFamilies[] = {
        { AF_ATM,       NG_GIF_DEMUX_HOOK_ATM   },
        { AF_NATM,      NG_GIF_DEMUX_HOOK_NATM  },
 };
-#define NUM_FAMILIES           (sizeof(gFamilies) / sizeof(*gFamilies))
+#define NUM_FAMILIES           NELEM(gFamilies)
 
 /* Per-node private data */
 struct ng_gif_demux_private {

diff --git a/sys/netgraph7/ng_iface.c b/sys/netgraph7/ng_iface.c
index 2d6aab4..c43e7f9 100644 (file)
--- a/sys/netgraph7/ng_iface.c
+++ b/sys/netgraph7/ng_iface.c
@@ -103,7 +103,7 @@ const static struct iffam gFamilies[] = {
        { AF_ATM,       NG_IFACE_HOOK_ATM       },
        { AF_NATM,      NG_IFACE_HOOK_NATM      },
 };
-#define NUM_FAMILIES           (sizeof(gFamilies) / sizeof(*gFamilies))
+#define NUM_FAMILIES           NELEM(gFamilies)
 
 /* Node private data */
 struct ng_iface_private {

diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index def7d7a..073d2f3 100644 (file)
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -69,7 +69,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.5.2.14 2003/02/24 04:02:27 silby Exp $
- * $DragonFly: src/sys/netinet/tcp_syncache.c,v 1.35 2008/11/22 11:03:35 sephe Exp $
  */
 
 #include "opt_inet.h"
@@ -1388,7 +1387,7 @@ syncookie_generate(struct syncache *sc)
                        tcp_secret[idx].ts_secbits[i] = karc4random();
                tcp_secret[idx].ts_expire = ticks + SYNCOOKIE_TIMEOUT;
        }
-       for (data = sizeof(tcp_msstab) / sizeof(int) - 1; data > 0; data--)
+       for (data = NELEM(tcp_msstab) - 1; data > 0; data--)
                if (tcp_msstab[data] <= sc->sc_peer_mss)
                        break;
        data = (data << SYNCOOKIE_WNDBITS) | idx;

diff --git a/sys/netproto/ncp/ncp_mod.c b/sys/netproto/ncp/ncp_mod.c
index f702ed6..22c99ba 100644 (file)
--- a/sys/netproto/ncp/ncp_mod.c
+++ b/sys/netproto/ncp/ncp_mod.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netncp/ncp_mod.c,v 1.2 1999/10/12 10:36:59 bp Exp $
- * $DragonFly: src/sys/netproto/ncp/ncp_mod.c,v 1.11 2006/12/22 23:57:54 swildner Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -461,7 +460,7 @@ static struct sysent newent[] = {
        {3,     (sy_call_t*)sys_sncp_request}
 };
 
-#define        SC_SIZE sizeof(newent)/sizeof(struct sysent)
+#define        SC_SIZE NELEM(newent)
 /*
  * Miscellaneous modules must have their own save areas...
  */

diff --git a/sys/netproto/smb/smb_smb.c b/sys/netproto/smb/smb_smb.c
index 40368ff..3c2a655 100644 (file)
--- a/sys/netproto/smb/smb_smb.c
+++ b/sys/netproto/smb/smb_smb.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_smb.c,v 1.1.2.3 2002/12/14 14:44:19 fjoe Exp $
- * $DragonFly: src/sys/netproto/smb/smb_smb.c,v 1.7 2007/08/21 17:26:47 dillon Exp $
  */
 /*
  * various SMB requests. Most of the routines merely packs data into mbufs.
@@ -71,7 +70,7 @@ static struct smb_dialect smb_dialects[] = {
        {-1,                    NULL}
 };
 
-#define        SMB_DIALECT_MAX (sizeof(smb_dialects) / sizeof(struct smb_dialect) - 2)
+#define        SMB_DIALECT_MAX (NELEM(smb_dialects) - 2)
 
 static int
 smb_smb_nomux(struct smb_vc *vcp, struct smb_cred *scred, const char *name)

diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index d7844f1..05369e8 100644 (file)
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -2013,7 +2013,7 @@ init386(int first)
         */
        ldt_segs[LUCODE_SEL].ssd_limit = atop(VM_MAX_USER_ADDRESS - 1);
        ldt_segs[LUDATA_SEL].ssd_limit = atop(VM_MAX_USER_ADDRESS - 1);
-       for (x = 0; x < sizeof ldt_segs / sizeof ldt_segs[0]; x++)
+       for (x = 0; x < NELEM(ldt_segs); x++)
                ssdtosd(&ldt_segs[x], &ldt[x].sd);
 
        _default_ldt = GSEL(GLDT_SEL, SEL_KPL);

diff --git a/sys/platform/pc64/x86_64/amd64_mem.c b/sys/platform/pc64/x86_64/amd64_mem.c
index 99318e3..4d3f2c7 100644 (file)
--- a/sys/platform/pc64/x86_64/amd64_mem.c
+++ b/sys/platform/pc64/x86_64/amd64_mem.c
@@ -118,7 +118,7 @@ static int amd64_mtrrtomrt[] = {
        MDF_WRITEBACK
 };
 
-#define        MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0]))
+#define        MTRRTOMRTLEN NELEM(amd64_mtrrtomrt)
 
 static int
 amd64_mtrr2mrt(int val)