1 files changed, 54 insertions, 52 deletions

diff --git a/toxcore/logger.c b/toxcore/logger.c
index 21ff81c6..fa9d1760 100644
--- a/toxcore/logger.c
+++ b/toxcore/logger.c
@@ -46,20 +46,20 @@ typedef struct logger {
     FILE *log_file;
     LOG_LEVEL level;
     uint64_t start_time; /* Time when lib loaded */
-    char* id;
-    
+    char *id;
+
     /* Allocate these once */
-    char* tstr;
-    char* posstr;
-    char* msg;
-    
+    char *tstr;
+    char *posstr;
+    char *msg;
+
     /* For thread synchronisation */
     pthread_mutex_t mutex[1];
 } logger;
 
-logger* global = NULL;
+logger *global = NULL;
 
-const char* LOG_LEVEL_STR [] = {
+const char *LOG_LEVEL_STR [] = {
     [LOG_TRACE]   = "TRACE",
     [LOG_DEBUG]   = "DEBUG",
     [LOG_INFO]    = "INFO" ,
@@ -67,14 +67,14 @@ const char* LOG_LEVEL_STR [] = {
     [LOG_ERROR]   = "ERROR",
 };
 
-char* strtime(char* dest, size_t max_len)
+char *strtime(char *dest, size_t max_len)
 {
     time_t timer;
     struct tm *tm_info;
-    
+
     time(&timer);
     tm_info = localtime(&timer);
-    
+
     strftime(dest, max_len, "%m:%d %H:%M:%S", tm_info);
     return dest;
 }
@@ -83,22 +83,22 @@ char* strtime(char* dest, size_t max_len)
 /**
  * Public Functions
  */
-logger* logger_new (const char *file_name, LOG_LEVEL level, const char* id)
+logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id)
 {
 #ifndef LOGGING /* Disabled */
     return NULL;
 #endif
-    
-    logger* retu = calloc(1, sizeof(logger));
-    
+
+    logger *retu = calloc(1, sizeof(logger));
+
     if (!retu)
         return NULL;
-    
+
     if ( pthread_mutex_init(retu->mutex, NULL) != 0 ) {
         free(retu);
         return NULL;
     }
-    
+
     if (!(retu->log_file = fopen(file_name, "ab"))) {
         fprintf(stderr, "Error opening logger file: %s; info: %s\n", file_name, strerror(errno));
         free(retu);
@@ -107,30 +107,30 @@ logger* logger_new (const char *file_name, LOG_LEVEL level, const char* id)
     }
 
     if (!(retu->tstr = calloc(16, sizeof (char))) ||
-        !(retu->posstr = calloc(300, sizeof (char))) ||
-        !(retu->msg = calloc(4096, sizeof (char))) ) 
+            !(retu->posstr = calloc(300, sizeof (char))) ||
+            !(retu->msg = calloc(4096, sizeof (char))) )
         goto ERROR;
-    
+
     if (id) {
         if (!(retu->id = calloc(strlen(id) + 1, 1)))
             goto ERROR;
-        
+
         strcpy(retu->id, id);
     } else {
         if (!(retu->id = malloc(8)))
             goto ERROR;
-        
+
         snprintf(retu->id, 8, "%u", random_int());
     }
-    
+
     retu->level = level;
     retu->start_time = current_time_monotonic();
-    
+
     fprintf(retu->log_file, "Successfully created and running logger id: %s; time: %s\n",
             retu->id, strtime(retu->tstr, 16));
-    
+
     return retu;
-    
+
 ERROR:
     fprintf(stderr, "Failed to create logger!\n");
     pthread_mutex_destroy(retu->mutex);
@@ -143,25 +143,27 @@ ERROR:
     return NULL;
 }
 
-void logger_kill(logger* log)
+void logger_kill(logger *log)
 {
 #ifndef LOGGING /* Disabled */
     return;
 #endif
-    
+
     if (!log)
         return;
-    
+
     pthread_mutex_lock(log->mutex);
     free(log->id);
     free(log->tstr);
     free(log->posstr);
-    free(log->msg);    
+    free(log->msg);
+
     if (fclose(log->log_file) != 0 )
         perror("Could not close log file");
+
     pthread_mutex_unlock(log->mutex);
     pthread_mutex_destroy(log->mutex);
-    
+
     free(log);
 }
 
@@ -170,31 +172,31 @@ void logger_kill_global(void)
     logger_kill(global);
 }
 
-void logger_set_global(logger* log)
+void logger_set_global(logger *log)
 {
-    #ifndef LOGGING /* Disabled */
+#ifndef LOGGING /* Disabled */
     return;
-    #endif
-    
+#endif
+
     global = log;
 }
 
-logger* logger_get_global(void)
+logger *logger_get_global(void)
 {
-    #ifndef LOGGING /* Disabled */
+#ifndef LOGGING /* Disabled */
     return NULL;
-    #endif
-    
+#endif
+
     return global;
 }
 
-void logger_write (logger* log, LOG_LEVEL level, const char* file, int line, const char *format, ...)
+void logger_write (logger *log, LOG_LEVEL level, const char *file, int line, const char *format, ...)
 {
 #ifndef LOGGING /* Disabled */
     return;
 #endif
-    
-    static const char* logger_format = 
+
+    static const char *logger_format =
         "%s  "   /* Logger id string */
         "%-16s"  /* Time string of format: %m:%d %H:%M:%S */
         "%u  "   /* Thread id */
@@ -202,23 +204,23 @@ void logger_write (logger* log, LOG_LEVEL level, const char* file, int line, con
         "%-20s " /* File:line string */
         "- %s"   /* Output message */
         "\n";    /* Every new print new line */
-    
-    
-    logger* this_log = log ? log: global;
-    
+
+
+    logger *this_log = log ? log : global;
+
     if (!this_log)
         return;
 
     /* Don't print levels lesser than set one */
     if (this_log->level > level)
         return;
-    
+
     pthread_mutex_lock(this_log->mutex);
-    
+
     /* Set position str */
     snprintf(this_log->posstr, 300, "%s:%d", SFILE(file), line);
-    
-     /* Set message */
+
+    /* Set message */
     va_list args;
     va_start (args, format);
     vsnprintf(this_log->msg, 4096, format, args);
@@ -227,6 +229,6 @@ void logger_write (logger* log, LOG_LEVEL level, const char* file, int line, con
     fprintf(this_log->log_file, logger_format, this_log->id, strtime(this_log->tstr, 16), pthread_self(),
             LOG_LEVEL_STR[level], this_log->posstr, this_log->msg);
     fflush(this_log->log_file);
-    
+
     pthread_mutex_unlock(this_log->mutex);
-}
\ No newline at end of file
+}