From 1ea5a4d4a42addfa86735050e9b513f9c9cb3d62 Mon Sep 17 00:00:00 2001
From: Xavier Del Campo Romero <xavi.dcr@tutanota.com>
Date: Fri, 15 Jul 2022 00:55:22 +0200
Subject: [PATCH] Deprecate memset(3) in favour of C99 compound literals

---
 src/gfx/sdl-1.2/src/rect.c   | 6 +-----
 src/gfx/sdl-1.2/src/sprite.c | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gfx/sdl-1.2/src/rect.c b/src/gfx/sdl-1.2/src/rect.c
index 03c07ae..eab7145 100644
--- a/src/gfx/sdl-1.2/src/rect.c
+++ b/src/gfx/sdl-1.2/src/rect.c
@@ -2,10 +2,6 @@
 #include <gfx/port.h>
 #include <sdl-1.2/gfx_private.h>
 #include <SDL/SDL.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 
 void rect_sort(struct rect *const r)
 {
@@ -29,7 +25,7 @@ void rect_sort(struct rect *const r)
 
 void rect_init(struct rect *const r)
 {
-    memset(r, 0, sizeof *r);
+    *r = (const struct rect){0};
 }
 
 void semitrans_rect_init(struct rect *const r)
diff --git a/src/gfx/sdl-1.2/src/sprite.c b/src/gfx/sdl-1.2/src/sprite.c
index f3a2d94..b5d61b6 100644
--- a/src/gfx/sdl-1.2/src/sprite.c
+++ b/src/gfx/sdl-1.2/src/sprite.c
@@ -6,7 +6,6 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 
 void sprite_free(struct sprite *const s)
 {
@@ -92,12 +91,13 @@ static int load_bitmap(struct sprite *const s, FILE *const f)
 end:
     SDL_FreeRW(ops);
     SDL_FreeSurface(ts);
+    SDL_FreeSurface(zs);
     return ret;
 }
 
 int sprite_from_fp(struct sprite *const s, FILE *const f)
 {
-    memset(s, 0, sizeof *s);
+    *s = (const struct sprite){0};
 
     if (load_header(s, f) || load_bitmap(s, f))
         return -1;