Merge pull request #17796 from pstef/silence-warnings

Author: LibretroAdmin

configuration.c

@@ -6178,7 +6178,11 @@ bool input_remapping_save_file(const char *path)
       if (skip_port)
          continue;
 
-      snprintf(formatted_number, sizeof(formatted_number), "%u", i + 1);
+      _len = snprintf(formatted_number, sizeof(formatted_number), "%u", i + 1);
+      if (_len >= sizeof(formatted_number)) {
+         RARCH_ERR("[Config]: unexpectedly high number of users");
+         break;
+      }
       _len       = strlcpy(prefix, "input_player",   sizeof(prefix));
       strlcpy(prefix + _len, formatted_number, sizeof(prefix) - _len);
       _len       = strlcpy(s1, prefix, sizeof(s1));

deps/dr/dr_flac.h

@@ -682,10 +682,17 @@ const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, dr
 #define DRFLAC_NO_CPUID
 #endif
 
-
 #ifdef __linux__
-#define _BSD_SOURCE
-#include <endian.h>
+    #ifndef _BSD_SOURCE
+        #define _BSD_SOURCE
+    #endif
+    #ifndef _DEFAULT_SOURCE
+        #define _DEFAULT_SOURCE
+    #endif
+    #ifndef __USE_BSD
+        #define __USE_BSD
+    #endif
+    #include <endian.h>
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER >= 1500 && (defined(DRFLAC_X86) || defined(DRFLAC_X64))

frontend/drivers/platform_ps2.c

@@ -343,7 +343,7 @@ static void frontend_ps2_exec(const char *path, bool should_load_game)
    deinit_drivers(true, true);
    reset_IOP();
    common_init_drivers(false);
-   waitUntilDeviceIsReady(path);
+   waitUntilDeviceIsReady((char *)path);
 
 #ifndef IS_SALAMANDER
    char game_path[FILENAME_MAX];

frontend/drivers/platform_ps3.c

@@ -436,16 +436,16 @@ static void frontend_ps3_exec(const char *path, bool should_load_game)
 {
 #ifndef IS_SALAMANDER
 #ifdef HAVE_NETWORKING
-   char *arg_data[NETPLAY_FORK_MAX_ARGS];
+   const char *arg_data[NETPLAY_FORK_MAX_ARGS];
 #else
-   char *arg_data[2];
+   const char *arg_data[2];
 #endif
    char game_path[PATH_MAX_LENGTH];
    bool verbosity = verbosity_is_enabled();
 
    verbosity_enable();
 #else
-   char *arg_data[1];
+   const char *arg_data[1];
 #endif
 
    arg_data[0] = NULL;

gfx/drivers/gl_shaders/pipeline_snow.glsl.vert.h

@@ -1,5 +1,6 @@
 #include "shaders_common.h"
 
+#if defined(HAVE_OPENGLES)
 /* Need to duplicate these to work around broken stuff on Android.
  * Must enforce alpha = 1.0 or 32-bit games can potentially go black. */
 static const char *stock_vertex_xmb_snow = GLSL(
@@ -14,3 +15,4 @@ static const char *stock_vertex_xmb_snow = GLSL(
       tex_coord = TexCoord;
    }
 );
+#endif

gfx/drivers_shader/shader_glsl.c

@@ -44,6 +44,11 @@
 #include "../../deps/xxHash/xxhash.h"
 #endif
 
+#if defined(VITA)
+#include <psp2/kernel/threadmgr/thread.h>
+#include <psp2/power.h>
+#endif
+
 #define PREV_TEXTURES (GFX_MAX_TEXTURES - 1)
 
 /* Cache the VBO. */

input/drivers_joypad/switch_joypad.c

@@ -430,7 +430,7 @@ bool switch_joypad_set_rumble(unsigned pad,
    HidVibrationDeviceHandle* handle;
    float amp;
 
-   if (pad >= DEFAULT_MAX_PADS || !vibration_handles[pad])
+   if (pad >= DEFAULT_MAX_PADS)
       return false;
 
    amp  = (float)strength / 65535.0f;

input/input_driver.c

@@ -62,6 +62,9 @@
 #include "../verbosity.h"
 
 #include "../ai/game_ai.h"
+#if defined(_WIN32)
+#include <winsock2.h>
+#endif
 
 #define HOLD_BTN_DELAY_SEC 2
 
@@ -6776,7 +6779,12 @@ void input_driver_poll(void)
             ssize_t ret;
             struct remote_message msg;
 
+
+#if defined(_WIN32)
+            if (input_st->remote->net_fd[user] == INVALID_SOCKET)
+#else
             if (input_st->remote->net_fd[user] < 0)
+#endif
                return;
 
             FD_ZERO(&fds);

libretro-common/features/features_cpu.c

@@ -269,7 +269,8 @@ retro_time_t cpu_features_get_time_usec(void)
 #endif
 
 #if defined(CPU_X86) && !defined(__MACH__)
-void x86_cpuid(int func, int flags[4])
+#include <limits.h>
+void x86_cpuid(int func, int32_t flags[4])
 {
    /* On Android, we compile RetroArch with PIC, and we
     * are not allowed to clobber the ebx register. */
@@ -288,8 +289,8 @@ void x86_cpuid(int func, int flags[4])
          "xchg %%" REG_b ", %%" REG_S "\n"
          : "=a"(flags[0]), "=S"(flags[1]), "=c"(flags[2]), "=d"(flags[3])
          : "a"(func));
-#elif defined(_MSC_VER)
-   __cpuid(flags, func);
+#elif defined(_MSC_VER) && INT_MAX == 2147483647
+   __cpuid((int*)flags, func);
 #else
 #ifndef NDEBUG
    printf("Unknown compiler. Cannot check CPUID with inline assembly.\n");

menu/cbs/menu_cbs_sublabel.c

@@ -1826,7 +1826,7 @@ static int action_bind_sublabel_netplay_kick_client(file_list_t *list,
    if (status)
    {
       size_t _len = strlcpy(buf, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_STATUS),
-            sizeof(buf));
+            sizeof(buf) - 3);
       buf[  _len] = ':';
       buf[++_len] = ' ';
       buf[++_len] = '\0';