diff options
author | mannol <eniz_vukovic@hotmail.com> | 2014-05-24 16:02:01 +0200 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2014-05-24 16:02:01 +0200 |
commit | 565e95301f19884b3597404f41c06566cf5f9dc0 (patch) | |
tree | 162864fe2d4dabe70c10ad7a624f52d76abad56c /toxcore/logger.h | |
parent | 9db41e7582baf15d650376e8afc38dd6146492a8 (diff) |
Tests works and some fixes
Diffstat (limited to 'toxcore/logger.h')
-rw-r--r-- | toxcore/logger.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/toxcore/logger.h b/toxcore/logger.h index d8292f31..0b6367c5 100644 --- a/toxcore/logger.h +++ b/toxcore/logger.h | |||
@@ -45,7 +45,7 @@ int logger_init(const char* file_name, LoggerLevel level); | |||
45 | const char* logger_stringify_level(LoggerLevel level); | 45 | const char* logger_stringify_level(LoggerLevel level); |
46 | unsigned logger_get_pid(); | 46 | unsigned logger_get_pid(); |
47 | void logger_write (LoggerLevel level, const char* format, ...); | 47 | void logger_write (LoggerLevel level, const char* format, ...); |
48 | char* logger_timestr (char* dest); | 48 | char* logger_timestr (char* dest, size_t max_size); |
49 | 49 | ||
50 | #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) | 50 | #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) |
51 | #define _SFILE (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__) | 51 | #define _SFILE (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__) |
@@ -53,16 +53,16 @@ char* logger_timestr (char* dest); | |||
53 | #define _SFILE (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) | 53 | #define _SFILE (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) |
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | #define WRITE_FORMAT(__LEVEL__, format) char* the_str = calloc(sizeof(char), strlen(format)+ 500); sprintf(the_str, "\n[%u] [%s] [%s] [%s:%d %s()] %s", \ | 56 | #define WRITE_FORMAT(__LEVEL__, format) char __time__[20]; char* the_str = calloc(sizeof(char), strlen(format)+ 500); sprintf(the_str, "\n[%u] [%s] [%s] [%s:%d %s()] %s", \ |
57 | logger_get_pid(), logger_stringify_level(__LEVEL__), logger_timestr(__time__), _SFILE, __LINE__, __func__, format) | 57 | logger_get_pid(), logger_stringify_level(__LEVEL__), logger_timestr(__time__, 20), _SFILE, __LINE__, __func__, format) |
58 | 58 | ||
59 | /* Use these macros */ | 59 | /* Use these macros */ |
60 | 60 | ||
61 | #define LOGGER_INIT(name, level) logger_init(name, level); | 61 | #define LOGGER_INIT(name, level) logger_init(name, level); |
62 | #define LOGGER_INFO(format, ...) do { char __time__[20]; WRITE_FORMAT(INFO, format); logger_write( INFO, the_str, ##__VA_ARGS__ ); free(the_str); } while (0) | 62 | #define LOGGER_INFO(format, ...) do { WRITE_FORMAT(INFO, format); logger_write( INFO, the_str, ##__VA_ARGS__ ); free(the_str); } while (0) |
63 | #define LOGGER_DEBUG(format, ...) do { char __time__[20]; WRITE_FORMAT(DEBUG, format); logger_write( DEBUG, the_str, ##__VA_ARGS__ ); free(the_str); } while (0) | 63 | #define LOGGER_DEBUG(format, ...) do { WRITE_FORMAT(DEBUG, format); logger_write( DEBUG, the_str, ##__VA_ARGS__ ); free(the_str); } while (0) |
64 | #define LOGGER_WARNING(format, ...) do { char __time__[20]; WRITE_FORMAT(WARNING, format); logger_write( WARNING, the_str, ##__VA_ARGS__ ); free(the_str); } while (0) | 64 | #define LOGGER_WARNING(format, ...) do { WRITE_FORMAT(WARNING, format); logger_write( WARNING, the_str, ##__VA_ARGS__ ); free(the_str); } while (0) |
65 | #define LOGGER_ERROR(format, ...) do { char __time__[20]; WRITE_FORMAT(ERROR, format); logger_write( ERROR, the_str, ##__VA_ARGS__ ); free(the_str); } while (0) | 65 | #define LOGGER_ERROR(format, ...) do { WRITE_FORMAT(ERROR, format); logger_write( ERROR, the_str, ##__VA_ARGS__ ); free(the_str); } while (0) |
66 | 66 | ||
67 | /* To do some checks or similar only when logging use this */ | 67 | /* To do some checks or similar only when logging use this */ |
68 | #define LOGGER_SCOPE(__SCOPE_DO__) do { __SCOPE_DO__ } while(0) | 68 | #define LOGGER_SCOPE(__SCOPE_DO__) do { __SCOPE_DO__ } while(0) |