diff options
author | mannol <eniz_vukovic@hotmail.com> | 2015-01-17 18:25:47 +0100 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2015-01-17 18:25:47 +0100 |
commit | e29df66db6497141d28c3e6548faa935c9dbad91 (patch) | |
tree | 1799058c7fcef1fcdf1f2c5b20cba268a6db522d | |
parent | 0fff7d999404ec6e68dad2b4cbc283e34c198087 (diff) |
fix_logger-v.0.2
-rw-r--r-- | toxcore/logger.c | 18 | ||||
-rw-r--r-- | toxcore/logger.h | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/toxcore/logger.c b/toxcore/logger.c index 2c6cf345..b51ef2b9 100644 --- a/toxcore/logger.c +++ b/toxcore/logger.c | |||
@@ -55,9 +55,9 @@ typedef struct logger { | |||
55 | 55 | ||
56 | /* For thread synchronisation */ | 56 | /* For thread synchronisation */ |
57 | pthread_mutex_t mutex[1]; | 57 | pthread_mutex_t mutex[1]; |
58 | } logger; | 58 | } Logger; |
59 | 59 | ||
60 | logger *global = NULL; | 60 | Logger *global = NULL; |
61 | 61 | ||
62 | const char *LOG_LEVEL_STR [] = { | 62 | const char *LOG_LEVEL_STR [] = { |
63 | [LOG_TRACE] = "TRACE", | 63 | [LOG_TRACE] = "TRACE", |
@@ -83,13 +83,13 @@ char *strtime(char *dest, size_t max_len) | |||
83 | /** | 83 | /** |
84 | * Public Functions | 84 | * Public Functions |
85 | */ | 85 | */ |
86 | logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id) | 86 | Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id) |
87 | { | 87 | { |
88 | #ifndef LOGGING /* Disabled */ | 88 | #ifndef LOGGING /* Disabled */ |
89 | return NULL; | 89 | return NULL; |
90 | #endif | 90 | #endif |
91 | 91 | ||
92 | logger *retu = calloc(1, sizeof(logger)); | 92 | Logger *retu = calloc(1, sizeof(Logger)); |
93 | 93 | ||
94 | if (!retu) | 94 | if (!retu) |
95 | return NULL; | 95 | return NULL; |
@@ -143,7 +143,7 @@ FAILURE: | |||
143 | return NULL; | 143 | return NULL; |
144 | } | 144 | } |
145 | 145 | ||
146 | void logger_kill(logger *log) | 146 | void logger_kill(Logger *log) |
147 | { | 147 | { |
148 | #ifndef LOGGING /* Disabled */ | 148 | #ifndef LOGGING /* Disabled */ |
149 | return; | 149 | return; |
@@ -173,7 +173,7 @@ void logger_kill_global(void) | |||
173 | global = NULL; | 173 | global = NULL; |
174 | } | 174 | } |
175 | 175 | ||
176 | void logger_set_global(logger *log) | 176 | void logger_set_global(Logger *log) |
177 | { | 177 | { |
178 | #ifndef LOGGING /* Disabled */ | 178 | #ifndef LOGGING /* Disabled */ |
179 | return; | 179 | return; |
@@ -182,7 +182,7 @@ void logger_set_global(logger *log) | |||
182 | global = log; | 182 | global = log; |
183 | } | 183 | } |
184 | 184 | ||
185 | logger *logger_get_global(void) | 185 | Logger *logger_get_global(void) |
186 | { | 186 | { |
187 | #ifndef LOGGING /* Disabled */ | 187 | #ifndef LOGGING /* Disabled */ |
188 | return NULL; | 188 | return NULL; |
@@ -191,7 +191,7 @@ logger *logger_get_global(void) | |||
191 | return global; | 191 | return global; |
192 | } | 192 | } |
193 | 193 | ||
194 | void logger_write (logger *log, LOG_LEVEL level, const char *file, int line, const char *format, ...) | 194 | void logger_write (Logger *log, LOG_LEVEL level, const char *file, int line, const char *format, ...) |
195 | { | 195 | { |
196 | #ifndef LOGGING /* Disabled */ | 196 | #ifndef LOGGING /* Disabled */ |
197 | return; | 197 | return; |
@@ -207,7 +207,7 @@ void logger_write (logger *log, LOG_LEVEL level, const char *file, int line, con | |||
207 | "\n"; /* Every new print new line */ | 207 | "\n"; /* Every new print new line */ |
208 | 208 | ||
209 | 209 | ||
210 | logger *this_log = log ? log : global; | 210 | Logger *this_log = log ? log : global; |
211 | 211 | ||
212 | if (!this_log) | 212 | if (!this_log) |
213 | return; | 213 | return; |
diff --git a/toxcore/logger.h b/toxcore/logger.h index 6f1f6075..0513b32c 100644 --- a/toxcore/logger.h +++ b/toxcore/logger.h | |||
@@ -43,26 +43,26 @@ typedef enum { | |||
43 | LOG_ERROR | 43 | LOG_ERROR |
44 | } LOG_LEVEL; | 44 | } LOG_LEVEL; |
45 | 45 | ||
46 | typedef struct logger logger; | 46 | typedef struct logger Logger; |
47 | 47 | ||
48 | /** | 48 | /** |
49 | * Set 'level' as the lowest printable level. If id == NULL, random number is used. | 49 | * Set 'level' as the lowest printable level. If id == NULL, random number is used. |
50 | */ | 50 | */ |
51 | logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id); | 51 | Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id); |
52 | 52 | ||
53 | void logger_kill (logger *log); | 53 | void logger_kill (Logger *log); |
54 | void logger_kill_global (void); | 54 | void logger_kill_global (void); |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * Global logger setter and getter. | 57 | * Global logger setter and getter. |
58 | */ | 58 | */ |
59 | void logger_set_global (logger *log); | 59 | void logger_set_global (Logger *log); |
60 | logger *logger_get_global (void); | 60 | Logger *logger_get_global (void); |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * Main write function. If logging disabled does nothing. If log == NULL uses global logger. | 63 | * Main write function. If logging disabled does nothing. If log == NULL uses global logger. |
64 | */ | 64 | */ |
65 | void logger_write (logger *log, LOG_LEVEL level, const char *file, int line, const char *format, ...); | 65 | void logger_write (Logger *log, LOG_LEVEL level, const char *file, int line, const char *format, ...); |
66 | 66 | ||
67 | 67 | ||
68 | /* To do some checks or similar only when logging, use this */ | 68 | /* To do some checks or similar only when logging, use this */ |