diff options
-rw-r--r-- | usr.bin/uuencode/uuencode.c | 2 | ||||
-rw-r--r-- | usr.bin/vmstat/vmstat.c | 8 | ||||
-rw-r--r-- | usr.bin/w/w.c | 4 | ||||
-rw-r--r-- | usr.sbin/acpi/acpidump/acpi.c | 7 | ||||
-rw-r--r-- | usr.sbin/boot0cfg/boot0cfg.c | 2 | ||||
-rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c | 2 | ||||
-rw-r--r-- | usr.sbin/camdd/camdd.c | 3 | ||||
-rw-r--r-- | usr.sbin/ctld/kernel.c | 4 | ||||
-rw-r--r-- | usr.sbin/iscsid/iscsid.c | 4 |
9 files changed, 15 insertions, 21 deletions
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c index 500dcd3..e5af907 100644 --- a/usr.bin/uuencode/uuencode.c +++ b/usr.bin/uuencode/uuencode.c @@ -160,7 +160,7 @@ base64_encode(void) fprintf(output, "begin-base64 %o %s\n", mode, *av); while ((n = fread(buf, 1, sizeof(buf), stdin))) { ++sequence; - rv = b64_ntop(buf, n, buf2, (sizeof(buf2) / sizeof(buf2[0]))); + rv = b64_ntop(buf, n, buf2, nitems(buf2)); if (rv == -1) errx(1, "b64_ntop: error encoding base64"); fprintf(output, "%s%s", buf2, (sequence % GROUPS) ? "" : "\n"); diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 0dbd2d1..0960e95 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -288,17 +288,13 @@ retry_nlist: namelist[X_SUM].n_name = "_cnt"; goto retry_nlist; } - for (c = 0; - c < (int)(sizeof(namelist)/sizeof(namelist[0])); - c++) + for (c = 0; c < (int)(nitems(namelist)); c++) if (namelist[c].n_type == 0) bufsize += strlen(namelist[c].n_name) + 1; bufsize += len + 1; buf = bp = alloca(bufsize); - for (c = 0; - c < (int)(sizeof(namelist)/sizeof(namelist[0])); - c++) + for (c = 0; c < (int)(nitems(namelist)); c++) if (namelist[c].n_type == 0) { xo_error(" %s", namelist[c].n_name); diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 0c955ac..91e7674 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -516,7 +516,7 @@ pr_header(time_t *nowp, int nusers) /* * Print 1, 5, and 15 minute load averages. */ - if (getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0])) == -1) + if (getloadavg(avenrun, nitems(avenrun)) == -1) xo_emit(", no load average information available\n"); else { static const char *format[] = { @@ -525,7 +525,7 @@ pr_header(time_t *nowp, int nusers) " {:load-average-15/%.2f}", }; xo_emit(", load averages:"); - for (i = 0; i < (int)(sizeof(avenrun) / sizeof(avenrun[0])); i++) { + for (i = 0; i < (int)(nitems(avenrun)); i++) { if (use_comma && i > 0) xo_emit(","); xo_emit(format[i], avenrun[i]); diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index 076a8ff..f9d19f4 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -394,7 +394,7 @@ acpi_print_madt(ACPI_SUBTABLE_HEADER *mp) ACPI_MADT_LOCAL_X2APIC *x2apic; ACPI_MADT_LOCAL_X2APIC_NMI *x2apic_nmi; - if (mp->Type < sizeof(apic_types) / sizeof(apic_types[0])) + if (mp->Type < nitems(apic_types)) printf("\tType=%s\n", apic_types[mp->Type]); else printf("\tType=%d (unknown)\n", mp->Type); @@ -444,8 +444,7 @@ acpi_print_madt(ACPI_SUBTABLE_HEADER *mp) break; case ACPI_MADT_TYPE_INTERRUPT_SOURCE: isrc = (ACPI_MADT_INTERRUPT_SOURCE *)mp; - if (isrc->Type < sizeof(platform_int_types) / - sizeof(platform_int_types[0])) + if (isrc->Type < nitems(platform_int_types)) printf("\tType=%s\n", platform_int_types[isrc->Type]); else printf("\tType=%d (unknown)\n", isrc->Type); @@ -1020,7 +1019,7 @@ acpi_print_srat(ACPI_SUBTABLE_HEADER *srat) ACPI_SRAT_CPU_AFFINITY *cpu; ACPI_SRAT_X2APIC_CPU_AFFINITY *x2apic; - if (srat->Type < sizeof(srat_types) / sizeof(srat_types[0])) + if (srat->Type < nitems(srat_types)) printf("\tType=%s\n", srat_types[srat->Type]); else printf("\tType=%d (unknown)\n", srat->Type); diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c index c2cb91d..9670af9 100644 --- a/usr.sbin/boot0cfg/boot0cfg.c +++ b/usr.sbin/boot0cfg/boot0cfg.c @@ -88,7 +88,7 @@ static const struct { {"update", 1}, {"setdrv", 0} }; -static const int nopt = sizeof(opttbl) / sizeof(opttbl[0]); +static const int nopt = nitems(opttbl); static const char fmt0[] = "# flag start chs type" " end chs offset size\n"; diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c index 9470677..b88541f 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c @@ -143,7 +143,7 @@ static const struct { { "hpfs", &OIDX_hrFSHPFS_c }, { "smbfs", &OIDX_hrFSOther_c }, }; -#define N_FS_TYPE_MAP (sizeof(fs_type_map) / sizeof(fs_type_map[0])) +#define N_FS_TYPE_MAP nitems(fs_type_map) /** * Create an entry into the FS table and an entry in the map (if needed). diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c index 05225f6..9da57b0 100644 --- a/usr.sbin/camdd/camdd.c +++ b/usr.sbin/camdd/camdd.c @@ -1004,8 +1004,7 @@ camdd_probe_tape(int fd, char *filename, uint64_t *max_iosize, goto bailout; } - for (i = 0; i < sizeof(req_status_items) / - sizeof(req_status_items[0]); i++) { + for (i = 0; i < nitems(req_status_items); i++) { char *name; name = __DECONST(char *, req_status_items[i].name); diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index 057ea34..e1376c7 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -1259,8 +1259,8 @@ kernel_capsicate(void) if (error != 0 && errno != ENOSYS) log_err(1, "cap_rights_limit"); - error = cap_ioctls_limit(ctl_fd, cmds, - sizeof(cmds) / sizeof(cmds[0])); + error = cap_ioctls_limit(ctl_fd, cmds, nitems(cmds)); + if (error != 0 && errno != ENOSYS) log_err(1, "cap_ioctls_limit"); diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 5be7a44..1671dda 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -326,8 +326,8 @@ capsicate(struct connection *conn) if (error != 0 && errno != ENOSYS) log_err(1, "cap_rights_limit"); - error = cap_ioctls_limit(conn->conn_iscsi_fd, cmds, - sizeof(cmds) / sizeof(cmds[0])); + error = cap_ioctls_limit(conn->conn_iscsi_fd, cmds, nitems(cmds)); + if (error != 0 && errno != ENOSYS) log_err(1, "cap_ioctls_limit"); |