Author: delphij
Date: Sat Apr 11 07:24:57 2020
New Revision: 359795
URL: https://svnweb.freebsd.org/changeset/base/359795
Log:
Avoid using a variable solely for sizes that are never meant to be
modified runtime.
No functional change.
MFC after: 2 weeks
Modified:
head/sys/dev/acpi_support/acpi_hp.c
Modified: head/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- head/sys/dev/acpi_support/acpi_hp.c Sat Apr 11 05:12:38 2020
(r359794)
+++ head/sys/dev/acpi_support/acpi_hp.c Sat Apr 11 07:24:57 2020
(r359795)
@@ -962,10 +962,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;
@@ -1019,18 +1018,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);
@@ -1041,7 +1043,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] != ' ')) {
@@ -1211,8 +1214,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);
@@ -1237,7 +1239,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;
}
@@ -1270,7 +1272,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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
