From f938bb790eea27a4ae9db6fe0f6f0300a1e1ae86 Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Sun, 26 Jun 2022 19:50:32 +0200 Subject: Deprecate memset(3) over C99 compound literals for zero-init Using memset(3) does not ensure pointers are assigned to NULL for all platforms. --- src/keyboard/src/keyboard.c | 2 +- src/mouse/sdl-1.2/src/mouse.c | 2 +- src/player/src/human_player.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/keyboard/src/keyboard.c b/src/keyboard/src/keyboard.c index c247b16..958ac65 100644 --- a/src/keyboard/src/keyboard.c +++ b/src/keyboard/src/keyboard.c @@ -53,7 +53,7 @@ bool keyboard_justpressed(const struct keyboard *const k, void keyboard_init(struct keyboard *const k) { - memset(k, 0, sizeof *k); + *k = (const struct keyboard){0}; } const char *keyboard_key_str(const enum keyboard_key k) diff --git a/src/mouse/sdl-1.2/src/mouse.c b/src/mouse/sdl-1.2/src/mouse.c index cee4549..4b95ae2 100644 --- a/src/mouse/sdl-1.2/src/mouse.c +++ b/src/mouse/sdl-1.2/src/mouse.c @@ -87,5 +87,5 @@ end: void mouse_init(struct mouse *const m) { - memset(m, 0, sizeof *m); + *m = (const struct mouse){0}; } diff --git a/src/player/src/human_player.c b/src/player/src/human_player.c index aea587c..1b77105 100644 --- a/src/player/src/human_player.c +++ b/src/player/src/human_player.c @@ -711,7 +711,7 @@ int human_player_render(const struct human_player *const h, int human_player_init(const struct human_player_cfg *const cfg, struct human_player *const h) { - memset(h, 0, sizeof *h); + *h = (const struct human_player){0}; if (player_init(&cfg->pl, &h->pl)) return -1; -- cgit v1.2.3