mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 04:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

verbosity.c - cleanups

Browse Source
This commit is contained in:
twinaphex 2016-06-27 07:52:48 +02:00
parent fd5d19eaab
commit 5a77baf185
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
file_path_special.h
View File

@ -25,6 +25,7 @@
enum file_path_enum
{
FILE_PATH_UNKNOWN = 0,
FILE_PATH_PROGRAM_NAME,
FILE_PATH_CONTENT_HISTORY,
FILE_PATH_BACKGROUND_IMAGE,
FILE_PATH_TTF_FONT,

6
file_path_str.c
View File

@ -19,6 +19,12 @@ const char *file_path_str(enum file_path_enum enum_idx)
{
switch (enum_idx)
{
case FILE_PATH_PROGRAM_NAME:
#if defined(IS_SALAMANDER)
return "RetroArch Salamander";
#else
return "RetroArch";
#endif
case FILE_PATH_CORE_INFO_EXTENSION:
return ".info";
case FILE_PATH_RTC_EXTENSION:

38
verbosity.c
View File

@ -32,22 +32,7 @@
#include <string/stdstring.h>
#if defined(HAVE_FILE_LOGGER)
#define LOG_FILE (retro_main_log_file())
#else
#define LOG_FILE (stderr)
#endif
#if defined(IS_SALAMANDER)
#define PROGRAM_NAME "RetroArch Salamander"
#elif defined(RARCH_INTERNAL)
#define PROGRAM_NAME "RetroArch"
#elif defined(MARCH_INTERNAL)
#define PROGRAM_NAME "MicroArch"
#else
#define PROGRAM_NAME "N/A"
#endif
#include "file_path_special.h"
#include "verbosity.h"
/* If this is non-NULL. RARCH_LOG and friends
@ -128,7 +113,7 @@ static aslclient asl_client;
/* FIXME: Using arbitrary string as fmt argument is unsafe. */
char msg_new[1024], buffer[1024];
snprintf(msg_new, sizeof(msg_new), "%s: %s %s",
PROGRAM_NAME,
file_path_str(FILE_PATH_PROGRAM_NAME),
tag ? tag : "",
fmt);
wvsprintf(buffer, msg_new, ap);
@ -142,11 +127,22 @@ static aslclient asl_client;
else if (string_is_equal("[ERROR]", tag))
prio = ANDROID_LOG_ERROR;
}
__android_log_vprint(prio, PROGRAM_NAME, fmt, ap);
__android_log_vprint(prio,
file_path_str(FILE_PATH_PROGRAM_NAME),
fmt,
ap);
#elif defined(HAVE_FILE_LOGGER)
fprintf(retro_main_log_file(), "%s %s :: ",
file_path_str(FILE_PATH_PROGRAM_NAME),
tag ? tag : "[INFO]");
vfprintf(retro_main_log_file(), fmt, ap);
fflush(retro_main_log_file());
#else
fprintf(LOG_FILE, "%s %s :: ", PROGRAM_NAME, tag ? tag : "[INFO]");
vfprintf(LOG_FILE, fmt, ap);
fflush(LOG_FILE);
fprintf(stderr, "%s %s :: ",
file_path_str(FILE_PATH_PROGRAM_NAME),
tag ? tag : "[INFO]");
vfprintf(stderr, fmt, ap);
fflush(stderr);
#endif
}