6 files changed, 86 insertions, 84 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 42fdcc32..919655a2 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -330,11 +330,11 @@ static int client_or_ip_port_in_list(Client_data *list, uint16_t length, const u
             if (ip_port.ip.family == AF_INET) {
 
                 LOGGER_SCOPE( if (!ipport_equal(&list[i].assoc4.ip_port, &ip_port)) {
-                    LOGGER_TRACE("coipil[%u]: switching ipv4 from %s:%u to %s:%u", i,
-                            ip_ntoa(&list[i].assoc4.ip_port.ip), ntohs(list[i].assoc4.ip_port.port),
-                            ip_ntoa(&ip_port.ip), ntohs(ip_port.port));
-                    }
-                );
+                LOGGER_TRACE("coipil[%u]: switching ipv4 from %s:%u to %s:%u", i,
+                             ip_ntoa(&list[i].assoc4.ip_port.ip), ntohs(list[i].assoc4.ip_port.port),
+                             ip_ntoa(&ip_port.ip), ntohs(ip_port.port));
+                }
+                            );
 
                 if (LAN_ip(list[i].assoc4.ip_port.ip) != 0 && LAN_ip(ip_port.ip) == 0)
                     return 1;
@@ -344,11 +344,11 @@ static int client_or_ip_port_in_list(Client_data *list, uint16_t length, const u
             } else if (ip_port.ip.family == AF_INET6) {
 
                 LOGGER_SCOPE( if (!ipport_equal(&list[i].assoc4.ip_port, &ip_port)) {
-                    LOGGER_TRACE("coipil[%u]: switching ipv6 from %s:%u to %s:%u", i,
-                            ip_ntoa(&list[i].assoc6.ip_port.ip), ntohs(list[i].assoc6.ip_port.port),
-                            ip_ntoa(&ip_port.ip), ntohs(ip_port.port));
-                    }
-                );
+                LOGGER_TRACE("coipil[%u]: switching ipv6 from %s:%u to %s:%u", i,
+                             ip_ntoa(&list[i].assoc6.ip_port.ip), ntohs(list[i].assoc6.ip_port.port),
+                             ip_ntoa(&ip_port.ip), ntohs(ip_port.port));
+                }
+                            );
 
                 if (LAN_ip(list[i].assoc6.ip_port.ip) != 0 && LAN_ip(ip_port.ip) == 0)
                     return 1;
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 5c487916..c310412d 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2425,8 +2425,8 @@ void do_messenger(Messenger *m)
                         last_pinged = 999;
 
                     LOGGER_TRACE("C[%2u] %s:%u [%3u] %s",
-                                client, ip_ntoa(&assoc->ip_port.ip), ntohs(assoc->ip_port.port),
-                                last_pinged, ID2String(cptr->client_id));
+                                 client, ip_ntoa(&assoc->ip_port.ip), ntohs(assoc->ip_port.port),
+                                 last_pinged, ID2String(cptr->client_id));
                 }
         }
 
@@ -2479,8 +2479,8 @@ void do_messenger(Messenger *m)
                     ping_lastrecv = 999;
 
                 LOGGER_TRACE("F[%2u:%2u] <%s> [%03u] %s",
-                            dht2m[friend], friend, msgfptr->name,
-                            ping_lastrecv, ID2String(msgfptr->client_id));
+                             dht2m[friend], friend, msgfptr->name,
+                             ping_lastrecv, ID2String(msgfptr->client_id));
             } else {
                 LOGGER_TRACE("F[--:%2u] %s", friend, ID2String(dhtfptr->client_id));
             }
@@ -2498,9 +2498,9 @@ void do_messenger(Messenger *m)
                             last_pinged = 999;
 
                         LOGGER_TRACE("F[%2u] => C[%2u] %s:%u [%3u] %s",
-                                    friend, client, ip_ntoa(&assoc->ip_port.ip),
-                                    ntohs(assoc->ip_port.port), last_pinged,
-                                    ID2String(cptr->client_id));
+                                     friend, client, ip_ntoa(&assoc->ip_port.ip),
+                                     ntohs(assoc->ip_port.port), last_pinged,
+                                     ID2String(cptr->client_id));
                     }
             }
         }
diff --git a/toxcore/assoc.c b/toxcore/assoc.c
index 658c0eb4..3dbeba51 100644
--- a/toxcore/assoc.c
+++ b/toxcore/assoc.c
@@ -1014,19 +1014,19 @@ void Assoc_status(const Assoc *assoc)
                 total++;
 
                 LOGGER_TRACE("[%3i:%3i] %08x => [%s...] %i, %i(%c), %i(%c)\n",
-                            (int)bid, (int)cid, entry->hash, idpart2str(entry->client.client_id, 8),
-                            entry->used_at ? (int)(unix_time() - entry->used_at) : 0,
-                            entry->seen_at ? (int)(unix_time() - entry->seen_at) : 0,
-                            entry->seen_at ? (entry->seen_family == AF_INET ? '4' : (entry->seen_family == AF_INET6 ? '6' : '?')) : '?',
-                            entry->heard_at ? (int)(unix_time() - entry->heard_at) : 0,
-                            entry->heard_at ? (entry->heard_family == AF_INET ? '4' : (entry->heard_family == AF_INET6 ? '6' : '?')) : '?');
+                             (int)bid, (int)cid, entry->hash, idpart2str(entry->client.client_id, 8),
+                             entry->used_at ? (int)(unix_time() - entry->used_at) : 0,
+                             entry->seen_at ? (int)(unix_time() - entry->seen_at) : 0,
+                             entry->seen_at ? (entry->seen_family == AF_INET ? '4' : (entry->seen_family == AF_INET6 ? '6' : '?')) : '?',
+                             entry->heard_at ? (int)(unix_time() - entry->heard_at) : 0,
+                             entry->heard_at ? (entry->heard_family == AF_INET ? '4' : (entry->heard_family == AF_INET6 ? '6' : '?')) : '?');
             }
         }
     }
 
     if (total) {
         LOGGER_TRACE("Total: %i entries, table usage %i%%.\n", (int)total,
-                    (int)(total * 100 / (assoc->candidates_bucket_count * assoc->candidates_bucket_size)));
+                     (int)(total * 100 / (assoc->candidates_bucket_count * assoc->candidates_bucket_size)));
     }
 }
 
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
+}
diff --git a/toxcore/logger.h b/toxcore/logger.h
index 312ed3c4..6f1f6075 100644
--- a/toxcore/logger.h
+++ b/toxcore/logger.h
@@ -48,21 +48,21 @@ typedef struct logger logger;
 /**
  * Set 'level' as the lowest printable level. If id == NULL, random number is used.
  */
-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);
 
-void logger_kill (logger* log);
+void logger_kill (logger *log);
 void logger_kill_global (void);
 
 /**
  * Global logger setter and getter.
  */
-void logger_set_global (logger* log);
-logger* logger_get_global (void);
+void logger_set_global (logger *log);
+logger *logger_get_global (void);
 
 /**
  * Main write function. If logging disabled does nothing. If log == NULL uses global logger.
  */
-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, ...);
 
 
 /* To do some checks or similar only when logging, use this */
@@ -90,4 +90,4 @@ void logger_write (logger* log, LOG_LEVEL level, const char* file, int line, con
 #define LOGGER_ERROR(format, ...) LOGGER_ERROR_(NULL, format, ##__VA_ARGS__)
 
 
-#endif /* TOXLOGGER_H */
\ No newline at end of file
+#endif /* TOXLOGGER_H */
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 89a8742a..a4a73838 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -1013,8 +1013,8 @@ uint32_t tox_do_interval(Tox *tox)
 Tox *tox_new(Tox_Options *options)
 {
     logger_set_global(logger_new(LOGGER_OUTPUT_FILE, LOGGER_LEVEL, "toxcore"));
-    
-    
+
+
     Messenger_Options m_options = {0};
 
     if (options == NULL) {