svn commit: r360291 - stable/12/sys/dev/acpi_support

[Xin LI]

Author: delphij
Date: Sat Apr 25 06:42:46 2020
New Revision: 360291
URL: https://svnweb.freebsd.org/changeset/base/360291

Log:
  MFC r359795: Avoid using a variable solely for sizes that are never meant
  to be modified runtime.

Modified:
  stable/12/sys/dev/acpi_support/acpi_hp.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- stable/12/sys/dev/acpi_support/acpi_hp.c	Sat Apr 25 05:51:58 2020	(r360290)
+++ stable/12/sys/dev/acpi_support/acpi_hp.c	Sat Apr 25 06:42:46 2020	(r360291)
@@ -960,10 +960,9 @@ acpi_hp_get_cmi_block(device_t wmi_dev, const char* gu
 	ACPI_BUFFER	out = { ACPI_ALLOCATE_BUFFER, NULL };
 	int		i;
 	int		outlen;
-	int		size = 255;
 	int		has_enums = 0;
 	int		valuebase = 0;
-	char		string_buffer[size];
+	char		string_buffer[255];
 	int		enumbase;
 
 	outlen = 0;
@@ -1017,18 +1016,21 @@ acpi_hp_get_cmi_block(device_t wmi_dev, const char* gu
 
 	if (detail & ACPI_HP_CMI_DETAIL_PATHS) {
 		strlcat(outbuf, acpi_hp_get_string_from_object(
-		    &obj->Package.Elements[2], string_buffer, size), outsize);
+		    &obj->Package.Elements[2],
+		    string_buffer, sizeof(string_buffer)), outsize);
 		outlen += 48;
 		while (strlen(outbuf) < outlen)
 			strlcat(outbuf, " ", outsize);
 	}
 	strlcat(outbuf, acpi_hp_get_string_from_object(
-	    &obj->Package.Elements[0], string_buffer, size), outsize);
+	    &obj->Package.Elements[0],
+	    string_buffer, sizeof(string_buffer)), outsize);
 	outlen += 43;
 	while (strlen(outbuf) < outlen)
 		strlcat(outbuf, " ", outsize);
 	strlcat(outbuf, acpi_hp_get_string_from_object(
-	    &obj->Package.Elements[valuebase], string_buffer, size), outsize);
+	    &obj->Package.Elements[valuebase],
+	    string_buffer, sizeof(string_buffer)), outsize);
 	outlen += 21;
 	while (strlen(outbuf) < outlen)
 		strlcat(outbuf, " ", outsize);
@@ -1039,7 +1041,8 @@ acpi_hp_get_cmi_block(device_t wmi_dev, const char* gu
 		for (i = enumbase + 1; i < enumbase + 1 +
 		    obj->Package.Elements[enumbase].Integer.Value; ++i) {
 			acpi_hp_get_string_from_object(
-			    &obj->Package.Elements[i], string_buffer, size);
+			    &obj->Package.Elements[i],
+			    string_buffer, sizeof(string_buffer));
 			if (strlen(string_buffer) > 1 ||
 			    (strlen(string_buffer) == 1 &&
 			    string_buffer[0] != ' ')) {
@@ -1209,8 +1212,7 @@ acpi_hp_hpcmi_read(struct cdev *dev, struct uio *buf, 
 	UINT8			instance;
 	UINT8			maxInstance;
 	UINT32			sequence;
-	int			linesize = 1025;
-	char			line[linesize];
+	char			line[1025];
 
 	if (dev == NULL || dev->si_drv1 == NULL)
 		return (EBADF);
@@ -1235,7 +1237,7 @@ acpi_hp_hpcmi_read(struct cdev *dev, struct uio *buf, 
 				    ++instance) {
 					if (acpi_hp_get_cmi_block(sc->wmi_dev,
 						ACPI_HP_WMI_CMI_GUID, instance,
-						line, linesize, &sequence,
+						line, sizeof(line), &sequence,
 						sc->cmi_detail)) {
 						instance = maxInstance;
 					}
@@ -1268,7 +1270,7 @@ acpi_hp_hpcmi_read(struct cdev *dev, struct uio *buf, 
 			for (i=0; i<sc->cmi_order_size; ++i) {
 				if (!acpi_hp_get_cmi_block(sc->wmi_dev,
 				    ACPI_HP_WMI_CMI_GUID,
-				    sc->cmi_order[i].instance, line, linesize,
+				    sc->cmi_order[i].instance, line, sizeof(line),
 				    &sequence, sc->cmi_detail)) {
 					sbuf_printf(&sc->hpcmi_sbuf, "%s\n", line);
 				}