Changeset 1646Tweet

Timestamp:

Jul 18, 2012, 6:41:23 PM (9 years ago)

Author:

sam

Message:

core: on Windows, output log messages to the Visual Studio debug window
if appropriate.

Location:

trunk/src

Files:

• log.cpp (modified) (5 diffs)
• log.h (modified) (2 diffs)

trunk/src/log.cpp

@@ -14 +14 @@
 
 #include <cstdio>
+
+#ifdef WIN32
+#   define WIN32_LEAN_AND_MEAN
+#   include <windows.h>
+#endif
 
 #if defined __ANDROID__
@@ -37 +42 @@
     __android_log_vprint(ANDROID_LOG_DEBUG, "LOL", fmt, ap);
 #else
-    fprintf(stderr, "DEBUG: ");
-    vfprintf(stderr, fmt, ap);
+    Helper("DEBUG: ", fmt, ap);
 #endif
     va_end(ap);
@@ -50 +54 @@
     __android_log_vprint(ANDROID_LOG_INFO, "LOL", fmt, ap);
 #else
-    fprintf(stderr, "INFO: ");
-    vfprintf(stderr, fmt, ap);
+    Helper("INFO: ", fmt, ap);
 #endif
     va_end(ap);
@@ -63 +66 @@
     __android_log_vprint(ANDROID_LOG_WARN, "LOL", fmt, ap);
 #else
-    fprintf(stderr, "WARN: ");
-    vfprintf(stderr, fmt, ap);
+    Helper("WARN: ", fmt, ap);
 #endif
     va_end(ap);
@@ -76 +78 @@
     __android_log_vprint(ANDROID_LOG_ERROR, "LOL", fmt, ap);
 #else
-    fprintf(stderr, "ERROR: ");
-    vfprintf(stderr, fmt, ap);
+    Helper("ERROR: ", fmt, ap);
 #endif
     va_end(ap);
 }
 
+/*
+ * Private helper function
+ */
+
+void Log::Helper(char const *prefix, char const *fmt, va_list ap)
+{
+#if defined _WIN32
+    char buf[4096];
+    vsnprintf(buf, 4095, fmt, ap);
+    buf[4095] = '\0';
+    OutputDebugString(prefix);
+    OutputDebugString(buf);
+#else
+    fprintf(stderr, "%s", prefix);
+    vfprintf(stderr, fmt, ap);
+#endif
+}
+
 } /* namespace lol */
 

trunk/src/log.h

@@ -19 +19 @@
 
 #include <stdint.h>
+#include <cstdarg>
 
 namespace lol
@@ -36 +37 @@
     static void Error(char const *format, ...) LOL_FMT_ATTR(1, 2);
 #undef LOL_FMT_ATTR
+
+private:
+    static void Helper(char const *prefix, char const *format, va_list ap);
 };