Module Name: src
Committed By: mrg
Date: Tue Aug 8 05:20:14 UTC 2023
Modified Files:
src/sys/dev/ic: apple_smc.c apple_smc_temp.c
Log Message:
fix array vs pointer function declaration.
also, in some callers, and make sure to provide all the accessed
backing for a string array.
found by GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/apple_smc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/apple_smc_temp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/apple_smc.c
diff -u src/sys/dev/ic/apple_smc.c:1.8 src/sys/dev/ic/apple_smc.c:1.9
--- src/sys/dev/ic/apple_smc.c:1.8 Sat Aug 7 16:19:12 2021
+++ src/sys/dev/ic/apple_smc.c Tue Aug 8 05:20:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: apple_smc.c,v 1.8 2021/08/07 16:19:12 thorpej Exp $ */
+/* $NetBSD: apple_smc.c,v 1.9 2023/08/08 05:20:14 mrg Exp $ */
/*
* Apple System Management Controller
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apple_smc.c,v 1.8 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_smc.c,v 1.9 2023/08/08 05:20:14 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -476,7 +476,7 @@ apple_smc_release_key(struct apple_smc_t
}
int
-apple_smc_key_search(struct apple_smc_tag *smc, const char *name,
+apple_smc_key_search(struct apple_smc_tag *smc, const char name[4 + 1],
uint32_t *result)
{
struct apple_smc_key *key;
Index: src/sys/dev/ic/apple_smc_temp.c
diff -u src/sys/dev/ic/apple_smc_temp.c:1.6 src/sys/dev/ic/apple_smc_temp.c:1.7
--- src/sys/dev/ic/apple_smc_temp.c:1.6 Wed Jun 29 15:58:12 2022
+++ src/sys/dev/ic/apple_smc_temp.c Tue Aug 8 05:20:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: apple_smc_temp.c,v 1.6 2022/06/29 15:58:12 mlelstv Exp $ */
+/* $NetBSD: apple_smc_temp.c,v 1.7 2023/08/08 05:20:14 mrg Exp $ */
/*
* Apple System Management Controller: Temperature Sensors
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apple_smc_temp.c,v 1.6 2022/06/29 15:58:12 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_smc_temp.c,v 1.7 2023/08/08 05:20:14 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -425,12 +425,12 @@ apple_smc_bound_temp_sensors(struct appl
int error;
/* Find the first `T...' key. */
- error = apple_smc_key_search(smc, "T", tstart);
+ error = apple_smc_key_search(smc, "T\0\0\0", tstart);
if (error)
return error;
/* Find the first `U...' key. */
- error = apple_smc_key_search(smc, "U", ustart);
+ error = apple_smc_key_search(smc, "U\0\0\0", ustart);
if (error)
return error;
