Cut down on more implicit strlens

libretro · Jul 15, 2023 · 19ae344 · 19ae344
1 parent 3f84724
commit 19ae344
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 132 deletions.
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
@@ -11052,13 +11052,15 @@ static void materialui_set_thumbnail_system(void *userdata, char *s, size_t len)
             mui->thumbnail_path_data, s, playlist_get_cached());
 }
 
-static void materialui_get_thumbnail_system(void *userdata, char *s, size_t len)
+static size_t materialui_get_thumbnail_system(void *userdata, char *s, size_t len)
 {
    materialui_handle_t *mui = (materialui_handle_t*)userdata;
    const char *system       = NULL;
-   if (mui)
-      if (gfx_thumbnail_get_system(mui->thumbnail_path_data, &system))
-         strlcpy(s, system, len);
+   if (!mui)
+      return 0;
+   if (!gfx_thumbnail_get_system(mui->thumbnail_path_data, &system))
+      return 0;
+   return strlcpy(s, system, len);
 }
 
 static void materialui_refresh_thumbnail_image(void *userdata, unsigned i)

diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
@@ -11163,15 +11163,15 @@ static void ozone_set_thumbnail_system(void *data, char *s, size_t len)
          ozone->thumbnail_path_data, s, playlist_get_cached());
 }
 
-static void ozone_get_thumbnail_system(void *data, char *s, size_t len)
+static size_t ozone_get_thumbnail_system(void *data, char *s, size_t len)
 {
    ozone_handle_t *ozone = (ozone_handle_t*)data;
    const char *system    = NULL;
    if (!ozone)
-      return;
-
-   if (gfx_thumbnail_get_system(ozone->thumbnail_path_data, &system))
-      strlcpy(s, system, len);
+      return 0;
+   if (!gfx_thumbnail_get_system(ozone->thumbnail_path_data, &system))
+      return 0;
+   return strlcpy(s, system, len);
 }
 
 static void ozone_selection_changed(ozone_handle_t *ozone, bool allow_animation)

diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
@@ -6717,13 +6717,15 @@ static void rgui_set_thumbnail_system(void *userdata, char *s, size_t len)
             rgui->thumbnail_path_data, s, playlist_get_cached());
 }
 
-static void rgui_get_thumbnail_system(void *userdata, char *s, size_t len)
+static size_t rgui_get_thumbnail_system(void *userdata, char *s, size_t len)
 {
    rgui_t *rgui       = (rgui_t*)userdata;
    const char *system = NULL;
-   if (rgui)
-      if (gfx_thumbnail_get_system(rgui->thumbnail_path_data, &system))
-         strlcpy(s, system, len);
+   if (!rgui)
+	   return 0;
+   if (!gfx_thumbnail_get_system(rgui->thumbnail_path_data, &system))
+      return 0;
+   return strlcpy(s, system, len);
 }
 
 static void rgui_load_current_thumbnails(rgui_t *rgui, bool download_missing)

diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
@@ -1346,15 +1346,15 @@ static void xmb_set_thumbnail_system(void *data, char*s, size_t len)
          xmb->thumbnail_path_data, s, playlist_get_cached());
 }
 
-static void xmb_get_thumbnail_system(void *data, char*s, size_t len)
+static size_t xmb_get_thumbnail_system(void *data, char*s, size_t len)
 {
    xmb_handle_t *xmb  = (xmb_handle_t*)data;
    const char *system = NULL;
    if (!xmb)
-      return;
-
-   if (gfx_thumbnail_get_system(xmb->thumbnail_path_data, &system))
-      strlcpy(s, system, len);
+      return 0;
+   if (!gfx_thumbnail_get_system(xmb->thumbnail_path_data, &system))
+      return 0;
+   return strlcpy(s, system, len);
 }
 
 static void xmb_unload_thumbnail_textures(void *data)