Silence warnings backport

audio/common/pipewire.c

@@ -138,7 +138,10 @@ unlock:
 void pipewire_core_deinit(pipewire_core_t *pw)
 {
    if (!pw)
-      return pw_deinit();
+   {
+      pw_deinit();
+      return;
+   }
 
    if (pw->thread_loop)
       pw_thread_loop_stop(pw->thread_loop);

audio/drivers/alsathread.c

@@ -212,10 +212,11 @@ end:
    RARCH_DBG("[ALSA] [capture thread %p] Ending microphone worker thread.\n", thread_id);
 }
 
-static int alsa_thread_microphone_read(void *driver_context, void *mic_context, void *s, size_t len)
+static int alsa_thread_microphone_read(void *driver_context, void *mic_context, void *sv, size_t len)
 {
    snd_pcm_state_t state;
    size_t _len = 0;
+   uint8_t *s  = (uint8_t*)sv;
    alsa_thread_microphone_t       *alsa = (alsa_thread_microphone_t*)driver_context;
    alsa_thread_microphone_handle_t *mic = (alsa_thread_microphone_handle_t*)mic_context;
 

audio/drivers/pipewire.c

@@ -132,12 +132,16 @@ static void pwire_capture_process_cb(void *data)
    if (!(b = pw_stream_dequeue_buffer(mic->stream)))
    {
       RARCH_ERR("[Microphone] [PipeWire] Out of buffers: %s.\n", strerror(errno));
-      return pw_thread_loop_signal(mic->pw->thread_loop, false);
+      pw_thread_loop_signal(mic->pw->thread_loop, false);
+      return;
    }
 
    buf = b->buffer;
    if ((p = buf->datas[0].data) == NULL)
-      return pw_thread_loop_signal(mic->pw->thread_loop, false);
+   {
+      pw_thread_loop_signal(mic->pw->thread_loop, false);
+      return;
+   }
 
    offs    = MIN(buf->datas[0].chunk->offset, buf->datas[0].maxsize);
    n_bytes = MIN(buf->datas[0].chunk->size, buf->datas[0].maxsize - offs);
@@ -494,12 +498,16 @@ static void pwire_playback_process_cb(void *data)
    if ((b = pw_stream_dequeue_buffer(audio->stream)) == NULL)
    {
       RARCH_WARN("[PipeWire] Out of buffers: %s.\n", strerror(errno));
-      return pw_thread_loop_signal(audio->pw->thread_loop, false);
+      pw_thread_loop_signal(audio->pw->thread_loop, false);
+      return;
    }
 
    buf = b->buffer;
    if ((p = buf->datas[0].data) == NULL)
-      return pw_thread_loop_signal(audio->pw->thread_loop, false);
+   {
+      pw_thread_loop_signal(audio->pw->thread_loop, false);
+      return;
+   }
 
    /* calculate the total no of bytes to read data from buffer */
    n_bytes = buf->datas[0].maxsize;

audio/drivers/sdl_audio.c

@@ -313,9 +313,10 @@ static void sdl_microphone_set_nonblock_state(void *driver_context, bool state)
       sdl->nonblock = state;
 }
 
-static int sdl_microphone_read(void *driver_context, void *mic_context, void *s, size_t len)
+static int sdl_microphone_read(void *driver_context, void *mic_context, void *sv, size_t len)
 {
-   int ret = 0;
+   int ret    = 0;
+   uint8_t *s = (uint8_t*)sv;
    sdl_microphone_t        *sdl = (sdl_microphone_t*)driver_context;
    sdl_microphone_handle_t *mic = (sdl_microphone_handle_t*)mic_context;
 

command.c

@@ -826,7 +826,7 @@ bool command_seek_replay(command_t *cmd, const char *arg)
    {
       _len = strlcpy(reply, "OK ", sizeof(reply));
       _len += snprintf(reply+_len, sizeof(reply)-_len,
-            "%lld", input_st->bsv_movie_state.seek_target_frame);
+            "%" PRId64, input_st->bsv_movie_state.seek_target_frame);
    }
    else
       _len = strlcpy(reply, "NO", sizeof(reply));

cores/libretro-ffmpeg/ffmpeg_core.c

@@ -98,7 +98,7 @@ static video_buffer_t *video_buffer;
 static tpool_t *tpool;
 
 #ifndef FFMPEG3
-#define FFMPEG3 ((LIBAVUTIL_VERSION_INT < (56, 6, 100)) || \
+#define FFMPEG3 ((LIBAVUTIL_VERSION_INT < AV_VERSION_INT(56, 6, 100)) || \
       (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)))
 #endif
 #ifndef FFMPEG8

cores/libretro-video-processor/video_processor_v4l2.c

@@ -78,7 +78,7 @@ struct v4l2_resolution
 
 struct v4l2_resolution v4l2_resolutions[] =
 {
-   //4:3
+   /* 4:3 */
    {160,120},
    {320,240},
    {480,320},
@@ -92,7 +92,7 @@ struct v4l2_resolution v4l2_resolutions[] =
    {1440,1080},
    {1600,1200},
    {1920,1440},
-	//16:9
+	/* 16:9 */
    {640,360},
    {960,540},
    {1280,720},
@@ -291,7 +291,8 @@ static void enumerate_audio_devices(char *s, size_t len)
          continue;
       }
 
-      //todo: add more info to make picking audio device more user friendly
+      /* TODO/FIXME: Add more info to make picking
+       * audio device more user friendly */
       descr = snd_device_name_get_hint(*n, "DESC");
       if (!descr)
       {
@@ -305,8 +306,9 @@ static void enumerate_audio_devices(char *s, size_t len)
       appendstr(s, name, len);
       ++ndevs;
 
-      // not sure if this is necessary but ensuring things are free/null
-      if(name != NULL)
+      /* Not sure if this is necessary
+       * but ensuring things are free/NULL */
+      if (name)
       {
          free(name);
          name = NULL;
@@ -593,6 +595,7 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_get_system_av_info)(struct retro_syst
    }
    else
    {
+      bool nodouble;
       /*
        * Query the device cropping limits. If available, we can use this to find the capture pixel aspect.
        */
@@ -618,14 +621,14 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_get_system_av_info)(struct retro_syst
          printf("Resolution postfix %ux%u\n", info->geometry.base_width,
                 info->geometry.base_height);
       }
-      // no doubling for interlaced or deinterlaced capture
-      bool nodouble = strcmp(video_capture_mode, "deinterlaced") == 0 || strcmp(video_capture_mode, "interlaced") == 0;
+      /* no doubling for interlaced or deinterlaced capture */
+      nodouble = strcmp(video_capture_mode, "deinterlaced") == 0 || strcmp(video_capture_mode, "interlaced") == 0;
       info->geometry.max_height = nodouble ? video_format.fmt.pix.height : video_format.fmt.pix.height * 2;
 
       /* TODO Only double if frames ARE fields (progressive or deinterlaced, full framerate)
        * *2 for fields
        */
-      // defaulting to 60 if this this doesn't return a usable number
+      /* Defaulting to 60 if this this doesn't return a usable number */
       if(video_standard.frameperiod.denominator == 0 || video_standard.frameperiod.numerator == 0)
          info->timing.fps = 60;
       else
@@ -1281,7 +1284,7 @@ RETRO_API bool VIDEOPROC_CORE_PREFIX(retro_load_game)(const struct retro_game_in
       fmt.fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
       fmt.fmt.pix.quantization = V4L2_QUANTIZATION_LIM_RANGE;
 
-      // applied set resolution if not set to auto
+      /* Applied set resolution if not set to auto */
       if (strcmp(video_capture_resolution, "auto") != 0)
       {
          strcpy(splitresolution, video_capture_resolution);

gfx/common/wayland_common.c

@@ -631,6 +631,7 @@ static bool wl_create_toplevel_icon(gfx_ctx_wayland_data_t *wl, struct xdg_tople
    return true;
 }
 
+#ifndef HAVE_LIBDECOR_H
 static void shm_buffer_paint_checkerboard(
       shm_buffer_t *buffer,
       int width, int height, int scale,
@@ -705,6 +706,7 @@ static bool wl_draw_splash_screen(gfx_ctx_wayland_data_t *wl)
 
    return true;
 }
+#endif
 
 bool gfx_ctx_wl_init_common(
       const toplevel_listener_t *toplevel_listener, gfx_ctx_wayland_data_t **wwl)
@@ -926,7 +928,7 @@ bool gfx_ctx_wl_init_common(
 
       /* Make sure splash screen is on screen and sized */
       wl->configured = true;
-      
+
       while (wl->configured)
       wl_display_dispatch(wl->input.dpy);
    }

gfx/drivers_context/sdl_gl_ctx.c

@@ -406,7 +406,8 @@ static void sdl_ctx_input_driver(void *data,
 
 static gfx_ctx_proc_t sdl_ctx_get_proc_address(const char *name)
 {
-   return (gfx_ctx_proc_t)SDL_GL_GetProcAddress(name);
+   void *addr = SDL_GL_GetProcAddress(name);
+   return *((gfx_ctx_proc_t*)(&addr));
 }
 
 static void sdl_ctx_show_mouse(void *data, bool state) { SDL_ShowCursor(state); }

gfx/drivers_context/wayland_ctx.c

@@ -155,8 +155,7 @@ static const toplevel_listener_t toplevel_listener = {
    },
 };
 
-static const toplevel_listener_t xdg_toplevel_listener = {
-};
+static const toplevel_listener_t xdg_toplevel_listener = {0};
 
 #ifdef HAVE_EGL
 #define WL_EGL_ATTRIBS_BASE \

gfx/video_crt_switch.c

@@ -179,12 +179,13 @@ static bool crt_sr2_init(videocrt_switch_t *p_switch,
 
    if (!p_switch->sr2_active)
    {
+      void (*logp)(const char *, ...) = &RARCH_LOG;
+      void (*dbgp)(const char *, ...) = &RARCH_DBG;
+      void (*errp)(const char *, ...) = &RARCH_ERR;
       sr_init();
-#if (__STDC_VERSION__ >= 199409L) /* no logs for C98 or less */
-      sr_set_log_callback_info(RARCH_LOG);
-      sr_set_log_callback_debug(RARCH_DBG);
-      sr_set_log_callback_error(RARCH_ERR);
-#endif
+      sr_set_log_callback_info(*(void **)(&logp));
+      sr_set_log_callback_debug(*(void **)(&dbgp));
+      sr_set_log_callback_error(*(void **)(&errp));
 
       switch (crt_mode)
       {

input/bsv/uint32s_index.c

@@ -270,11 +270,10 @@ uint32_t *uint32s_index_get(uint32s_index_t *index, uint32_t which)
 
 void uint32s_index_pop(uint32s_index_t *index)
 {
-   uint32_t idx = RBUF_LEN(index->objects)-1;
-   uint32_t *object = RBUF_POP(index->objects);
-   size_t size_bytes = index->object_size * sizeof(uint32_t);
+   uint32_t idx  = RBUF_LEN(index->objects)-1;
    uint32_t hash = index->hashes[idx];
    struct uint32s_bucket *bucket = RHMAP_PTR(index->index, hash);
+   RBUF_RESIZE(index->objects, idx);
    RBUF_RESIZE(index->counts, idx);
    RBUF_RESIZE(index->hashes, idx);
    uint32s_bucket_remove(bucket, idx);

input/drivers_joypad/test_joypad.c

@@ -290,8 +290,8 @@ static const char *test_joypad_name(unsigned pad)
 
 static void test_joypad_autodetect_add(unsigned autoconf_pad)
 {
-   int vid = 0;
-   int pid = 0;
+   unsigned int vid = 0;
+   unsigned int pid = 0;
 
    sscanf(strstr(test_joypads[autoconf_pad].name, "(") + 1, "%04x:%04x", &vid, &pid);
    RARCH_DBG("[Test input] Autoconf vid/pid %x:%x.\n", vid, pid);

libretro-common/include/libchdr/chd.h

@@ -241,16 +241,16 @@ extern "C" {
 /* standard CD-ROM metadata */
 #define CDROM_OLD_METADATA_TAG		CHD_MAKE_TAG('C','H','C','D')
 #define CDROM_TRACK_METADATA_TAG	CHD_MAKE_TAG('C','H','T','R')
-#define CDROM_TRACK_METADATA_FORMAT	"TRACK:%d TYPE:%s SUBTYPE:%s FRAMES:%d"
+#define CDROM_TRACK_METADATA_FORMAT	"TRACK:%u TYPE:%s SUBTYPE:%s FRAMES:%u"
 #define CDROM_TRACK_METADATA2_TAG	CHD_MAKE_TAG('C','H','T','2')
-#define CDROM_TRACK_METADATA2_FORMAT	"TRACK:%d TYPE:%s SUBTYPE:%s FRAMES:%d PREGAP:%d PGTYPE:%s PGSUB:%s POSTGAP:%d"
+#define CDROM_TRACK_METADATA2_FORMAT	"TRACK:%u TYPE:%s SUBTYPE:%s FRAMES:%u PREGAP:%u PGTYPE:%s PGSUB:%s POSTGAP:%u"
 #define GDROM_OLD_METADATA_TAG		CHD_MAKE_TAG('C','H','G','T')
 #define GDROM_TRACK_METADATA_TAG	CHD_MAKE_TAG('C', 'H', 'G', 'D')
-#define GDROM_TRACK_METADATA_FORMAT	"TRACK:%d TYPE:%s SUBTYPE:%s FRAMES:%d PAD:%d PREGAP:%d PGTYPE:%s PGSUB:%s POSTGAP:%d"
+#define GDROM_TRACK_METADATA_FORMAT	"TRACK:%u TYPE:%s SUBTYPE:%s FRAMES:%u PAD:%u PREGAP:%u PGTYPE:%s PGSUB:%s POSTGAP:%u"
 
 /* standard A/V metadata */
 #define AV_METADATA_TAG				CHD_MAKE_TAG('A','V','A','V')
-#define AV_METADATA_FORMAT			"FPS:%d.%06d WIDTH:%d HEIGHT:%d INTERLACED:%d CHANNELS:%d SAMPLERATE:%d"
+#define AV_METADATA_FORMAT			"FPS:%d.%06d WIDTH:%du HEIGHT:%du INTERLACED:%du CHANNELS:%du SAMPLERATE:%du"
 
 /* A/V laserdisc frame metadata */
 #define AV_LD_METADATA_TAG			CHD_MAKE_TAG('A','V','L','D')

libretro-common/include/retro_miscellaneous.h

@@ -510,6 +510,8 @@ typedef struct
 #  endif
 #elif defined(PS2)
 #  define PRI_SIZET "u"
+#elif defined(__EMSCRIPTEN__)
+#  define PRI_SIZET "zu"
 #else
 #  if (SIZE_MAX == 0xFFFF)
 #    define PRI_SIZET "hu"

record/drivers/record_ffmpeg.c

@@ -70,7 +70,7 @@ extern "C" {
 #include "../../verbosity.h"
 
 #ifndef FFMPEG3
-#define FFMPEG3 ((LIBAVUTIL_VERSION_INT < (56, 6, 100)) || \
+#define FFMPEG3 ((LIBAVUTIL_VERSION_INT < AV_VERSION_INT(56, 6, 100)) || \
       (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)))
 #endif