From owner-svn-src-all@freebsd.org Mon Apr 17 18:55:57 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19A5AD42E6C; Mon, 17 Apr 2017 18:55:57 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E67851266; Mon, 17 Apr 2017 18:55:56 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3HItu88056568; Mon, 17 Apr 2017 18:55:56 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3HIttBD056481; Mon, 17 Apr 2017 18:55:55 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201704171855.v3HIttBD056481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Mon, 17 Apr 2017 18:55:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r317062 - in stable/11: usr.bin/uuencode usr.bin/vmstat usr.bin/w usr.sbin/acpi/acpidump usr.sbin/boot0cfg usr.sbin/bsnmpd/modules/snmp_hostres usr.sbin/camdd usr.sbin/ctld usr.sbin/iscsid X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Apr 2017 18:55:57 -0000 Author: araujo Date: Mon Apr 17 18:55:54 2017 New Revision: 317062 URL: https://svnweb.freebsd.org/changeset/base/317062 Log: MFC r314987-r314989, r314993-r314994, r315046-r315049, r315102 r314987: Use nitems() from sys/param.h. Reviewed by: asomers MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9944 r314988: Use nitems() from sys/param.h. Reviewed by: ume MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9938 r314989: Use nitems() from sys/param.h and also remove the cast. Reviewed by: markj MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9937 r314993: Use nitems() from sys/param.h. Reviewed by: ngie MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9936 r314994: Use nitems() from sys/param.h. Reviewed by: ngie MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9940 r315046: Use nitems() from sys/param.h Reviewed by: jhb MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9941 r315047: Use nitems() from sys/param.h. Reviewed by: np MFC after: 3 weeks. Differential Revision: https://reviews.freebsd.org/D9945 r315048: Use nitems() from sys/param.h. MFC after: 3 weeks. r315049: Bring back the cast removed in my previous commit to allow us build vmstat with WARNS 2. This cast was first introduced at r87690. Reported by: bde, pfg and ngie MFC after: 3 weeks. r315102: Use nitems() from sys/param.h. Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D9943 Modified: stable/11/usr.bin/uuencode/uuencode.c stable/11/usr.bin/vmstat/vmstat.c stable/11/usr.bin/w/w.c stable/11/usr.sbin/acpi/acpidump/acpi.c stable/11/usr.sbin/boot0cfg/boot0cfg.c stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c stable/11/usr.sbin/camdd/camdd.c stable/11/usr.sbin/ctld/kernel.c stable/11/usr.sbin/iscsid/iscsid.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/uuencode/uuencode.c ============================================================================== --- stable/11/usr.bin/uuencode/uuencode.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.bin/uuencode/uuencode.c Mon Apr 17 18:55:54 2017 (r317062) @@ -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"); Modified: stable/11/usr.bin/vmstat/vmstat.c ============================================================================== --- stable/11/usr.bin/vmstat/vmstat.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.bin/vmstat/vmstat.c Mon Apr 17 18:55:54 2017 (r317062) @@ -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); Modified: stable/11/usr.bin/w/w.c ============================================================================== --- stable/11/usr.bin/w/w.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.bin/w/w.c Mon Apr 17 18:55:54 2017 (r317062) @@ -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]); Modified: stable/11/usr.sbin/acpi/acpidump/acpi.c ============================================================================== --- stable/11/usr.sbin/acpi/acpidump/acpi.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.sbin/acpi/acpidump/acpi.c Mon Apr 17 18:55:54 2017 (r317062) @@ -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 *sr 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); Modified: stable/11/usr.sbin/boot0cfg/boot0cfg.c ============================================================================== --- stable/11/usr.sbin/boot0cfg/boot0cfg.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.sbin/boot0cfg/boot0cfg.c Mon Apr 17 18:55:54 2017 (r317062) @@ -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"; Modified: stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c ============================================================================== --- stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c Mon Apr 17 18:55:54 2017 (r317062) @@ -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). Modified: stable/11/usr.sbin/camdd/camdd.c ============================================================================== --- stable/11/usr.sbin/camdd/camdd.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.sbin/camdd/camdd.c Mon Apr 17 18:55:54 2017 (r317062) @@ -1004,8 +1004,7 @@ camdd_probe_tape(int fd, char *filename, 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); Modified: stable/11/usr.sbin/ctld/kernel.c ============================================================================== --- stable/11/usr.sbin/ctld/kernel.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.sbin/ctld/kernel.c Mon Apr 17 18:55:54 2017 (r317062) @@ -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"); Modified: stable/11/usr.sbin/iscsid/iscsid.c ============================================================================== --- stable/11/usr.sbin/iscsid/iscsid.c Mon Apr 17 17:34:47 2017 (r317061) +++ stable/11/usr.sbin/iscsid/iscsid.c Mon Apr 17 18:55:54 2017 (r317062) @@ -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");