Changeset 1646
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/log.cpp
r1513 r1646 14 14 15 15 #include <cstdio> 16 17 #ifdef WIN32 18 # define WIN32_LEAN_AND_MEAN 19 # include <windows.h> 20 #endif 16 21 17 22 #if defined __ANDROID__ … … 37 42 __android_log_vprint(ANDROID_LOG_DEBUG, "LOL", fmt, ap); 38 43 #else 39 fprintf(stderr, "DEBUG: "); 40 vfprintf(stderr, fmt, ap); 44 Helper("DEBUG: ", fmt, ap); 41 45 #endif 42 46 va_end(ap); … … 50 54 __android_log_vprint(ANDROID_LOG_INFO, "LOL", fmt, ap); 51 55 #else 52 fprintf(stderr, "INFO: "); 53 vfprintf(stderr, fmt, ap); 56 Helper("INFO: ", fmt, ap); 54 57 #endif 55 58 va_end(ap); … … 63 66 __android_log_vprint(ANDROID_LOG_WARN, "LOL", fmt, ap); 64 67 #else 65 fprintf(stderr, "WARN: "); 66 vfprintf(stderr, fmt, ap); 68 Helper("WARN: ", fmt, ap); 67 69 #endif 68 70 va_end(ap); … … 76 78 __android_log_vprint(ANDROID_LOG_ERROR, "LOL", fmt, ap); 77 79 #else 78 fprintf(stderr, "ERROR: "); 79 vfprintf(stderr, fmt, ap); 80 Helper("ERROR: ", fmt, ap); 80 81 #endif 81 82 va_end(ap); 82 83 } 83 84 85 /* 86 * Private helper function 87 */ 88 89 void Log::Helper(char const *prefix, char const *fmt, va_list ap) 90 { 91 #if defined _WIN32 92 char buf[4096]; 93 vsnprintf(buf, 4095, fmt, ap); 94 buf[4095] = '\0'; 95 OutputDebugString(prefix); 96 OutputDebugString(buf); 97 #else 98 fprintf(stderr, "%s", prefix); 99 vfprintf(stderr, fmt, ap); 100 #endif 101 } 102 84 103 } /* namespace lol */ 85 104 -
trunk/src/log.h
r905 r1646 19 19 20 20 #include <stdint.h> 21 #include <cstdarg> 21 22 22 23 namespace lol … … 36 37 static void Error(char const *format, ...) LOL_FMT_ATTR(1, 2); 37 38 #undef LOL_FMT_ATTR 39 40 private: 41 static void Helper(char const *prefix, char const *format, va_list ap); 38 42 }; 39 43
Note: See TracChangeset
for help on using the changeset viewer.