summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2004-01-09 21:04:28 +0000
committernjl <njl@FreeBSD.org>2004-01-09 21:04:28 +0000
commitcc930dd764165896d0bc10449d4b26e84cf2f7fa (patch)
tree3e82c74f7876d61e0a6be9c63de60eef7801ecee
parent3e77d90534e482caad83d7aa6285e01de7d249a9 (diff)
downloadFreeBSD-src-cc930dd764165896d0bc10449d4b26e84cf2f7fa.zip
FreeBSD-src-cc930dd764165896d0bc10449d4b26e84cf2f7fa.tar.gz
Clean up the acpi announce message of trailing spaces.
-rw-r--r--sys/dev/acpica/acpi.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 9b878f9..b42c186 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -268,8 +268,9 @@ acpi_probe(device_t dev)
{
ACPI_TABLE_HEADER th;
char buf[20];
- ACPI_STATUS status;
int error;
+ struct sbuf sb;
+ ACPI_STATUS status;
ACPI_LOCK_DECL;
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
@@ -288,8 +289,15 @@ acpi_probe(device_t dev)
AcpiFormatException(status));
error = ENXIO;
} else {
- sprintf(buf, "%.6s %.8s", th.OemId, th.OemTableId);
- device_set_desc_copy(dev, buf);
+ sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN);
+ sbuf_bcat(&sb, th.OemId, 6);
+ sbuf_trim(&sb);
+ sbuf_putc(&sb, ' ');
+ sbuf_bcat(&sb, th.OemTableId, 8);
+ sbuf_trim(&sb);
+ sbuf_finish(&sb);
+ device_set_desc_copy(dev, sbuf_data(&sb));
+ sbuf_delete(&sb);
error = 0;
}
ACPI_UNLOCK;
OpenPOWER on IntegriCloud