From 984d5915734481b0ddbe5d6e06456a23e03403b0 Mon Sep 17 00:00:00 2001
From: LibretroAdmin <reallibretroretroarch@gmail.com>
Date: Sat, 18 Jan 2025 01:48:16 +0100
Subject: [PATCH] Silence some warnings

---
 input/drivers/sdl_input.c       |  2 +-
 input/input_driver.c            | 14 +++++++-------
 libretro-common/memmap/memmap.c |  3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c
index f98f3c12b591..a65a94855b1b 100644
--- a/input/drivers/sdl_input.c
+++ b/input/drivers/sdl_input.c
@@ -338,7 +338,7 @@ static void sdl_input_free(void *data)
 #endif
    sdl_input_t *sdl = (sdl_input_t*)data;
 
-   if (!data)
+   if (!sdl)
       return;
 
    /* Flush out all pending events. */
diff --git a/input/input_driver.c b/input/input_driver.c
index f4a16934b498..b9607db26b8c 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -5958,9 +5958,9 @@ bool bsv_movie_handle_read_input_event(bsv_movie_t *movie,
    /* if movie is old, just read two bytes and hope for the best */
    if (movie->version == 0)
    {
-      int read = intfstream_read(movie->file, val, 2);
-      *val = swap_if_big16(*val);
-      return read == 2;
+      int64_t read = intfstream_read(movie->file, val, 2);
+      *val         = swap_if_big16(*val);
+      return (read == 2);
    }
    for (i = 0; i < movie->input_event_count; i++)
    {
@@ -5986,6 +5986,7 @@ void bsv_movie_finish_rewind(input_driver_state_t *input_st)
    handle->first_rewind = !handle->did_rewind;
    handle->did_rewind   = false;
 }
+
 void bsv_movie_read_next_events(bsv_movie_t *handle)
 {
    input_driver_state_t *input_st = input_state_get_ptr();
@@ -6079,6 +6080,7 @@ void bsv_movie_read_next_events(bsv_movie_t *handle)
       }
    }
 }
+
 void bsv_movie_next_frame(input_driver_state_t *input_st)
 {
    settings_t *settings           = config_get_ptr();
@@ -6144,9 +6146,7 @@ void bsv_movie_next_frame(input_driver_state_t *input_st)
    }
 
    if (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_PLAYBACK)
-   {
       bsv_movie_read_next_events(handle);
-   }
    handle->frame_pos[handle->frame_counter & handle->frame_mask] = intfstream_tell(handle->file);
 }
 
@@ -6165,8 +6165,8 @@ bool replay_get_serialized_data(void* buffer)
 
    if (input_st->bsv_movie_state.flags & (BSV_FLAG_MOVIE_RECORDING | BSV_FLAG_MOVIE_PLAYBACK))
    {
-      long file_end           = intfstream_tell(handle->file);
-      long read_amt           = 0;
+      int64_t file_end        = intfstream_tell(handle->file);
+      int64_t read_amt        = 0;
       long file_end_lil       = swap_if_big32(file_end);
       uint8_t *file_end_bytes = (uint8_t *)(&file_end_lil);
       uint8_t *buf            = buffer;
diff --git a/libretro-common/memmap/memmap.c b/libretro-common/memmap/memmap.c
index 89e45e0edae3..35d9d6db3fca 100644
--- a/libretro-common/memmap/memmap.c
+++ b/libretro-common/memmap/memmap.c
@@ -135,8 +135,8 @@ int mprotect(void *addr, size_t len, int prot)
 
 int memsync(void *start, void *end)
 {
-   size_t _len = (char*)end - (char*)start;
 #if defined(__MACH__) && defined(__arm__)
+   size_t _len = (char*)end - (char*)start;
    sys_dcache_flush(start, _len);
    sys_icache_invalidate(start, _len);
    return 0;
@@ -144,6 +144,7 @@ int memsync(void *start, void *end)
    __clear_cache(start, end);
    return 0;
 #elif defined(HAVE_MMAN)
+   size_t _len = (char*)end - (char*)start;
    return msync(start, _len, MS_SYNC | MS_INVALIDATE
 #ifdef __QNX__
          MS_CACHE_ONLY