Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-05-20 13:27:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups:

Browse source 
* No implicit memsets for texture_image
* Replace some calls with concatenated strlcpys
* Some style nits
This commit is contained in:
libretroadmin 2023-07-18 16:46:54 +02:00
parent 27d5152247
commit 770b9920f5
10 changed files with 97 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
cheevos/cheevos_menu.c
View file

@ -51,29 +51,25 @@ static void rcheevos_menu_update_bucket(rcheevos_racheevo_t* cheevo)
{
cheevo->menu_progress = 0;
/* Non-active unsupported achievement */
if (cheevo->active & RCHEEVOS_ACTIVE_UNSUPPORTED)
{
/* non-active unsupported achievement */
cheevo->menu_bucket = RCHEEVOS_MENUITEM_BUCKET_UNSUPPORTED;
}
/* Non-active unlocked in hardcore achievement */
else if (!(cheevo->active & RCHEEVOS_ACTIVE_HARDCORE))
{
/* non-active unlocked in hardcore achievement */
cheevo->menu_bucket = RCHEEVOS_MENUITEM_BUCKET_UNLOCKED;
}
else
{
const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
rc_trigger_t* trigger;
const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
if (!rcheevos_locals->hardcore_active && !(cheevo->active & RCHEEVOS_ACTIVE_SOFTCORE))
{
/* non-active unlocked in softcore achievement in softcore mode */
/* Non-active unlocked in softcore achievement in softcore mode */
cheevo->menu_bucket = RCHEEVOS_MENUITEM_BUCKET_UNLOCKED;
return;
}
/* active achievement */
/* Active achievement */
if (cheevo->active & RCHEEVOS_ACTIVE_UNOFFICIAL)
cheevo->menu_bucket = RCHEEVOS_MENUITEM_BUCKET_UNOFFICIAL;
else
@ -100,9 +96,10 @@ static void rcheevos_menu_update_bucket(rcheevos_racheevo_t* cheevo)
static void rcheevos_menu_update_buckets(void)
{
const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
rcheevos_racheevo_t* cheevo = rcheevos_locals->game.achievements;
rcheevos_racheevo_t* stop = cheevo + rcheevos_locals->game.achievement_count;
const rcheevos_locals_t *rcheevos_locals = get_rcheevos_locals();
rcheevos_racheevo_t *cheevo = rcheevos_locals->game.achievements;
rcheevos_racheevo_t *stop = cheevo +
rcheevos_locals->game.achievement_count;
while (cheevo < stop)
{
@ -117,7 +114,7 @@ bool rcheevos_menu_get_state(unsigned menu_offset, char *buffer, size_t len)
if (menu_offset < rcheevos_locals->menuitem_count)
{
const rcheevos_menuitem_t* menuitem = &rcheevos_locals->menuitems[menu_offset];
const rcheevos_racheevo_t* cheevo = menuitem->cheevo;
const rcheevos_racheevo_t* cheevo = menuitem->cheevo;
if (cheevo)
{
if (cheevo->menu_progress)
@ -125,7 +122,8 @@ bool rcheevos_menu_get_state(unsigned menu_offset, char *buffer, size_t len)
const int written = snprintf(buffer, len, "%s - ",
msg_hash_to_str(menuitem->state_label_idx));
if (len - written > 0)
rc_runtime_format_achievement_measured(&rcheevos_locals->runtime, cheevo->id, buffer + written, len - written);
rc_runtime_format_achievement_measured(&rcheevos_locals->runtime,
cheevo->id, buffer + written, len - written);
}
else
strlcpy(buffer, msg_hash_to_str(menuitem->state_label_idx), len);
@ -162,15 +160,15 @@ bool rcheevos_menu_get_sublabel(unsigned menu_offset, char *buffer, size_t len)
void rcheevos_menu_reset_badges(void)
{
const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
rcheevos_racheevo_t* cheevo = rcheevos_locals->game.achievements;
rcheevos_racheevo_t* stop = cheevo + rcheevos_locals->game.achievement_count;
rcheevos_racheevo_t* cheevo = rcheevos_locals->game.achievements;
rcheevos_racheevo_t* stop = cheevo + rcheevos_locals->game.achievement_count;
while (cheevo < stop)
{
if (cheevo->menu_badge_texture)
{
video_driver_texture_unload(&cheevo->menu_badge_texture);
cheevo->menu_badge_texture = 0;
cheevo->menu_badge_texture = 0;
cheevo->menu_badge_grayscale = MENU_BADGE_RETRY_RELOAD_FRAMES;
}
++cheevo;
@ -186,7 +184,7 @@ static rcheevos_menuitem_t* rcheevos_menu_allocate(
{
if (rcheevos_locals->menuitems)
{
rcheevos_menuitem_t* new_menuitems;
rcheevos_menuitem_t *new_menuitems;
rcheevos_locals->menuitem_capacity += 32;
new_menuitems = (rcheevos_menuitem_t*)realloc(rcheevos_locals->menuitems,
rcheevos_locals->menuitem_capacity * sizeof(rcheevos_menuitem_t));
@ -236,6 +234,7 @@ static void rcheevos_menu_append_header(rcheevos_locals_t* rcheevos_locals,
static void rcheevos_menu_update_badge(rcheevos_racheevo_t* cheevo)
{
bool badge_grayscale = false;
switch (cheevo->menu_bucket)
{
case RCHEEVOS_MENUITEM_BUCKET_LOCKED:
@ -245,9 +244,7 @@ static void rcheevos_menu_update_badge(rcheevos_racheevo_t* cheevo)
case RCHEEVOS_MENUITEM_BUCKET_ACTIVE_CHALLENGE:
badge_grayscale = true;
break;
default:
badge_grayscale = false;
break;
}
@ -261,10 +258,11 @@ static void rcheevos_menu_update_badge(rcheevos_racheevo_t* cheevo)
if (cheevo->menu_badge_texture)
video_driver_texture_unload(&cheevo->menu_badge_texture);
cheevo->menu_badge_texture = new_badge_texture;
cheevo->menu_badge_texture = new_badge_texture;
cheevo->menu_badge_grayscale = badge_grayscale;
}
/* menu_badge_grayscale is overloaded such that any value greater than 1 indicates
/* menu_badge_grayscale is overloaded such
* that any value greater than 1 indicates
* the server default image is being used */
else if (cheevo->menu_badge_grayscale < 2)
{
@ -301,7 +299,6 @@ static void rcheevos_menu_append_items(rcheevos_locals_t* rcheevos_locals,
case RCHEEVOS_MENUITEM_BUCKET_UNSUPPORTED:
menuitem->state_label_idx = MENU_ENUM_LABEL_VALUE_CHEEVOS_UNSUPPORTED_ENTRY;
break;
case RCHEEVOS_MENUITEM_BUCKET_RECENTLY_UNLOCKED:
{
/* insert the item such that the unlock times are descending */
@ -327,7 +324,6 @@ static void rcheevos_menu_append_items(rcheevos_locals_t* rcheevos_locals,
else
menuitem->state_label_idx = MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY;
break;
case RCHEEVOS_MENUITEM_BUCKET_ALMOST_THERE:
{
/* insert the item such that the progresses are descending */
@ -516,9 +512,8 @@ void rcheevos_menu_populate(void* data)
if (!rcheevos_locals->menuitems)
{
/* reserve space for all achievements and up to 6 headers before we need to realloc */
rcheevos_locals->menuitem_capacity = rcheevos_locals->game.achievement_count + 6;
rcheevos_locals->menuitems = (rcheevos_menuitem_t*)
rcheevos_locals->menuitem_capacity = rcheevos_locals->game.achievement_count + 6;
rcheevos_locals->menuitems = (rcheevos_menuitem_t*)
malloc(rcheevos_locals->menuitem_capacity * sizeof(rcheevos_menuitem_t));
if (!rcheevos_locals->menuitems)
rcheevos_locals->menuitem_capacity = 0;
@ -596,7 +591,7 @@ void rcheevos_menu_populate(void* data)
if (rcheevos_locals->menuitem_count > 0)
{
char buffer[128];
unsigned idx = 0;
unsigned idx = 0;
/* convert to menu entries */
rcheevos_menuitem_t* menuitem = rcheevos_locals->menuitems;
rcheevos_menuitem_t* stop = menuitem +
@ -663,25 +658,28 @@ void rcheevos_menu_populate(void* data)
uintptr_t rcheevos_get_badge_texture(const char *badge, bool locked)
{
char badge_file[24];
char fullpath[PATH_MAX_LENGTH];
uintptr_t tex = 0;
if (badge)
{
size_t _len;
char badge_file[24];
char fullpath[PATH_MAX_LENGTH];
uintptr_t tex = 0;
if (!badge)
return 0;
/* OpenGL driver crashes if gfx_display_reset_textures_list is called on a background thread */
retro_assert(task_is_on_main_thread());
/* OpenGL driver crashes if gfx_display_reset_textures_list is called on a background thread */
retro_assert(task_is_on_main_thread());
_len = strlcpy(badge_file, badge, sizeof(badge_file));
_len += strlcpy(badge_file + _len, locked ? "_lock" : "",
sizeof(badge_file) - _len);
strlcpy(badge_file + _len, FILE_PATH_PNG_EXTENSION,
sizeof(badge_file) - _len);
snprintf(badge_file, sizeof(badge_file), "%s%s%s", badge,
locked ? "_lock" : "", FILE_PATH_PNG_EXTENSION);
fill_pathname_application_special(fullpath, sizeof(fullpath),
APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);
fill_pathname_application_special(fullpath, sizeof(fullpath),
APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);
if (!gfx_display_reset_textures_list(badge_file, fullpath,
&tex, TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
return 0;
return tex;
if (gfx_display_reset_textures_list(badge_file, fullpath,
&tex, TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
return tex;
}
return 0;
}

5
gfx/drivers/d3d10.c
View file

@ -1399,7 +1399,10 @@ static bool d3d10_gfx_set_shader(void* data,
for (i = 0; i < d3d10->shader_preset->luts; i++)
{
struct texture_image image = { 0 };
struct texture_image image;
image.pixels = NULL;
image.width = 0;
image.height = 0;
image.supports_rgba = true;
if (!image_texture_load(&image, d3d10->shader_preset->lut[i].path))

5
gfx/drivers/d3d11.c
View file

@ -1625,7 +1625,10 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
for (i = 0; i < d3d11->shader_preset->luts; i++)
{
struct texture_image image = { 0 };
struct texture_image image;
image.pixels = NULL;
image.width = 0;
image.height = 0;
image.supports_rgba = true;
if (!image_texture_load(&image, d3d11->shader_preset->lut[i].path))

5
gfx/drivers/d3d12.c
View file

@ -1836,7 +1836,10 @@ static bool d3d12_gfx_set_shader(void* data, enum rarch_shader_type type, const
for (i = 0; i < d3d12->shader_preset->luts; i++)
{
struct texture_image image = { 0 };
struct texture_image image;
image.pixels = NULL;
image.width = 0;
image.height = 0;
image.supports_rgba = true;
if (!image_texture_load(&image, d3d12->shader_preset->lut[i].path))

6
gfx/drivers/gx2_gfx.c
View file

@ -186,7 +186,11 @@ static bool gx2_set_shader(void *data,
for (i = 0; i < wiiu->shader_preset->luts; i++)
{
struct texture_image image = {};
struct texture_image image;
image.pixels = NULL;
image.width = 0;
image.height = 0;
image.supports_rgba = false;
if (image_texture_load(&image, wiiu->shader_preset->lut[i].path))
{

26
gfx/gfx_thumbnail.c
View file

@ -112,9 +112,9 @@ static void gfx_thumbnail_init_fade(
/* A 'fade in' animation is triggered if:
* - Thumbnail is available
* - Thumbnail is missing and 'fade_missing' is enabled */
if ((thumbnail->status == GFX_THUMBNAIL_STATUS_AVAILABLE) ||
(p_gfx_thumb->fade_missing &&
(thumbnail->status == GFX_THUMBNAIL_STATUS_MISSING)))
if ( (thumbnail->status == GFX_THUMBNAIL_STATUS_AVAILABLE)
|| (p_gfx_thumb->fade_missing
&& (thumbnail->status == GFX_THUMBNAIL_STATUS_MISSING)))
{
if (p_gfx_thumb->fade_duration > 0.0f)
{
@ -447,8 +447,8 @@ void gfx_thumbnail_request_stream(
/* Only process request if current status
* is GFX_THUMBNAIL_STATUS_UNKNOWN */
if (!thumbnail ||
(thumbnail->status != GFX_THUMBNAIL_STATUS_UNKNOWN))
if ( !thumbnail
|| (thumbnail->status != GFX_THUMBNAIL_STATUS_UNKNOWN))
return;
/* Check if stream delay timer has elapsed */
@ -621,9 +621,9 @@ void gfx_thumbnail_process_stream(
if (thumbnail->delay_timer > p_gfx_thumb->stream_delay)
{
/* Update thumbnail content */
if (!path_data ||
!playlist ||
!gfx_thumbnail_set_content_playlist(path_data, playlist, idx))
if ( !path_data
|| !playlist
|| !gfx_thumbnail_set_content_playlist(path_data, playlist, idx))
{
/* Content is invalid
* > Reset thumbnail and set missing status */
@ -714,9 +714,9 @@ void gfx_thumbnail_process_streams(
if (request_right || request_left)
{
/* Update thumbnail content */
if (!path_data ||
!playlist ||
!gfx_thumbnail_set_content_playlist(path_data, playlist, idx))
if ( !path_data
|| !playlist
|| !gfx_thumbnail_set_content_playlist(path_data, playlist, idx))
{
/* Content is invalid
* > Reset thumbnail and set missing status */
@ -981,8 +981,8 @@ void gfx_thumbnail_draw(
if (shadow)
{
/* Sanity check */
if ((shadow->type != GFX_THUMBNAIL_SHADOW_NONE) &&
(shadow->alpha > 0.0f))
if ( (shadow->type != GFX_THUMBNAIL_SHADOW_NONE)
&& (shadow->alpha > 0.0f))
{
float shadow_width;
float shadow_height;

12
menu/drivers/ozone.c
View file

@ -3630,6 +3630,7 @@ static void ozone_update_savestate_thumbnail_path(void *data, unsigned i)
string_is_equal(entry.label, "loadstate") ||
string_is_equal(entry.label, "savestate"))
{
size_t _len;
char path[8204];
runloop_state_t *runloop_st = runloop_state_get_ptr();
@ -3642,18 +3643,17 @@ static void ozone_update_savestate_thumbnail_path(void *data, unsigned i)
if (state_slot < 0)
{
path[0] = '\0';
fill_pathname_join_delim(path,
path[0] = '\0';
_len = fill_pathname_join_delim(path,
runloop_st->name.savestate, "auto", '.', sizeof(path));
}
else
{
size_t _len = strlcpy(path, runloop_st->name.savestate, sizeof(path));
_len = strlcpy(path, runloop_st->name.savestate, sizeof(path));
if (state_slot > 0)
snprintf(path + _len, sizeof(path) - _len, "%d", state_slot);
_len += snprintf(path + _len, sizeof(path) - _len, "%d", state_slot);
}
strlcat(path, FILE_PATH_PNG_EXTENSION, sizeof(path));
strlcpy(path + _len, FILE_PATH_PNG_EXTENSION, sizeof(path) - _len);
if (path_is_valid(path))
{

9
menu/drivers/rgui.c
View file

@ -6829,6 +6829,7 @@ static void rgui_update_savestate_thumbnail_path(void *data, unsigned i)
string_is_equal(entry.label, "loadstate") ||
string_is_equal(entry.label, "savestate"))
{
size_t _len;
char path[8204];
runloop_state_t *runloop_st = runloop_state_get_ptr();
@ -6842,19 +6843,19 @@ static void rgui_update_savestate_thumbnail_path(void *data, unsigned i)
if (state_slot < 0)
{
path[0] = '\0';
fill_pathname_join_delim(path,
_len = fill_pathname_join_delim(path,
runloop_st->name.savestate, "auto", '.', sizeof(path));
}
else
{
size_t _len = strlcpy(path,
_len = strlcpy(path,
runloop_st->name.savestate, sizeof(path));
if (state_slot > 0)
snprintf(path + _len, sizeof(path) - _len, "%d",
_len += snprintf(path + _len, sizeof(path) - _len, "%d",
state_slot);
}
strlcat(path, FILE_PATH_PNG_EXTENSION, sizeof(path));
strlcpy(path + _len, FILE_PATH_PNG_EXTENSION, sizeof(path) - _len);
if (path_is_valid(path))
strlcpy(rgui->savestate_thumbnail_file_path,

9
menu/drivers/xmb.c
View file

@ -1213,6 +1213,7 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
|| string_is_equal(entry.label, "loadstate")
|| string_is_equal(entry.label, "savestate"))
{
size_t _len;
char path[8204];
runloop_state_t *runloop_st = runloop_state_get_ptr();
@ -1226,19 +1227,19 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
if (state_slot < 0)
{
path[0] = '\0';
fill_pathname_join_delim(path,
_len = fill_pathname_join_delim(path,
runloop_st->name.savestate, "auto", '.', sizeof(path));
}
else
{
size_t _len = strlcpy(path,
_len = strlcpy(path,
runloop_st->name.savestate, sizeof(path));
if (state_slot > 0)
snprintf(path + _len, sizeof(path) - _len, "%d",
_len += snprintf(path + _len, sizeof(path) - _len, "%d",
state_slot);
}
strlcat(path, FILE_PATH_PNG_EXTENSION, sizeof(path));
strlcpy(path + _len, FILE_PATH_PNG_EXTENSION, sizeof(path) - _len);
if (path_is_valid(path))
{

10
menu/menu_contentless_cores.c
View file

@ -295,7 +295,10 @@ static void contentless_cores_load_icons(contentless_cores_state_t *state)
if (path_is_valid(icon_path))
{
struct texture_image ti = {0};
struct texture_image ti;
ti.pixels = NULL;
ti.width = 0;
ti.height = 0;
ti.supports_rgba = rgba_supported;
if (image_texture_load(&ti, icon_path))
@ -326,9 +329,9 @@ static void contentless_cores_load_icons(contentless_cores_state_t *state)
&& core_info->databases_list
&& (core_info->databases_list->size > 0))
{
struct texture_image ti;
const char *icon_name =
core_info->databases_list->elems[0].data;
struct texture_image ti = {0};
size_t len = fill_pathname_join_special(
icon_path, icon_directory,
icon_name, sizeof(icon_path));
@ -338,6 +341,9 @@ static void contentless_cores_load_icons(contentless_cores_state_t *state)
icon_path[++len] = 'g';
icon_path[++len] = '\0';
ti.pixels = NULL;
ti.width = 0;
ti.height = 0;
ti.supports_rgba = rgba_supported;
if (!path_is_valid(icon_path))