mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 00:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix C89_BUILD error and several style nits

Browse Source
This commit is contained in:
twinaphex 2020-05-24 17:41:27 +02:00
parent 8ce192de82
commit 93e8edf2f9
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
file_path_special.c
View File

@ -168,10 +168,11 @@ void fill_pathname_application_special(char *s,
break; break;
case APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG: case APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG:
{ {
char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
s1[0] = '\0';
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
char *s1 = (char*)malloc(
PATH_MAX_LENGTH * sizeof(char));
const char *dir_assets = settings->paths.directory_assets; const char *dir_assets = settings->paths.directory_assets;
s1[0] = '\0';
fill_pathname_join(s1, dir_assets, "pkg", PATH_MAX_LENGTH * sizeof(char)); fill_pathname_join(s1, dir_assets, "pkg", PATH_MAX_LENGTH * sizeof(char));
strlcpy(s, s1, len); strlcpy(s, s1, len);
free(s1); free(s1);
@ -339,30 +340,31 @@ void fill_pathname_application_special(char *s,
s1[0] = '\0'; s1[0] = '\0';
switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)) { switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE))
{
case RETRO_LANGUAGE_ARABIC: case RETRO_LANGUAGE_ARABIC:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(s, s1, "fallback-font.ttf", len); fill_pathname_join(s, s1, "fallback-font.ttf", len);
break; break;
case RETRO_LANGUAGE_CHINESE_SIMPLIFIED: case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
case RETRO_LANGUAGE_CHINESE_TRADITIONAL: case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(s, s1, "chinese-fallback-font.ttf", len); fill_pathname_join(s, s1, "chinese-fallback-font.ttf", len);
break; break;
case RETRO_LANGUAGE_KOREAN: case RETRO_LANGUAGE_KOREAN:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(s, s1, "korean-fallback-font.ttf", len); fill_pathname_join(s, s1, "korean-fallback-font.ttf", len);
break; break;
default: default:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI); APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI);
fill_pathname_join(s, s1, "font.ttf", len); fill_pathname_join(s, s1, "font.ttf", len);
} }
@ -384,30 +386,31 @@ void fill_pathname_application_special(char *s,
s1[0] = '\0'; s1[0] = '\0';
switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)) { switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE))
{
case RETRO_LANGUAGE_ARABIC: case RETRO_LANGUAGE_ARABIC:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(s, s1, "fallback-font.ttf", len); fill_pathname_join(s, s1, "fallback-font.ttf", len);
break; break;
case RETRO_LANGUAGE_CHINESE_SIMPLIFIED: case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
case RETRO_LANGUAGE_CHINESE_TRADITIONAL: case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(s, s1, "chinese-fallback-font.ttf", len); fill_pathname_join(s, s1, "chinese-fallback-font.ttf", len);
break; break;
case RETRO_LANGUAGE_KOREAN: case RETRO_LANGUAGE_KOREAN:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(s, s1, "korean-fallback-font.ttf", len); fill_pathname_join(s, s1, "korean-fallback-font.ttf", len);
break; break;
default: default:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB); APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB);
fill_pathname_join(s, s1, "font.ttf", len); fill_pathname_join(s, s1, "font.ttf", len);
} }
free(s1); free(s1);

39
menu/drivers/ozone/ozone.c
View File

@ -576,11 +576,12 @@ static void ozone_cache_footer_labels(ozone_handle_t *ozone)
/* Determines the size of all menu elements */ /* Determines the size of all menu elements */
static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded) static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded)
{ {
float scale_factor;
bool font_inited;
char font_path[PATH_MAX_LENGTH]; char font_path[PATH_MAX_LENGTH];
float scale_factor = 0.0f;
bool font_inited = false;
char *s1 = NULL;
font_path[0] = '\0'; font_path[0] = '\0';
if (!ozone) if (!ozone)
return; return;
@ -636,26 +637,27 @@ static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded)
ozone->pointer_active_delta = CURSOR_ACTIVE_DELTA * scale_factor; ozone->pointer_active_delta = CURSOR_ACTIVE_DELTA * scale_factor;
/* Initialise fonts */ /* Initialise fonts */
char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
s1[0] = '\0'; s1[0] = '\0';
switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)) { switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE))
{
case RETRO_LANGUAGE_ARABIC: case RETRO_LANGUAGE_ARABIC:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(font_path, s1, "fallback-font.ttf", sizeof(font_path)); fill_pathname_join(font_path, s1, "fallback-font.ttf", sizeof(font_path));
break; break;
case RETRO_LANGUAGE_CHINESE_SIMPLIFIED: case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
case RETRO_LANGUAGE_CHINESE_TRADITIONAL: case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(font_path, s1, "chinese-fallback-font.ttf", sizeof(font_path)); fill_pathname_join(font_path, s1, "chinese-fallback-font.ttf", sizeof(font_path));
break; break;
case RETRO_LANGUAGE_KOREAN: case RETRO_LANGUAGE_KOREAN:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(font_path, s1, "korean-fallback-font.ttf", sizeof(font_path)); fill_pathname_join(font_path, s1, "korean-fallback-font.ttf", sizeof(font_path));
break; break;
default: default:
@ -666,24 +668,25 @@ static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded)
is_threaded, font_path, FONT_SIZE_TITLE * scale_factor); is_threaded, font_path, FONT_SIZE_TITLE * scale_factor);
ozone->has_all_assets = ozone->has_all_assets && font_inited; ozone->has_all_assets = ozone->has_all_assets && font_inited;
switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)) { switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE))
{
case RETRO_LANGUAGE_ARABIC: case RETRO_LANGUAGE_ARABIC:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(font_path, s1, "fallback-font.ttf", sizeof(font_path)); fill_pathname_join(font_path, s1, "fallback-font.ttf", sizeof(font_path));
break; break;
case RETRO_LANGUAGE_CHINESE_SIMPLIFIED: case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
case RETRO_LANGUAGE_CHINESE_TRADITIONAL: case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(font_path, s1, "chinese-fallback-font.ttf", sizeof(font_path)); fill_pathname_join(font_path, s1, "chinese-fallback-font.ttf", sizeof(font_path));
break; break;
case RETRO_LANGUAGE_KOREAN: case RETRO_LANGUAGE_KOREAN:
fill_pathname_application_special(s1, fill_pathname_application_special(s1,
PATH_MAX_LENGTH * sizeof(char), PATH_MAX_LENGTH * sizeof(char),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG); APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
fill_pathname_join(font_path, s1, "korean-fallback-font.ttf", sizeof(font_path)); fill_pathname_join(font_path, s1, "korean-fallback-font.ttf", sizeof(font_path));
break; break;
default: default: