Removal of remaining msg_hash_xx.c files (#15586)

Followup for PR#15218, remove the two remaining files and simplify
a few functions in msg_hash.c as a result.
This commit is contained in:
zoltanvb 2023-08-12 14:46:35 +02:00 committed by GitHub
parent 0c64a07cdb
commit b554d7e26c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 4295 deletions

View File

@ -449,9 +449,6 @@ endif
ifeq ($(HAVE_LANGEXTRA), 1)
DEFINES += -DHAVE_LANGEXTRA
DEF_FLAGS += -finput-charset=UTF-8
OBJ += intl/msg_hash_chs.o \
intl/msg_hash_pt_br.o
endif
ifneq ($(HAVE_GETOPT_LONG), 1)

View File

@ -1167,11 +1167,6 @@ RETROARCH
#include "../libretro-common/queues/task_queue.c"
#include "../msg_hash.c"
#ifdef HAVE_LANGEXTRA
#include "../intl/msg_hash_chs.c"
#include "../intl/msg_hash_pt_br.c"
#endif
#include "../intl/msg_hash_us.c"
/*============================================================

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -40,53 +40,6 @@ static unsigned uint_user_language;
int msg_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
{
int ret = -1;
#ifdef HAVE_LANGEXTRA
switch (uint_user_language)
{
case RETRO_LANGUAGE_PORTUGUESE_BRAZIL:
ret = msg_hash_get_help_pt_br_enum(msg, s, len);
break;
case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
ret = msg_hash_get_help_chs_enum(msg, s, len);
break;
case RETRO_LANGUAGE_PORTUGUESE_PORTUGAL:
case RETRO_LANGUAGE_JAPANESE:
case RETRO_LANGUAGE_KOREAN:
case RETRO_LANGUAGE_VIETNAMESE:
case RETRO_LANGUAGE_GREEK:
case RETRO_LANGUAGE_TURKISH:
case RETRO_LANGUAGE_CATALAN_VALENCIA:
case RETRO_LANGUAGE_UKRAINIAN:
case RETRO_LANGUAGE_SLOVAK:
case RETRO_LANGUAGE_PERSIAN:
case RETRO_LANGUAGE_ESPERANTO:
case RETRO_LANGUAGE_BRITISH_ENGLISH:
case RETRO_LANGUAGE_CATALAN:
case RETRO_LANGUAGE_CZECH:
case RETRO_LANGUAGE_HEBREW:
case RETRO_LANGUAGE_HUNGARIAN:
case RETRO_LANGUAGE_ARABIC:
case RETRO_LANGUAGE_ASTURIAN:
case RETRO_LANGUAGE_FINNISH:
case RETRO_LANGUAGE_INDONESIAN:
case RETRO_LANGUAGE_SWEDISH:
case RETRO_LANGUAGE_FRENCH:
case RETRO_LANGUAGE_GERMAN:
case RETRO_LANGUAGE_SPANISH:
case RETRO_LANGUAGE_ITALIAN:
case RETRO_LANGUAGE_DUTCH:
case RETRO_LANGUAGE_POLISH:
case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
default:
break;
}
#endif
if (ret == 0)
return ret;
return msg_hash_get_help_us_enum(msg, s, len);
}
@ -521,22 +474,30 @@ static const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
return "null";
}
static const char *msg_hash_get_wideglyph_str_cht(void)
static const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
{
return "";
switch (msg)
{
#include "intl/msg_hash_chs.h"
default:
break;
}
return "null";
}
static const char *msg_hash_get_wideglyph_str_jp(void)
static const char *msg_hash_to_str_pt_br(enum msg_hash_enums msg)
{
return "";
switch (msg)
{
#include "intl/msg_hash_pt_br.h"
default:
break;
}
return "null";
}
static const char *msg_hash_get_wideglyph_str_ko(void)
{
return "";
}
#endif
const char *msg_hash_to_str(enum msg_hash_enums msg)
@ -928,13 +889,13 @@ const char *msg_hash_get_wideglyph_str(void)
switch (uint_user_language)
{
case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
return msg_hash_get_wideglyph_str_chs();
return "";
case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
return msg_hash_get_wideglyph_str_cht();
return "";
case RETRO_LANGUAGE_JAPANESE:
return msg_hash_get_wideglyph_str_jp();
return "";
case RETRO_LANGUAGE_KOREAN:
return msg_hash_get_wideglyph_str_ko();
return "";
default:
break;
}

View File

@ -4044,12 +4044,6 @@ enum msg_hash_enums
const char *msg_hash_to_str(enum msg_hash_enums msg);
const char *msg_hash_to_str_pt_br(enum msg_hash_enums msg);
int msg_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len);
const char *msg_hash_to_str_chs(enum msg_hash_enums msg);
int msg_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len);
const char *msg_hash_to_str_us(enum msg_hash_enums msg);
int msg_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len);
@ -4087,7 +4081,6 @@ void msg_hash_set_uint(enum msg_hash_action type, unsigned val);
* be found by passing said pointer to the current font
* rendering implementation */
const char *msg_hash_get_wideglyph_str(void);
const char *msg_hash_get_wideglyph_str_chs(void);
uint32_t msg_hash_calculate(const char *s);