Warning fixes #2

Author: LibretroAdmin

configuration.c

@@ -5436,7 +5436,7 @@ void input_config_get_prefix(char *s, char len, char user, bool meta)
  */
 static void input_config_save_keybinds_user(config_file_t *conf, unsigned user)
 {
-   size_t i = 0;
+   unsigned i;
    for (i = 0; input_config_bind_map_get_valid(i); i++)
    {
       char key[64];
@@ -5482,7 +5482,7 @@ static void input_config_save_keybinds_user_override(config_file_t *conf,
       unsigned user, unsigned bind_id,
       const struct retro_keybind *override_bind)
 {
-   size_t i = bind_id;
+   unsigned i = bind_id;
 
    if (input_config_bind_map_get_valid(i))
    {
@@ -5533,7 +5533,7 @@ static void input_config_save_keybinds_user_override(config_file_t *conf,
 static void input_config_save_keybinds_user_minimal(config_file_t *conf,
       unsigned user, const retro_keybind_set default_binds)
 {
-   size_t i = 0;
+   unsigned i;
    for (i = 0; input_config_bind_map_get_valid(i); i++)
    {
       char key[64];

gfx/drivers_shader/slang_cache.cpp

@@ -4,6 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include <file/file_path.h>
 #include <streams/file_stream.h>
 #include <vfs/vfs.h>
@@ -83,12 +84,15 @@ static bool spirv_cache_get_filename(const char *hash,
  */
 static bool spirv_cache_write_string(RFILE *file, const std::string &str)
 {
-   uint32_t len = str.length();
+   uint32_t _len;
+   if (str.length() > UINT32_MAX)
+      return false;
+   _len = (uint32_t)str.length();
 
-   if (filestream_write(file, &len, sizeof(uint32_t)) != sizeof(uint32_t))
+   if (filestream_write(file, &_len, sizeof(uint32_t)) != sizeof(uint32_t))
       return false;
 
-   if (len > 0 && filestream_write(file, str.c_str(), len) != len)
+   if (_len > 0 && filestream_write(file, str.c_str(), _len) != _len)
       return false;
 
    return true;
@@ -103,29 +107,30 @@ static bool spirv_cache_write_string(RFILE *file, const std::string &str)
  */
 static bool spirv_cache_read_string(RFILE *file, std::string &str_out)
 {
-   uint32_t len;
+   uint32_t _len;
+   char *buf;
 
-   if (filestream_read(file, &len, sizeof(uint32_t)) != sizeof(uint32_t))
+   if (filestream_read(file, &_len, sizeof(uint32_t)) != sizeof(uint32_t))
       return false;
 
-   if (len == 0)
+   if (_len == 0)
    {
       str_out.clear();
       return true;
    }
 
    /* Allocate and read string */
-   char *buf = new char[len + 1];
+   buf = new char[_len + 1];
    if (!buf)
       return false;
 
-   if (filestream_read(file, buf, len) != len)
+   if (filestream_read(file, buf, _len) != _len)
    {
       delete[] buf;
       return false;
    }
 
-   buf[len] = '\0';
+   buf[_len] = '\0';
    str_out = buf;
    delete[] buf;
 
@@ -134,18 +139,18 @@ static bool spirv_cache_read_string(RFILE *file, std::string &str_out)
 
 extern "C" {
 
-bool spirv_cache_compute_hash(const char *vertex_source, const char *fragment_source,
-      char *hash_out)
+bool spirv_cache_compute_hash(const char *vertex_source, const char *fragment_source, char *hash_out)
 {
+   uint8_t *combined;
+   size_t vertex_len, fragment_len, total_len;
    if (!vertex_source || !fragment_source || !hash_out)
       return false;
 
    /* Build combined hash input: vertex + "|" + fragment */
-   size_t vertex_len = strlen(vertex_source);
-   size_t fragment_len = strlen(fragment_source);
-   size_t total_len = vertex_len + 1 + fragment_len;  /* 1 for "|" separator */
-
-   uint8_t *combined = new uint8_t[total_len];
+   vertex_len   = strlen(vertex_source);
+   fragment_len = strlen(fragment_source);
+   total_len    = vertex_len + 1 + fragment_len;  /* 1 for "|" separator */
+   combined     = new uint8_t[total_len];
    if (!combined)
       return false;
 
@@ -163,8 +168,8 @@ bool spirv_cache_compute_hash(const char *vertex_source, const char *fragment_so
 bool spirv_cache_load(const char *hash, struct glslang_output *output)
 {
    RFILE *file;
-   char cache_file[PATH_MAX_LENGTH];
    uint8_t version;
+   char cache_file[PATH_MAX_LENGTH];
    uint32_t vertex_size, fragment_size, param_count, i;
    uint16_t rt_format;
 
@@ -259,10 +264,10 @@ bool spirv_cache_load(const char *hash, struct glslang_output *output)
 bool spirv_cache_save(const char *hash, const struct glslang_output *output)
 {
    RFILE *file;
+   uint16_t rt_format;
    char cache_file[PATH_MAX_LENGTH];
    uint8_t version = SPIRV_CACHE_VERSION;
    uint32_t vertex_size, fragment_size, param_count, i;
-   uint16_t rt_format;
 
    if (!hash || !output)
       return false;
@@ -284,7 +289,9 @@ bool spirv_cache_save(const char *hash, const struct glslang_output *output)
       goto error;
 
    /* Write vertex SPIR-V */
-   vertex_size = output->vertex.size();
+   if (output->vertex.size() > UINT32_MAX)
+      goto error;
+   vertex_size = (uint32_t)output->vertex.size();
    if (filestream_write(file, &vertex_size, sizeof(uint32_t)) != sizeof(uint32_t))
       goto error;
    if (vertex_size > 0)
@@ -294,7 +301,9 @@ bool spirv_cache_save(const char *hash, const struct glslang_output *output)
    }
 
    /* Write fragment SPIR-V */
-   fragment_size = output->fragment.size();
+   if (output->fragment.size() > UINT32_MAX)
+      goto error;
+   fragment_size = (uint32_t)output->fragment.size();
    if (filestream_write(file, &fragment_size, sizeof(uint32_t)) != sizeof(uint32_t))
       goto error;
    if (fragment_size > 0)
@@ -304,7 +313,9 @@ bool spirv_cache_save(const char *hash, const struct glslang_output *output)
    }
 
    /* Write parameters */
-   param_count = output->meta.parameters.size();
+   if (output->meta.parameters.size() > UINT32_MAX)
+      goto error;
+   param_count = (uint32_t)output->meta.parameters.size();
    if (filestream_write(file, &param_count, sizeof(uint32_t)) != sizeof(uint32_t))
       goto error;
 

libretro-common/vfs/vfs_implementation_smb.c

@@ -36,7 +36,7 @@ static bool smb_initialized = false;
 static int max_context_configured = 0;
 static const struct smb_settings *smb_cfg = NULL;
 
-static struct smb2_context *get_smb_context()
+static struct smb2_context *get_smb_context(void)
 {
    int idx;
 
@@ -81,7 +81,7 @@ bool smb_init_cfg(const struct smb_settings *new_cfg)
 }
 
 /* Initialize SMB context */
-static bool smb_init()
+static bool smb_init(void)
 {
    char server[256];
    char share[256];
@@ -220,7 +220,7 @@ void smb_close_context(int index)
 }
 
 /* Shutdown SMB context - called on exit */
-void smb_shutdown()
+void smb_shutdown(void)
 {
    int i;
 

libretro-common/vfs/vfs_implementation_smb.h

@@ -66,7 +66,7 @@ int retro_vfs_stat_smb(const char *path, int64_t *size);
 int retro_vfs_file_error_smb(libretro_vfs_implementation_file *stream);
 
 /* Context management */
-void smb_shutdown();
+void smb_shutdown(void);
 
 #ifdef __cplusplus
 }

menu/drivers/materialui.c

@@ -10784,7 +10784,6 @@ static int materialui_pointer_down(void *userdata,
       int drag_margin_vert;
       gfx_display_t *p_disp  = disp_get_ptr();
       unsigned header_height = p_disp->header_height;
-      unsigned width         = mui->last_width;
       unsigned height        = mui->last_height;
 
       /* Check whether pointer down event is within

menu/drivers/ozone.c

@@ -7458,7 +7458,7 @@ static void ozone_draw_messagebox(
       unsigned slice_new_w  = longest_width + (slice_margin * 2);
       unsigned slice_new_h  = line_height * (line_count + 2) + (slice_margin / 2);
       unsigned slice_w      = 256;
-      int slice_x           = x - (longest_width / 2) - slice_margin;
+      int slice_x           = (int)(x - (longest_width / 2) - slice_margin);
       int slice_y           = y - line_height - (slice_margin / 4)
             + ((slice_new_h >= slice_w)
                   ? (16.0f * scale_factor)

menu/drivers/rgui.c

@@ -2972,7 +2972,7 @@ static void rgui_render_mini_thumbnail(
       else
          fb_y_offset = (rgui->term_layout.start_y + term_height) - thumbnail->max_height;
 
-      text_x         = (thumbnail->max_width  / 2) + fb_x_offset - (strlen(msg) * (rgui->font_width_stride / 2));
+      text_x         = (thumbnail->max_width  / 2) + fb_x_offset - ((int)strlen(msg) * (rgui->font_width_stride / 2));
       text_y         = (thumbnail->max_height / 2) + fb_y_offset - (rgui->font_height_stride / 3);
 
       /* Draw background */
@@ -5543,9 +5543,9 @@ static void rgui_render(void *data, unsigned width, unsigned height,
 
          rgui_blit_line(rgui,
                fb_width,
-               term_end_x
+               (int)(term_end_x
                      - (powerstate_len * rgui->font_width_stride)
-                     - (timedate_len * rgui->font_width_stride),
+                     - (timedate_len * rgui->font_width_stride)),
                title_y,
                timedate,
                rgui->colors.hover_color,

menu/drivers/xmb.c

@@ -2549,7 +2549,7 @@ static void xmb_set_title(xmb_handle_t *xmb)
             if (xmb->categories_selection_ptr > xmb->system_tab_end)
             {
                xmb_node_t *sidebar_node = NULL;
-               int i = xmb->categories_selection_ptr - xmb->system_tab_end - 1;
+               size_t i = xmb->categories_selection_ptr - xmb->system_tab_end - 1;
 
                /* Explore views */
                if (string_ends_with_size(xmb->horizontal_list.list[i].label, ".lvw",

retroarch.c

@@ -1261,7 +1261,7 @@ static size_t find_driver_nonempty(
 
 int driver_find_index(const char *label, const char *drv)
 {
-   size_t i;
+   int i;
    char str[NAME_MAX_LENGTH];
 
    str[0] = '\0';
@@ -1288,7 +1288,7 @@ int driver_find_index(const char *label, const char *drv)
  **/
 static void driver_find_last(const char *label, char *s, size_t len)
 {
-   size_t i;
+   int i;
    for (i = 0;
          find_driver_nonempty(label, i, s, len) > 0; i++) { }
    if (i)
@@ -1805,7 +1805,7 @@ void drivers_init(
 #endif
 
 #ifdef HAVE_MENU
-   srand(time(NULL));
+   srand((unsigned)time(NULL));
 #endif
 }
 
@@ -5408,7 +5408,7 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_RUMBLE_STOP:
          {
-            size_t i;
+            unsigned i;
             for (i = 0; i < MAX_USERS; i++)
             {
                unsigned joy_idx = settings->uints.input_joypad_index[i];

runahead.c

@@ -1612,7 +1612,7 @@ static INLINE void preempt_input_poll(preempt_t *preempt,
    for (p = 0; p < max_users; p++)
    {
       /* Check full digital joypad */
-      int16_t joypad_state = (int16_t)(state_cb(p, RETRO_DEVICE_JOYPAD,
+      int16_t joypad_state = (int16_t)(state_cb((unsigned)p, RETRO_DEVICE_JOYPAD,
             0, RETRO_DEVICE_ID_JOYPAD_MASK));
       if (joypad_state != preempt->joypad_state[p])
       {