libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-23 03:02:04 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

More C89 compatibility fixes

Browse Source
This commit is contained in:
Tim Van den Langenbergh 2019-07-28 15:52:48 +02:00
parent 6bd79acc5d
commit 771134eb52
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretro-common/playlists/label_sanitization.c
View File

@ -21,6 +21,7 @@
*/
#include <playlists/label_sanitization.h>
#include <retro_miscellaneous.h>
#include <string/stdstring.h>
#include <string.h>
@ -32,7 +33,7 @@ void label_sanitize(char *label, size_t size, bool (*left)(char*), bool (*right)
bool copy = true;
int rindex = 0;
int lindex = 0;
char new_label[size];
char new_label[PATH_MAX_LENGTH];
for (; lindex < size && label[lindex] != '\0'; lindex++)
{

10
menu/cbs/menu_cbs_get_value.c
View File

@ -1106,14 +1106,20 @@ static void menu_action_setting_disp_set_label_playlist_label_display_mode(
const char *path,
char *s2, size_t len2)
{
enum playlist_label_display_mode label_display_mode;
int msg_index;
playlist_t *playlist = playlist_get_cached();
enum playlist_label_display_mode label_display_mode = playlist_get_label_display_mode(playlist);
if (!playlist)
return;
label_display_mode = playlist_get_label_display_mode(playlist);
*w = 19;
strlcpy(s2, path, len2);
int msg_index = (int)label_display_mode;
msg_index = (int)label_display_mode;
msg_index = msg_index * 3;
msg_index = msg_index + (int)MENU_ENUM_LABEL_VALUE_PLAYLIST_MANAGER_LABEL_DISPLAY_MODE_DEFAULT;

3
menu/cbs/menu_cbs_left.c
View File

@ -437,12 +437,13 @@ static int playlist_association_left(unsigned type, const char *label,
static int playlist_label_display_mode_left(unsigned type, const char *label,
bool wraparound)
{
enum playlist_label_display_mode label_display_mode;
playlist_t *playlist = playlist_get_cached();
if (!playlist)
return -1;
enum playlist_label_display_mode label_display_mode = playlist_get_label_display_mode(playlist);
label_display_mode = playlist_get_label_display_mode(playlist);
if (label_display_mode != LABEL_DISPLAY_MODE_DEFAULT)
label_display_mode = (enum playlist_label_display_mode)((int)label_display_mode - 1);

3
menu/cbs/menu_cbs_right.c
View File

@ -550,12 +550,13 @@ static int playlist_association_right(unsigned type, const char *label,
static int playlist_label_display_mode_right(unsigned type, const char *label,
bool wraparound)
{
enum playlist_label_display_mode label_display_mode;
playlist_t *playlist = playlist_get_cached();
if (!playlist)
return -1;
enum playlist_label_display_mode label_display_mode = playlist_get_label_display_mode(playlist);
label_display_mode = playlist_get_label_display_mode(playlist);
if (label_display_mode != LABEL_DISPLAY_MODE_KEEP_REGION_AND_DISC_INDEX)
label_display_mode = (enum playlist_label_display_mode)((int)label_display_mode + 1);

3
menu/menu_displaylist.c
View File

@ -850,6 +850,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
size_t list_size = playlist_size(playlist);
settings_t *settings = config_get_ptr();
bool show_inline_core_name = false;
void (*sanitization)(char*, size_t);
label_spacer[0] = '\0';
@ -906,8 +907,6 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
/* Preallocate the file list */
file_list_reserve(info->list, list_size);
void (*sanitization)(char*, size_t);
switch (playlist_get_label_display_mode(playlist))
{
case LABEL_DISPLAY_MODE_REMOVE_PARENTHESES :

2
playlist.c
View File

@ -1222,10 +1222,10 @@ void playlist_write_file(playlist_t *playlist)
else
#endif
{
char label_display_mode[4] = {0};
JSONContext context = {0};
context.writer = JSON_Writer_Create(NULL);
context.file = file;
char label_display_mode[4] = {0};
if (!context.writer)
{