From 97fd53cd5f70b2286498f9cb671e3e866c9d549a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 28 Jun 2016 08:42:50 +0200
Subject: [PATCH] Create more file_path_str enums

---
 file_path_special.h |  3 +++
 file_path_str.c     |  6 ++++++
 verbosity.c         | 16 ++++++++--------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/file_path_special.h b/file_path_special.h
index d5518e7cd1..095e51af9d 100644
--- a/file_path_special.h
+++ b/file_path_special.h
@@ -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,
diff --git a/file_path_str.c b/file_path_str.c
index e54760b8da..5ad726b6f9 100644
--- a/file_path_str.c
+++ b/file_path_str.c
@@ -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:
diff --git a/verbosity.c b/verbosity.c
index 093c7ab719..9d95786182 100644
--- a/verbosity.c
+++ b/verbosity.c
@@ -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