Commit fed96378a1deef990a190b62ab07329ae546447b

Sam James 2023-11-05T22:06:40

state: fix -Walloc-size GCC 14 introduces a new -Walloc-size included in -Wextra which gives: ``` src/state.c:589:9: warning: allocation of insufficient size ‘1’ for type ‘struct xkb_state’ with size ‘128’ [-Walloc-size] ``` The calloc prototype is: ``` void *calloc(size_t nmemb, size_t size); ``` So, just swap the number of members and size arguments to match the prototype, as we're initialising 1 struct of size `sizeof(struct xkb_state)`. GCC then sees we're not doing anything wrong. Signed-off-by: Sam James <sam@gentoo.org>

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/src/state.c b/src/state.c
index b269e6d..d449697 100644
--- a/src/state.c
+++ b/src/state.c
@@ -586,7 +586,7 @@ xkb_state_new(struct xkb_keymap *keymap)
 {
     struct xkb_state *ret;
 
-    ret = calloc(sizeof(*ret), 1);
+    ret = calloc(1, sizeof(*ret));
     if (!ret)
         return NULL;