diff options
Diffstat (limited to 'toxcore/logger.c')
-rw-r--r-- | toxcore/logger.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/toxcore/logger.c b/toxcore/logger.c index e8aef7e0..f19f76b1 100644 --- a/toxcore/logger.c +++ b/toxcore/logger.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | 46 | ||
47 | struct logger { | 47 | struct Logger { |
48 | FILE *log_file; | 48 | FILE *log_file; |
49 | LOG_LEVEL level; | 49 | LOG_LEVEL level; |
50 | uint64_t start_time; /* Time when lib loaded */ | 50 | uint64_t start_time; /* Time when lib loaded */ |
@@ -87,7 +87,7 @@ char *strtime(char *dest, size_t max_len) | |||
87 | */ | 87 | */ |
88 | Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id) | 88 | Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id) |
89 | { | 89 | { |
90 | #ifndef LOGGING /* Disabled */ | 90 | #ifndef TOX_LOGGER /* Disabled */ |
91 | return NULL; | 91 | return NULL; |
92 | #endif | 92 | #endif |
93 | 93 | ||
@@ -96,7 +96,7 @@ Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id) | |||
96 | if (!retu) | 96 | if (!retu) |
97 | return NULL; | 97 | return NULL; |
98 | 98 | ||
99 | if ( pthread_mutex_init(retu->mutex, NULL) != 0 ) { | 99 | if (pthread_mutex_init(retu->mutex, NULL) != 0) { |
100 | free(retu); | 100 | free(retu); |
101 | return NULL; | 101 | return NULL; |
102 | } | 102 | } |
@@ -110,7 +110,7 @@ Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id) | |||
110 | 110 | ||
111 | if (!(retu->tstr = calloc(16, sizeof (char))) || | 111 | if (!(retu->tstr = calloc(16, sizeof (char))) || |
112 | !(retu->posstr = calloc(300, sizeof (char))) || | 112 | !(retu->posstr = calloc(300, sizeof (char))) || |
113 | !(retu->msg = calloc(4096, sizeof (char))) ) | 113 | !(retu->msg = calloc(4096, sizeof (char)))) |
114 | goto FAILURE; | 114 | goto FAILURE; |
115 | 115 | ||
116 | if (id) { | 116 | if (id) { |
@@ -147,7 +147,7 @@ FAILURE: | |||
147 | 147 | ||
148 | void logger_kill(Logger *log) | 148 | void logger_kill(Logger *log) |
149 | { | 149 | { |
150 | #ifndef LOGGING /* Disabled */ | 150 | #ifndef TOX_LOGGER /* Disabled */ |
151 | return; | 151 | return; |
152 | #endif | 152 | #endif |
153 | 153 | ||
@@ -160,7 +160,7 @@ void logger_kill(Logger *log) | |||
160 | free(log->posstr); | 160 | free(log->posstr); |
161 | free(log->msg); | 161 | free(log->msg); |
162 | 162 | ||
163 | if (fclose(log->log_file) != 0 ) | 163 | if (fclose(log->log_file) != 0) |
164 | perror("Could not close log file"); | 164 | perror("Could not close log file"); |
165 | 165 | ||
166 | pthread_mutex_unlock(log->mutex); | 166 | pthread_mutex_unlock(log->mutex); |
@@ -177,7 +177,7 @@ void logger_kill_global(void) | |||
177 | 177 | ||
178 | void logger_set_global(Logger *log) | 178 | void logger_set_global(Logger *log) |
179 | { | 179 | { |
180 | #ifndef LOGGING /* Disabled */ | 180 | #ifndef TOX_LOGGER /* Disabled */ |
181 | return; | 181 | return; |
182 | #endif | 182 | #endif |
183 | 183 | ||
@@ -186,7 +186,7 @@ void logger_set_global(Logger *log) | |||
186 | 186 | ||
187 | Logger *logger_get_global(void) | 187 | Logger *logger_get_global(void) |
188 | { | 188 | { |
189 | #ifndef LOGGING /* Disabled */ | 189 | #ifndef TOX_LOGGER /* Disabled */ |
190 | return NULL; | 190 | return NULL; |
191 | #endif | 191 | #endif |
192 | 192 | ||
@@ -195,17 +195,17 @@ Logger *logger_get_global(void) | |||
195 | 195 | ||
196 | void logger_write (Logger *log, LOG_LEVEL level, const char *file, int line, const char *format, ...) | 196 | void logger_write (Logger *log, LOG_LEVEL level, const char *file, int line, const char *format, ...) |
197 | { | 197 | { |
198 | #ifndef LOGGING /* Disabled */ | 198 | #ifndef TOX_LOGGER /* Disabled */ |
199 | return; | 199 | return; |
200 | #endif | 200 | #endif |
201 | 201 | ||
202 | static const char *logger_format = | 202 | static const char *logger_format = |
203 | "%s " /* Logger id string */ | 203 | "%s " /* Logger id string */ |
204 | "%-16s" /* Time string of format: %m:%d %H:%M:%S */ | 204 | "%-16s" /* Time string of format: %m:%d %H:%M:%S */ |
205 | "%u " /* Thread id */ | 205 | "%-12u " /* Thread id */ |
206 | "%-5s " /* Logger lever string */ | 206 | "%-5s " /* Logger lever string */ |
207 | "%-20s " /* File:line string */ | 207 | "%-20s " /* File:line string */ |
208 | "- %s" /* Output message */ | 208 | "- %s" /* Output message */ |
209 | WIN_CR "\n"; /* Every new print new line */ | 209 | WIN_CR "\n"; /* Every new print new line */ |
210 | 210 | ||
211 | 211 | ||