Create more file_path_str enums

This commit is contained in:
twinaphex 2016-06-28 08:42:50 +02:00
parent 342bcebc59
commit 97fd53cd5f
3 changed files with 17 additions and 8 deletions

View File

@ -26,6 +26,9 @@ enum file_path_enum
{
FILE_PATH_UNKNOWN = 0,
FILE_PATH_PROGRAM_NAME,
FILE_PATH_LOG_WARN,
FILE_PATH_LOG_ERROR,
FILE_PATH_LOG_INFO,
FILE_PATH_CONTENT_HISTORY,
FILE_PATH_BACKGROUND_IMAGE,
FILE_PATH_TTF_FONT,

View File

@ -25,6 +25,12 @@ const char *file_path_str(enum file_path_enum enum_idx)
#else
return "RetroArch";
#endif
case FILE_PATH_LOG_WARN:
return "[WARN]";
case FILE_PATH_LOG_ERROR:
return "[ERROR]";
case FILE_PATH_LOG_INFO:
return "[INFO]";
case FILE_PATH_CORE_INFO_EXTENSION:
return ".info";
case FILE_PATH_CONFIG_EXTENSION:

View File

@ -122,9 +122,9 @@ static aslclient asl_client;
int prio = ANDROID_LOG_INFO;
if (tag)
{
if (string_is_equal("[WARN]", tag))
if (string_is_equal(file_path_str(FILE_PATH_LOG_WARN), tag))
prio = ANDROID_LOG_WARN;
else if (string_is_equal("[ERROR]", tag))
else if (string_is_equal(file_path_str(FILE_PATH_LOG_ERROR), tag))
prio = ANDROID_LOG_ERROR;
}
__android_log_vprint(prio,
@ -134,13 +134,13 @@ static aslclient asl_client;
#elif defined(HAVE_FILE_LOGGER)
fprintf(retro_main_log_file(), "%s %s :: ",
file_path_str(FILE_PATH_PROGRAM_NAME),
tag ? tag : "[INFO]");
tag ? tag : file_path_str(FILE_PATH_LOG_INFO));
vfprintf(retro_main_log_file(), fmt, ap);
fflush(retro_main_log_file());
#else
fprintf(stderr, "%s %s :: ",
file_path_str(FILE_PATH_PROGRAM_NAME),
tag ? tag : "[INFO]");
tag ? tag : file_path_str(FILE_PATH_LOG_INFO));
vfprintf(stderr, fmt, ap);
fflush(stderr);
#endif
@ -154,7 +154,7 @@ void RARCH_LOG(const char *fmt, ...)
return;
va_start(ap, fmt);
RARCH_LOG_V("[INFO]", fmt, ap);
RARCH_LOG_V(file_path_str(FILE_PATH_LOG_INFO), fmt, ap);
va_end(ap);
}
@ -167,7 +167,7 @@ void RARCH_LOG_OUTPUT(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
RARCH_LOG_OUTPUT_V("[INFO]", msg, ap);
RARCH_LOG_OUTPUT_V(file_path_str(FILE_PATH_LOG_INFO), msg, ap);
va_end(ap);
}
@ -180,7 +180,7 @@ void RARCH_WARN(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
RARCH_WARN_V("[WARN]", fmt, ap);
RARCH_WARN_V(file_path_str(FILE_PATH_LOG_WARN), fmt, ap);
va_end(ap);
}
@ -193,7 +193,7 @@ void RARCH_ERR(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
RARCH_ERR_V("[ERROR]", fmt, ap);
RARCH_ERR_V(file_path_str(FILE_PATH_LOG_ERROR), fmt, ap);
va_end(ap);
}
#endif