Fix warnings

Except for deps and the parts that are specifically pipewire includes, this
compiles under pedantic and C89 for me on Linux.  Mostly this was
fixing issues, but in pipewire's case it involved ignoring some errors.

Author: JoeOsborn

Makefile.emscripten

@@ -283,7 +283,7 @@ endif
 ifeq ($(DEBUG), 1)
    LDFLAGS += -O0 -g -gsource-map -s SAFE_HEAP=2 -s STACK_OVERFLOW_CHECK=2 -s ASSERTIONS=1
    # -O0 in cflags gives "too many locals" errors
-   CFLAGS += -O1 -g -gsource-map
+   CFLAGS += -O1 -g -gsource-map -Wall -Werror
 else
    LDFLAGS += -O3
    # WARNING: some optimizations can break some cores (ex: LTO breaks tyrquake)

audio/common/pipewire.c

@@ -27,9 +27,11 @@ static void core_error_cb(void *data, uint32_t id, int seq, int res, const char
 {
    pipewire_core_t *pw = (pipewire_core_t*)data;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    RARCH_ERR("[PipeWire] Error id:%u seq:%d res:%d (%s): %s.\n",
              id, seq, res, spa_strerror(res), message);
-
+#pragma GCC diagnostic pop
    pw_thread_loop_stop(pw->thread_loop);
 }
 
@@ -54,8 +56,10 @@ static const struct pw_core_events core_events = {
 void pipewire_core_wait_resync(pipewire_core_t *pw)
 {
    retro_assert(pw);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    pw->pending_seq = pw_core_sync(pw->core, PW_ID_CORE, pw->pending_seq);
-
+#pragma GCC diagnostic pop
    for (;;)
    {
       pw_thread_loop_wait(pw->thread_loop);
@@ -116,16 +120,21 @@ bool pipewire_core_init(pipewire_core_t **pw, const char *loop_name, const struc
    if (!(*pw)->core)
       goto unlock;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    if (pw_core_add_listener((*pw)->core,
                             &(*pw)->core_listener,
                             &core_events, *pw) < 0)
       goto unlock;
-
+#pragma GCC diagnostic pop
    if (events)
    {
       (*pw)->registry = pw_core_get_registry((*pw)->core, PW_VERSION_REGISTRY, 0);
       spa_zero((*pw)->registry_listener);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
       pw_registry_add_listener((*pw)->registry, &(*pw)->registry_listener, events, *pw);
+#pragma GCC diagnostic pop
    }
 
    return true;
@@ -138,7 +147,10 @@ bool pipewire_core_init(pipewire_core_t **pw, const char *loop_name, const struc
 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/common/pipewire.h

@@ -18,10 +18,12 @@
 #define _RETROARCH_PIPEWIRE
 
 #include <stdint.h>
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
 #include <spa/param/audio/format-utils.h>
 #include <spa/utils/ringbuffer.h>
 #include <pipewire/pipewire.h>
+#pragma GCC diagnostic pop
 
 #include <lists/string_list.h>
 

audio/drivers/alsathread.c

@@ -212,10 +212,11 @@ static void alsa_microphone_worker_thread(void *mic_context)
    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

@@ -12,12 +12,14 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
 #include <spa/param/audio/format-utils.h>
 #include <spa/utils/ringbuffer.h>
 #include <spa/utils/result.h>
 #include <spa/param/props.h>
 #include <pipewire/pipewire.h>
+#pragma GCC diagnostic pop
 
 #include <boolean.h>
 #include <retro_miscellaneous.h>
@@ -132,12 +134,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);
@@ -216,8 +222,10 @@ static void *pwire_microphone_init(void)
    struct pw_properties     *props = NULL;
    const char               *error = NULL;
    pipewire_core_t             *pw = NULL;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    struct spa_pod_builder        b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
-
+#pragma GCC diagnostic pop
    if (!pipewire_core_init(&pw, "microphone_driver", &pwire_mic_registry_events))
       goto error;
 
@@ -336,7 +344,10 @@ static void *pwire_microphone_open_mic(void *driver_context,
    const struct spa_pod *params[1];
    struct pw_properties *props = NULL;
    const char           *error = NULL;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    struct spa_pod_builder    b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+#pragma GCC diagnostic pop
    pipewire_microphone_t   *mic = NULL;
 
    if (!driver_context || (mic = calloc(1, sizeof(pipewire_microphone_t))) == NULL)
@@ -494,12 +505,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;
@@ -596,7 +611,10 @@ static void *pwire_init(const char *device, unsigned rate,
    struct pw_properties     *props = NULL;
    const char               *error = NULL;
    pipewire_audio_t         *audio = (pipewire_audio_t*)calloc(1, sizeof(*audio));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    struct spa_pod_builder        b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
+#pragma GCC diagnostic pop
 
    if (!audio)
       return NULL;

audio/drivers/sdl_audio.c

@@ -313,11 +313,12 @@ 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;
    sdl_microphone_t        *sdl = (sdl_microphone_t*)driver_context;
    sdl_microphone_handle_t *mic = (sdl_microphone_handle_t*)mic_context;
+   uint8_t *s = (uint8_t *)sv;
 
    if (!sdl || !mic || !s)
       return -1;

camera/drivers/pipewire.c

@@ -13,6 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
 #include <spa/utils/result.h>
 #include <spa/param/video/format-utils.h>
 #include <spa/param/tag-utils.h>
@@ -21,6 +23,7 @@
 #include <spa/debug/format.h>
 #include <spa/debug/pod.h>
 #include <pipewire/pipewire.h>
+#pragma GCC diagnostic pop
 
 #include <gfx/scaler/scaler.h>
 #include <gfx/video_frame.h>
@@ -209,8 +212,10 @@ static void stream_param_changed_cb(void *data, uint32_t id, const struct spa_po
    uint8_t params_buffer[1024];
    const struct spa_pod *params[5];
    pipewire_camera_t *camera = (pipewire_camera_t*)data;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    struct spa_pod_builder b = SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));
-
+#pragma GCC diagnostic pop
    if (param && id == SPA_PARAM_Tag)
    {
       spa_debug_pod(0, NULL, param);
@@ -258,6 +263,8 @@ static void stream_param_changed_cb(void *data, uint32_t id, const struct spa_po
       return;
    }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    struct spa_pod_frame frame;
    spa_pod_builder_push_object(&b, &frame, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers);
    spa_pod_builder_add(&b,
@@ -270,7 +277,6 @@ static void stream_param_changed_cb(void *data, uint32_t id, const struct spa_po
          0);
 
    params[0] = spa_pod_builder_pop(&b, &frame);
-
    params[1] = spa_pod_builder_add_object(&b,
          SPA_TYPE_OBJECT_ParamMeta,  SPA_PARAM_Meta,
          SPA_PARAM_META_type,        SPA_POD_Id(SPA_META_Header),
@@ -281,6 +287,7 @@ static void stream_param_changed_cb(void *data, uint32_t id, const struct spa_po
          SPA_PARAM_META_type,        SPA_POD_Id(SPA_META_VideoTransform),
          SPA_PARAM_META_size,        SPA_POD_Int(sizeof(struct spa_meta_videotransform)));
 #endif
+#pragma GCC diagnostic pop
 
    camera->buffer_output = (uint32_t *)
          malloc(camera->size.width * camera->size.height * sizeof(uint32_t));
@@ -372,8 +379,11 @@ static void *pipewire_init(const char *device, uint64_t caps,
    struct     pw_properties *props;
    uint8_t            buffer[1024];
    pipewire_camera_t       *camera = (pipewire_camera_t*)calloc(1, sizeof(*camera));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
    struct spa_pod_builder        b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
-
+#pragma GCC diagnostic pop
+   
    if (!camera)
       goto error;
 
@@ -420,7 +430,10 @@ static void *pipewire_init(const char *device, uint64_t caps,
 
    if (res < 0)
    {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
       RARCH_ERR("[Camera] [PipeWire] Can't connect: %s.\n", spa_strerror(res));
+#pragma GCC diagnostic pop
       goto error;
    }
 

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,7 @@ static void enumerate_audio_devices(char *s, size_t len)
          continue;
       }
 
-      //todo: add more info to make picking audio device more user friendly
+      /*todo: add more info to make picking audio device more user friendly*/
       descr = snd_device_name_get_hint(*n, "DESC");
       if (!descr)
       {
@@ -305,7 +305,7 @@ 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
+      /* not sure if this is necessary but ensuring things are free/null*/
       if(name != NULL)
       {
          free(name);
@@ -593,6 +593,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 +619,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 +1282,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);