mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

(verbosity.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-08-15 12:43:59 +02:00
parent df8a024b82
commit 498c1b8538
1 changed files with 49 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
verbosity.c
View File

@ -184,83 +184,73 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
asl_free(msg); asl_free(msg);
#endif #endif
#elif defined(_XBOX1) #elif defined(_XBOX1)
{ /* FIXME: Using arbitrary string as fmt argument is unsafe. */
/* FIXME: Using arbitrary string as fmt argument is unsafe. */ char msg_new[256];
char msg_new[256]; char buffer[256];
char buffer[256];
msg_new[0] = buffer[0] = '\0'; msg_new[0] = buffer[0] = '\0';
snprintf(msg_new, sizeof(msg_new), "%s: %s %s", snprintf(msg_new, sizeof(msg_new), "%s: %s %s",
file_path_str(FILE_PATH_PROGRAM_NAME), file_path_str(FILE_PATH_PROGRAM_NAME),
tag ? tag : "", tag ? tag : "",
fmt); fmt);
wvsprintf(buffer, msg_new, ap); wvsprintf(buffer, msg_new, ap);
OutputDebugStringA(buffer); OutputDebugStringA(buffer);
}
#elif defined(ANDROID) #elif defined(ANDROID)
int prio = ANDROID_LOG_INFO;
if (tag)
{ {
int prio = ANDROID_LOG_INFO; if (string_is_equal(file_path_str(FILE_PATH_LOG_WARN), tag))
if (tag) prio = ANDROID_LOG_WARN;
{ else if (string_is_equal(file_path_str(FILE_PATH_LOG_ERROR), tag))
if (string_is_equal(file_path_str(FILE_PATH_LOG_WARN), tag)) prio = ANDROID_LOG_ERROR;
prio = ANDROID_LOG_WARN;
else if (string_is_equal(file_path_str(FILE_PATH_LOG_ERROR), tag))
prio = ANDROID_LOG_ERROR;
}
if (log_file_initialized)
{
vfprintf(log_file_fp, fmt, ap);
fflush(log_file_fp);
}
else
__android_log_vprint(prio,
file_path_str(FILE_PATH_PROGRAM_NAME),
fmt,
ap);
} }
#else
if (log_file_initialized)
{ {
vfprintf(log_file_fp, fmt, ap);
fflush(log_file_fp);
}
else
__android_log_vprint(prio,
file_path_str(FILE_PATH_PROGRAM_NAME),
fmt,
ap);
#else
FILE *fp = (FILE*)log_file_fp;
#if defined(HAVE_QT) || defined(__WINRT__) #if defined(HAVE_QT) || defined(__WINRT__)
char buffer[256]; char buffer[256];
#endif buffer[0] = '\0';
FILE *fp = (FILE*)retro_main_log_file(); vsnprintf(buffer, sizeof(buffer), fmt, ap);
#if defined(HAVE_QT) || defined(__WINRT__) if (fp)
buffer[0] = '\0'; {
vsnprintf(buffer, sizeof(buffer), fmt, ap); fprintf(fp, "%s %s", tag ? tag : file_path_str(FILE_PATH_LOG_INFO), buffer);
fflush(fp);
if (fp) }
{
fprintf(fp, "%s %s", tag ? tag : file_path_str(FILE_PATH_LOG_INFO), buffer);
fflush(fp);
}
#if defined(HAVE_QT) #if defined(HAVE_QT)
ui_companion_driver_log_msg(buffer); ui_companion_driver_log_msg(buffer);
#endif #endif
#if defined(__WINRT__) #if defined(__WINRT__)
OutputDebugStringA(buffer); OutputDebugStringA(buffer);
#endif #endif
#else #else
#if defined(HAVE_LIBNX) #if defined(HAVE_LIBNX)
mutexLock(&logging_mtx); mutexLock(&logging_mtx);
#endif #endif
if (fp) if (fp)
{ {
fprintf(fp, "%s ", fprintf(fp, "%s ",
tag ? tag : file_path_str(FILE_PATH_LOG_INFO)); tag ? tag : file_path_str(FILE_PATH_LOG_INFO));
vfprintf(fp, fmt, ap); vfprintf(fp, fmt, ap);
fflush(fp); fflush(fp);
} }
#if defined(HAVE_LIBNX) #if defined(HAVE_LIBNX)
mutexUnlock(&logging_mtx); mutexUnlock(&logging_mtx);
#endif #endif
#endif #endif
}
#endif #endif
} }
@ -301,7 +291,7 @@ void RARCH_LOG(const char *fmt, ...)
{ {
va_list ap; va_list ap;
if (!verbosity_is_enabled()) if (!main_verbosity)
return; return;
va_start(ap, fmt); va_start(ap, fmt);
@ -321,7 +311,7 @@ void RARCH_WARN(const char *fmt, ...)
{ {
va_list ap; va_list ap;
if (!verbosity_is_enabled()) if (!main_verbosity)
return; return;
va_start(ap, fmt); va_start(ap, fmt);
@ -333,7 +323,7 @@ void RARCH_ERR(const char *fmt, ...)
{ {
va_list ap; va_list ap;
if (!verbosity_is_enabled()) if (!main_verbosity)
return; return;
va_start(ap, fmt); va_start(ap, fmt);