From owner-svn-src-all@freebsd.org Tue Apr 19 23:44:34 2016 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 F2E4CB15F8E; Tue, 19 Apr 2016 23:44:34 +0000 (UTC) (envelope-from pfg@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 B5B75143B; Tue, 19 Apr 2016 23:44:34 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3JNiX0b096961; Tue, 19 Apr 2016 23:44:33 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3JNiXtb096957; Tue, 19 Apr 2016 23:44:33 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201604192344.u3JNiXtb096957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Tue, 19 Apr 2016 23:44:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298309 - in head/sys/boot: common efi/loader mips/beri/boot2 uboot/common X-SVN-Group: head 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.21 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: Tue, 19 Apr 2016 23:44:35 -0000 Author: pfg Date: Tue Apr 19 23:44:33 2016 New Revision: 298309 URL: https://svnweb.freebsd.org/changeset/base/298309 Log: sys/boot: use our nitems() macro when it is available through param.h. No functional change, only trivial cases are done in this sweep, Discussed in: freebsd-current Modified: head/sys/boot/common/part.c head/sys/boot/efi/loader/bootinfo.c head/sys/boot/mips/beri/boot2/boot2.c head/sys/boot/uboot/common/metadata.c Modified: head/sys/boot/common/part.c ============================================================================== --- head/sys/boot/common/part.c Tue Apr 19 23:41:46 2016 (r298308) +++ head/sys/boot/common/part.c Tue Apr 19 23:44:33 2016 (r298309) @@ -104,7 +104,7 @@ parttype2str(enum partition_type type) { size_t i; - for (i = 0; i < sizeof(ptypes) / sizeof(ptypes[0]); i++) + for (i = 0; i < nitems(ptypes); i++) if (ptypes[i].type == type) return (ptypes[i].desc); return (ptypes[0].desc); Modified: head/sys/boot/efi/loader/bootinfo.c ============================================================================== --- head/sys/boot/efi/loader/bootinfo.c Tue Apr 19 23:41:46 2016 (r298308) +++ head/sys/boot/efi/loader/bootinfo.c Tue Apr 19 23:44:33 2016 (r298309) @@ -445,7 +445,7 @@ bi_load(char *args, vm_offset_t *modulep /* Do relocation fixup on metadata of each module. */ for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { - for (i = 0; i < sizeof mdt / sizeof mdt[0]; i++) { + for (i = 0; i < nitems(mdt); i++) { md = file_findmetadata(xp, mdt[i]); if (md) { bcopy(md->md_data, &vaddr, sizeof vaddr); Modified: head/sys/boot/mips/beri/boot2/boot2.c ============================================================================== --- head/sys/boot/mips/beri/boot2/boot2.c Tue Apr 19 23:41:46 2016 (r298308) +++ head/sys/boot/mips/beri/boot2/boot2.c Tue Apr 19 23:44:33 2016 (r298309) @@ -116,7 +116,7 @@ static const unsigned char flags[NOPT] = /* These must match BOOTINFO_DEV_TYPE constants. */ static const char *const dev_nm[] = {"dram", "cfi", "sdcard"}; -static const u_int dev_nm_count = sizeof(dev_nm) / sizeof(dev_nm[0]); +static const u_int dev_nm_count = nitems(dev_nm); static struct dmadat __dmadat; Modified: head/sys/boot/uboot/common/metadata.c ============================================================================== --- head/sys/boot/uboot/common/metadata.c Tue Apr 19 23:41:46 2016 (r298308) +++ head/sys/boot/uboot/common/metadata.c Tue Apr 19 23:44:33 2016 (r298309) @@ -349,7 +349,7 @@ md_load(char *args, vm_offset_t *modulep /* Do relocation fixup on metadata of each module. */ for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { - for (i = 0; i < sizeof mdt / sizeof mdt[0]; i++) { + for (i = 0; i < nitems(mdt); i++) { md = file_findmetadata(xp, mdt[i]); if (md) { bcopy(md->md_data, &vaddr, sizeof vaddr);