Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 10 Mar 2017 06:25:54 +0000 (UTC)
From:      Marcelo Araujo <araujo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r314994 - head/usr.sbin/acpi/acpidump
Message-ID:  <201703100625.v2A6PsOS087109@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: araujo
Date: Fri Mar 10 06:25:54 2017
New Revision: 314994
URL: https://svnweb.freebsd.org/changeset/base/314994

Log:
  Use nitems() from sys/param.h.
  
  Reviewed by:	ngie
  MFC after:	3 weeks.
  Differential Revision:	https://reviews.freebsd.org/D9940

Modified:
  head/usr.sbin/acpi/acpidump/acpi.c

Modified: head/usr.sbin/acpi/acpidump/acpi.c
==============================================================================
--- head/usr.sbin/acpi/acpidump/acpi.c	Fri Mar 10 06:23:15 2017	(r314993)
+++ head/usr.sbin/acpi/acpidump/acpi.c	Fri Mar 10 06:25:54 2017	(r314994)
@@ -420,7 +420,7 @@ acpi_print_madt(ACPI_SUBTABLE_HEADER *mp
 	ACPI_MADT_GENERIC_REDISTRIBUTOR *gicr;
 	ACPI_MADT_GENERIC_TRANSLATOR *gict;
 
-	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);
@@ -470,8 +470,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);
@@ -1082,7 +1081,7 @@ acpi_print_srat(ACPI_SUBTABLE_HEADER *sr
 	ACPI_SRAT_X2APIC_CPU_AFFINITY *x2apic;
 	ACPI_SRAT_GICC_AFFINITY *gic;
 
-	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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703100625.v2A6PsOS087109>