Simplify retroarch_logger.h

Makefile.ps3.salamander

@@ -18,7 +18,7 @@ endif
 
 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 
-PPU_CFLAGS		+= -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC -DRARCH_INTERNAL
+PPU_CFLAGS		+= -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
 PPU_SRCS		= frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c libretro-sdk/file/file_path.c libretro-sdk/file/dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c libretro-sdk/file/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)

logger/salamander_logger_override.h

@@ -1,77 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __SALAMANDER_LOGGER_H
-#define __SALAMANDER_LOGGER_H
-
-#include <stdarg.h>
-
-#define LOG_FILE (stderr)
-
-#ifndef RARCH_LOG
-#define RARCH_LOG(...) do { \
-      fprintf(LOG_FILE, "RetroArch Salamander: " __VA_ARGS__); \
-      fflush(LOG_FILE); \
-   } while (0)
-#endif
-
-#ifndef RARCH_LOG_V
-#define RARCH_LOG_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "RetroArch Salamander: " tag); \
-      vfprintf(LOG_FILE, fmt, vp); \
-      fflush(LOG_FILE); \
-   } while(0)
-#endif
-
-#ifndef RARCH_LOG_OUTPUT
-#define RARCH_LOG_OUTPUT(...) RARCH_LOG(__VA_ARGS__)
-#endif
-
-#ifndef RARCH_LOG_OUTPUT_V
-#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) RARCH_LOG_V(tag, fmt, vp)
-#endif
-
-#ifndef RARCH_ERR
-#define RARCH_ERR(...) do { \
-      fprintf(LOG_FILE, "RetroArch Salamander [ERROR] :: " __VA_ARGS__); \
-      fflush(LOG_FILE); \
-   } while (0)
-#endif
-
-#ifndef RARCH_ERR_V
-#define RARCH_ERR_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "RetroArch Salamander [ERROR] :: " tag); \
-      vfprintf(LOG_FILE, fmt, vp); \
-      fflush(LOG_FILE); \
-   } while (0)
-#endif
-
-#ifndef RARCH_WARN
-#define RARCH_WARN(...) do { \
-      fprintf(LOG_FILE, "RetroArch Salamander [WARN] :: " __VA_ARGS__); \
-      fflush(LOG_FILE); \
-   } while (0)
-#endif
-
-#ifndef RARCH_WARN_V
-#define RARCH_WARN_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "RetroArch Salamander [WARN] :: " tag); \
-      vfprintf(LOG_FILE, fmt, vp); \
-      fflush(LOG_FILE); \
-   } while (0)
-#endif
-
-#endif

retroarch_logger.h

@@ -20,38 +20,42 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#if defined(RARCH_DUMMY_LOG)
+#if defined(HAVE_FILE_LOGGER) && defined(RARCH_INTERNAL)
-#define LOG_FILE (stderr)
-#elif defined(HAVE_FILE_LOGGER) && defined(RARCH_INTERNAL)
 #define LOG_FILE (g_extern.log_file)
 #else
 #define LOG_FILE (stderr)
 #endif
 
-#if defined(RARCH_CONSOLE) && defined(HAVE_LOGGER)
+#if defined(IS_SALAMANDER)
+#define PROGRAM_NAME "RetroArch Salamander"
+#elif defined(RARCH_INTERNAL)
+#define PROGRAM_NAME "RetroArch"
+#else
+#define PROGRAM_NAME "N/A"
+#endif
+
+#if defined(RARCH_INTERNAL)
+#define RARCH_LOG_VERBOSE g_extern.verbosity
+#else
+#define RARCH_LOG_VERBOSE (true)
+#endif
+
+#if defined(RARCH_CONSOLE) && defined(HAVE_LOGGER) && defined(RARCH_INTERNAL)
 #include <logger_override.h>
-#elif defined(IOS)
+#elif defined(IOS) && defined(RARCH_INTERNAL)
 #include "logger/ios_logger_override.h"
-#elif defined(_XBOX1)
+#elif defined(_XBOX1) && defined(RARCH_INTERNAL)
 #include "logger/xdk1_logger_override.h"
-#elif defined(IS_SALAMANDER)
+#elif defined(ANDROID) && defined(HAVE_LOGGER) && defined(RARCH_INTERNAL)
-#include "logger/salamander_logger_override.h"
-#elif defined(ANDROID) && defined(HAVE_LOGGER)
 #include "logger/android_logger_override.h"
 #else
 
-#if defined(RARCH_DUMMY_LOG) || !defined(RARCH_INTERNAL)
-#define RARCH_LOG_VERBOSE (true)
-#else
-#define RARCH_LOG_VERBOSE g_extern.verbosity
-#endif
-
 #ifndef RARCH_LOG
 #undef RARCH_LOG_V
 #define RARCH_LOG(...) do { \
       if (RARCH_LOG_VERBOSE) \
       { \
-         fprintf(LOG_FILE, "RetroArch: %s: ", __FUNCTION__); \
+         fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
          fprintf(LOG_FILE, __VA_ARGS__); \
          fflush(LOG_FILE); \
       } \
@@ -59,7 +63,7 @@
 #define RARCH_LOG_V(tag, fmt, vp) do { \
       if (RARCH_LOG_VERBOSE) \
       { \
-         fprintf(LOG_FILE, "RetroArch: %s: ", __FUNCTION__); \
+         fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
          fprintf(LOG_FILE, tag);\
          vfprintf(LOG_FILE, fmt, vp); \
          fflush(LOG_FILE); \
@@ -75,7 +79,7 @@
       fflush(LOG_FILE); \
    } while (0)
 #define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "RetroArch: %s: ", __FUNCTION__); \
+      fprintf(LOG_FILE, "%s: %s: ", PROGRAM_NAME, __FUNCTION__); \
       fprintf(LOG_FILE, tag); \
       vfprintf(LOG_FILE, fmt, vp); \
       fflush(LOG_FILE); \
@@ -85,12 +89,12 @@
 #ifndef RARCH_ERR
 #undef RARCH_ERR_V
 #define RARCH_ERR(...) do { \
-      fprintf(LOG_FILE, "RetroArch [ERROR] :: %s :: ", __FUNCTION__); \
+      fprintf(LOG_FILE, "%s [ERROR] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
       fprintf(LOG_FILE, __VA_ARGS__); \
       fflush(LOG_FILE); \
    } while (0)
 #define RARCH_ERR_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "RetroArch [ERROR] :: %s :: ", __FUNCTION__); \
+      fprintf(LOG_FILE, "%s [ERROR] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
       fprintf(LOG_FILE, tag); \
       vfprintf(LOG_FILE, fmt, vp); \
       fflush(LOG_FILE); \
@@ -100,12 +104,12 @@
 #ifndef RARCH_WARN
 #undef RARCH_WARN_V
 #define RARCH_WARN(...) do { \
-      fprintf(LOG_FILE, "RetroArch [WARN] :: %s :: ", __FUNCTION__); \
+      fprintf(LOG_FILE, "%s [WARN] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
       fprintf(LOG_FILE, __VA_ARGS__); \
       fflush(LOG_FILE); \
    } while (0)
 #define RARCH_WARN_V(tag, fmt, vp) do { \
-      fprintf(LOG_FILE, "RetroArch [WARN] :: %s :: ", __FUNCTION__); \
+      fprintf(LOG_FILE, "%s [WARN] :: %s :: ", PROGRAM_NAME, __FUNCTION__); \
       fprintf(LOG_FILE, tag); \
       vfprintf(LOG_FILE, fmt, vp); \
       fflush(LOG_FILE); \
@@ -113,5 +117,6 @@
 #endif
 
 #endif
+
 #endif