Merge pull request #5150 from RobLoach/log-clean

Clean up the log output
This commit is contained in:
Twinaphex 2017-07-05 06:02:46 +02:00 committed by GitHub
commit 633cadcde7
3 changed files with 33 additions and 34 deletions

View File

@ -1033,7 +1033,7 @@ static void retroarch_parse_input(int argc, char *argv[])
} }
#ifdef HAVE_GIT_VERSION #ifdef HAVE_GIT_VERSION
RARCH_LOG("This is RetroArch version %s (Git %s)\n", RARCH_LOG("RetroArch %s (Git %s)\n",
PACKAGE_VERSION, retroarch_git_version); PACKAGE_VERSION, retroarch_git_version);
#endif #endif

View File

@ -168,8 +168,7 @@ static aslclient asl_client;
#else #else
fp = stderr; fp = stderr;
#endif #endif
fprintf(fp, "%s %s :: ", fprintf(fp, "%s ",
file_path_str(FILE_PATH_PROGRAM_NAME),
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);

View File

@ -60,67 +60,67 @@ void logger_send_v(const char *__format, va_list args);
} while (0) } while (0)
#define RARCH_LOG_OUTPUT(...) do { \ #define RARCH_LOG_OUTPUT(...) do { \
logger_send("RetroArch Salamander [OUTPUT] :: " __VA_ARGS__); \ logger_send("[OUTPUT] " __VA_ARGS__); \
} while(0) } while(0)
#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \ #define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
logger_send("RetroArch Salamander [OUTPUT] :: " tag); \ logger_send("[OUTPUT] " tag); \
logger_send_v(fmt, vp); \ logger_send_v(fmt, vp); \
} while (0) } while (0)
#define RARCH_ERR(...) do { \ #define RARCH_ERR(...) do { \
logger_send("RetroArch Salamander [ERROR] :: " __VA_ARGS__); \ logger_send("[ERROR] " __VA_ARGS__); \
} while(0) } while(0)
#define RARCH_ERR_V(tag, fmt, vp) do { \ #define RARCH_ERR_V(tag, fmt, vp) do { \
logger_send("RetroArch Salamander [ERROR] :: " tag); \ logger_send("[ERROR] " tag); \
logger_send_v(fmt, vp); \ logger_send_v(fmt, vp); \
} while (0) } while (0)
#define RARCH_WARN(...) do { \ #define RARCH_WARN(...) do { \
logger_send("RetroArch Salamander [WARN] :: " __VA_ARGS__); \ logger_send("[WARN] " __VA_ARGS__); \
} while(0) } while(0)
#define RARCH_WARN_V(tag, fmt, vp) do { \ #define RARCH_WARN_V(tag, fmt, vp) do { \
logger_send("RetroArch Salamander [WARN] :: " tag); \ logger_send("[WARN] " tag); \
logger_send_v(fmt, vp); \ logger_send_v(fmt, vp); \
} while (0) } while (0)
#else #else
#define RARCH_LOG(...) do { \ #define RARCH_LOG(...) do { \
logger_send("RetroArch: " __VA_ARGS__); \ logger_send("" __VA_ARGS__); \
} while(0) } while(0)
#define RARCH_LOG_V(tag, fmt, vp) do { \ #define RARCH_LOG_V(tag, fmt, vp) do { \
logger_send("RetroArch: " tag); \ logger_send("" tag); \
logger_send_v(fmt, vp); \ logger_send_v(fmt, vp); \
} while (0) } while (0)
#define RARCH_ERR(...) do { \ #define RARCH_ERR(...) do { \
logger_send("RetroArch [ERROR] :: " __VA_ARGS__); \ logger_send("[ERROR] " __VA_ARGS__); \
} while(0) } while(0)
#define RARCH_ERR_V(tag, fmt, vp) do { \ #define RARCH_ERR_V(tag, fmt, vp) do { \
logger_send("RetroArch [ERROR] :: " tag); \ logger_send("[ERROR] " tag); \
logger_send_v(fmt, vp); \ logger_send_v(fmt, vp); \
} while (0) } while (0)
#define RARCH_WARN(...) do { \ #define RARCH_WARN(...) do { \
logger_send("RetroArch [WARN] :: " __VA_ARGS__); \ logger_send("[WARN] " __VA_ARGS__); \
} while(0) } while(0)
#define RARCH_WARN_V(tag, fmt, vp) do { \ #define RARCH_WARN_V(tag, fmt, vp) do { \
logger_send("RetroArch [WARN] :: " tag); \ logger_send("[WARN] :: " tag); \
logger_send_v(fmt, vp); \ logger_send_v(fmt, vp); \
} while (0) } while (0)
#define RARCH_LOG_OUTPUT(...) do { \ #define RARCH_LOG_OUTPUT(...) do { \
logger_send("RetroArch [OUTPUT] :: " __VA_ARGS__); \ logger_send("[OUTPUT] " __VA_ARGS__); \
} while(0) } while(0)
#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \ #define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
logger_send("RetroArch [OUTPUT] :: " tag); \ logger_send("[OUTPUT] " tag); \
logger_send_v(fmt, vp); \ logger_send_v(fmt, vp); \
} while (0) } while (0)