svn commit: r322466 - stable/11/usr.sbin/acpi/acpidump

[Ed Maste]

Author: emaste
Date: Sun Aug 13 18:12:56 2017
New Revision: 322466
URL: https://svnweb.freebsd.org/changeset/base/322466

Log:
  MFC r304000 (maxim): acpidump: move variable initialization out of assert(3)
  
  This fixes acpidump(8) compiled with "WITHOUT_ASSERT_DEBUG=yes" that
  removes assert(3)'s from the code.
  
  Submitted by:	Alexander Nedotsukov

Modified:
  stable/11/usr.sbin/acpi/acpidump/acpi.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/acpi/acpidump/acpi.c
==============================================================================
--- stable/11/usr.sbin/acpi/acpidump/acpi.c	Sun Aug 13 18:10:24 2017	(r322465)
+++ stable/11/usr.sbin/acpi/acpidump/acpi.c	Sun Aug 13 18:12:56 2017	(r322466)
@@ -1772,8 +1772,8 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt, ACPI_TABLE_HE
 		perror("mkdtemp tmp working dir");
 		return;
 	}
-	assert((size_t)snprintf(tmpstr, sizeof(tmpstr), "%s%s", wrkdir, iname)
-		<= sizeof(tmpstr) - 1);
+	len = (size_t)snprintf(tmpstr, sizeof(tmpstr), "%s%s", wrkdir, iname);
+	assert(len <= sizeof(tmpstr) - 1);
 	fd = open(tmpstr, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
 	if (fd < 0) {
 		perror("iasl tmp file");
@@ -1805,8 +1805,8 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt, ACPI_TABLE_HE
 	}
 
 	/* Dump iasl's output to stdout */
-	assert((size_t)snprintf(tmpstr, sizeof(tmpstr), "%s%s", wrkdir, oname)
-		<= sizeof(tmpstr) -1);
+	len = (size_t)snprintf(tmpstr, sizeof(tmpstr), "%s%s", wrkdir, oname);
+	assert(len <= sizeof(tmpstr) - 1);
 	fp = fopen(tmpstr, "r");
 	if (unlink(tmpstr) < 0) {
 		perror("unlink");