diff options
| -rw-r--r-- | usr/src/boot/sys/boot/common/part.c | 2 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/efi/loader/bootinfo.c | 2 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/uboot/common/metadata.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/boot/sys/boot/common/part.c b/usr/src/boot/sys/boot/common/part.c index f2b3fc644d..800641bd86 100644 --- a/usr/src/boot/sys/boot/common/part.c +++ b/usr/src/boot/sys/boot/common/part.c @@ -119,7 +119,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); diff --git a/usr/src/boot/sys/boot/efi/loader/bootinfo.c b/usr/src/boot/sys/boot/efi/loader/bootinfo.c index c6a76abc08..1f45ea3493 100644 --- a/usr/src/boot/sys/boot/efi/loader/bootinfo.c +++ b/usr/src/boot/sys/boot/efi/loader/bootinfo.c @@ -445,7 +445,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp) /* 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); diff --git a/usr/src/boot/sys/boot/uboot/common/metadata.c b/usr/src/boot/sys/boot/uboot/common/metadata.c index c00b56006d..38db4bca44 100644 --- a/usr/src/boot/sys/boot/uboot/common/metadata.c +++ b/usr/src/boot/sys/boot/uboot/common/metadata.c @@ -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); |