verbosity.c - cleanups - no longer need file_path_str

file_path_special.h

@@ -31,13 +31,9 @@ enum file_path_enum
 {
    FILE_PATH_UNKNOWN = 0,
    FILE_PATH_CONTENT_BASENAME,
-   FILE_PATH_PROGRAM_NAME,
    FILE_PATH_DETECT,
    FILE_PATH_NUL,
    FILE_PATH_LUTRO_PLAYLIST,
-   FILE_PATH_LOG_WARN,
-   FILE_PATH_LOG_ERROR,
-   FILE_PATH_LOG_INFO,
    FILE_PATH_CONTENT_HISTORY,
    FILE_PATH_CONTENT_FAVORITES,
    FILE_PATH_CONTENT_MUSIC_HISTORY,

file_path_str.c

@@ -25,13 +25,6 @@ const char *file_path_str(enum file_path_enum enum_idx)
 
    switch (enum_idx)
    {
-      case FILE_PATH_PROGRAM_NAME:
-#if defined(IS_SALAMANDER)
-         str = "RetroArch Salamander";
-#else
-         str = "RetroArch";
-#endif
-         break;
       case FILE_PATH_DETECT:
          str = "DETECT";
          break;
@@ -44,15 +37,6 @@ const char *file_path_str(enum file_path_enum enum_idx)
       case FILE_PATH_NUL:
          str = "nul";
          break;
-      case FILE_PATH_LOG_WARN:
-         str = "[WARN]";
-         break;
-      case FILE_PATH_LOG_ERROR:
-         str = "[ERROR]";
-         break;
-      case FILE_PATH_LOG_INFO:
-         str = "[INFO]";
-         break;
       case FILE_PATH_CGP_EXTENSION:
          str = ".cgp";
          break;

verbosity.c

@@ -55,7 +55,6 @@
 #include "frontend/frontend_driver.h"
 #endif
 
-#include "file_path_special.h"
 #include "verbosity.h"
 
 #ifdef HAVE_QT
@@ -68,6 +67,15 @@
 #define DEFAULT_FRONTEND_LOG_LEVEL 1
 #endif
 
+#define FILE_PATH_LOG_INFO  "[INFO]"
+#define FILE_PATH_LOG_ERROR "[ERROR]"
+#define FILE_PATH_LOG_WARN  "[WARN]"
+#if defined(IS_SALAMANDER)
+#define FILE_PATH_PROGRAM_NAME "RetroArch Salamander"
+#else
+#define FILE_PATH_PROGRAM_NAME "RetroArch"
+#endif
+
 /* If this is non-NULL. RARCH_LOG and friends
  * will write to this file. */
 static FILE *log_file_fp            = NULL;
@@ -174,8 +182,11 @@ void retro_main_log_file_deinit(void)
 #if !defined(HAVE_LOGGER)
 void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
 {
-   if (verbosity_log_level <= 1)
+   if (verbosity_log_level > 1)
+      return;
+
    {
+      const char *tag_v = tag ? tag : FILE_PATH_LOG_INFO;
 #if TARGET_OS_IPHONE
 #if TARGET_IPHONE_SIMULATOR
       vprintf(fmt, ap);
@@ -185,7 +196,7 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
       if (!asl_initialized)
       {
          asl_client      = asl_open(
-               file_path_str(FILE_PATH_PROGRAM_NAME),
+               FILE_PATH_PROGRAM_NAME,
                "com.apple.console",
                ASL_OPT_STDERR | ASL_OPT_NO_DELAY);
          asl_initialized = 1;
@@ -204,18 +215,16 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
 
       msg_new[0] = buffer[0] = '\0';
       snprintf(msg_new, sizeof(msg_new), "%s: %s %s",
-            file_path_str(FILE_PATH_PROGRAM_NAME),
-            tag ? tag : "",
-            fmt);
+            FILE_PATH_PROGRAM_NAME, tag_v, fmt);
       wvsprintf(buffer, msg_new, ap);
       OutputDebugStringA(buffer);
 #elif defined(ANDROID)
       int prio = ANDROID_LOG_INFO;
       if (tag)
       {
-         if (string_is_equal(file_path_str(FILE_PATH_LOG_WARN), tag))
+         if (string_is_equal(FILE_PATH_LOG_WARN, tag))
             prio = ANDROID_LOG_WARN;
-         else if (string_is_equal(file_path_str(FILE_PATH_LOG_ERROR), tag))
+         else if (string_is_equal(FILE_PATH_LOG_ERROR, tag))
             prio = ANDROID_LOG_ERROR;
       }
 
@@ -225,10 +234,7 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
          fflush(log_file_fp);
       }
       else
-         __android_log_vprint(prio,
-               file_path_str(FILE_PATH_PROGRAM_NAME),
-               fmt,
-               ap);
+         __android_log_vprint(prio, FILE_PATH_PROGRAM_NAME, fmt, ap);
 #else
       FILE *fp = (FILE*)log_file_fp;
 #if defined(HAVE_QT) || defined(__WINRT__)
@@ -254,7 +260,7 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
 
       if (fp)
       {
-         fprintf(fp, "%s %s", tag ? tag : file_path_str(FILE_PATH_LOG_INFO), buffer);
+         fprintf(fp, "%s %s", tag_v, buffer);
          fflush(fp);
       }
 
@@ -271,8 +277,7 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
 #endif
       if (fp)
       {
-         fprintf(fp, "%s ",
-               tag ? tag : file_path_str(FILE_PATH_LOG_INFO));
+         fprintf(fp, "%s ", tag_v);
          vfprintf(fp, fmt, ap);
          fflush(fp);
       }
@@ -331,7 +336,7 @@ void RARCH_LOG(const char *fmt, ...)
       return;
 
    va_start(ap, fmt);
-   RARCH_LOG_V(file_path_str(FILE_PATH_LOG_INFO), fmt, ap);
+   RARCH_LOG_V(FILE_PATH_LOG_INFO, fmt, ap);
    va_end(ap);
 }
 
@@ -339,7 +344,7 @@ void RARCH_LOG_OUTPUT(const char *msg, ...)
 {
    va_list ap;
    va_start(ap, msg);
-   RARCH_LOG_OUTPUT_V(file_path_str(FILE_PATH_LOG_INFO), msg, ap);
+   RARCH_LOG_OUTPUT_V(FILE_PATH_LOG_INFO, msg, ap);
    va_end(ap);
 }
 
@@ -353,7 +358,7 @@ void RARCH_WARN(const char *fmt, ...)
       return;
 
    va_start(ap, fmt);
-   RARCH_WARN_V(file_path_str(FILE_PATH_LOG_WARN), fmt, ap);
+   RARCH_WARN_V(FILE_PATH_LOG_WARN, fmt, ap);
    va_end(ap);
 }
 
@@ -365,7 +370,7 @@ void RARCH_ERR(const char *fmt, ...)
       return;
 
    va_start(ap, fmt);
-   RARCH_ERR_V(file_path_str(FILE_PATH_LOG_ERROR), fmt, ap);
+   RARCH_ERR_V(FILE_PATH_LOG_ERROR, fmt, ap);
    va_end(ap);
 }
 #endif