7 files changed, 65 insertions, 56 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index a9575fd5..8ab9157e 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -48,7 +48,7 @@
 
 #define PORT 33445
 
-void print_clientlist(DHT * dht)
+void print_clientlist(DHT *dht)
 {
     uint32_t i, j;
     IP_Port p_ip;
@@ -71,7 +71,7 @@ void print_clientlist(DHT * dht)
     }
 }
 
-void print_friendlist(DHT * dht)
+void print_friendlist(DHT *dht)
 {
     uint32_t i, j, k;
     IP_Port p_ip;
@@ -104,7 +104,7 @@ void print_friendlist(DHT * dht)
             printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
             printf("\nTimestamp: %llu", (long long unsigned int) dht->friends_list[k].client_list[i].timestamp);
             printf("\nLast pinged: %llu\n", (long long unsigned int) dht->friends_list[k].client_list[i].last_pinged);
-            p_ip =dht->friends_list[k].client_list[i].ret_ip_port;
+            p_ip = dht->friends_list[k].client_list[i].ret_ip_port;
             printf("ret IP: %u.%u.%u.%u:%u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
             printf("Timestamp: %llu\n", (long long unsigned int)dht->friends_list[k].client_list[i].ret_timestamp);
         }
@@ -134,9 +134,10 @@ int main(int argc, char *argv[])
     /* bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
-    
-    DHT * dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
+
+    DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
     init_cryptopackets(dht);
+
     if (argc < 4) {
         printf("usage %s ip port public_key\n", argv[0]);
         exit(0);
@@ -198,5 +199,6 @@ int main(int argc, char *argv[])
         print_friendlist(dht);
         c_sleep(300);
     }
+
     return 0;
 }
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index 0218de4f..09e9e0a3 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -124,25 +124,25 @@ void printconnection(int connection_id)
 /*run doLossless_UDP(); */
 //void Lossless_UDP()
 //{
-    /*    IP_Port ip_port;
-        uint8_t data[MAX_UDP_PACKET_SIZE];
-        uint32_t length;
-        while (receivepacket(&ip_port, data, &length) != -1) {
-        printf("packet with length: %u\n", length); */
-    /* if(rand() % 3 != 1)//add packet loss
-     { */
-    /*
-                if (LosslessUDP_handlepacket(data, length, ip_port))
-                    printpacket(data, length, ip_port);
-                else
-                printf("Received handled packet with length: %u\n", length); //printconnection(0); */
-
-    /* } */
-    /* }*/
-
-    //networking_poll();
-
-    //doLossless_UDP();
+/*    IP_Port ip_port;
+    uint8_t data[MAX_UDP_PACKET_SIZE];
+    uint32_t length;
+    while (receivepacket(&ip_port, data, &length) != -1) {
+    printf("packet with length: %u\n", length); */
+/* if(rand() % 3 != 1)//add packet loss
+ { */
+/*
+            if (LosslessUDP_handlepacket(data, length, ip_port))
+                printpacket(data, length, ip_port);
+            else
+            printf("Received handled packet with length: %u\n", length); //printconnection(0); */
+
+/* } */
+/* }*/
+
+//networking_poll();
+
+//doLossless_UDP();
 
 //}
 
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
     /* bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
-    Lossless_UDP * ludp = new_lossless_udp(new_networking(ip, PORT));
+    Lossless_UDP *ludp = new_lossless_udp(new_networking(ip, PORT));
     perror("Initialization");
     IP_Port serverip;
     serverip.ip.i = inet_addr(argv[1]);
@@ -203,6 +203,7 @@ int main(int argc, char *argv[])
         /* printconnection(connection); */
         networking_poll(ludp->net);
         do_lossless_udp(ludp);
+
         if (is_connected(ludp, connection) == 3) {
 
             if (write_packet(ludp, connection, buffer, read)) {
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index c3212888..a82b787a 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -124,20 +124,20 @@ void printconnection(int connection_id)
 //    uint8_t data[MAX_UDP_PACKET_SIZE];
 //    uint32_t length;
 //    while (receivepacket(&ip_port, data, &length) != -1) {
-    //if(rand() % 3 != 1)//add packet loss
-    //{
+//if(rand() % 3 != 1)//add packet loss
+//{
 //            if (LosslessUDP_handlepacket(data, length, ip_port)) {
 //                    printpacket(data, length, ip_port);
 //            } else {
-    //printconnection(0);
+//printconnection(0);
 //                 printf("Received handled packet with length: %u\n", length);
 //            }
-    //}
+//}
 //    }
 
-   // networking_poll();
+// networking_poll();
 
-    //doLossless_UDP();
+//doLossless_UDP();
 //}
 
 
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
     //bind to ip 0.0.0.0:PORT
     IP ip;
     ip.i = 0;
-    Lossless_UDP * ludp = new_lossless_udp(new_networking(ip, PORT));
+    Lossless_UDP *ludp = new_lossless_udp(new_networking(ip, PORT));
     perror("Initialization");
 
     int connection;
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index d3e68ec6..c7979843 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -123,7 +123,7 @@ static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint1
 
     status[len - 1] = '\0';
     fix_name(status);
-    
+
     wattron(ctx->history, COLOR_PAIR(3));
     wprintw(ctx->history, "* Your partner changed status to '%s'\n", status);
     wattroff(ctx->history, COLOR_PAIR(3));
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 6f6c9db4..e5525e94 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -93,7 +93,7 @@ static Messenger *init_tox()
 int init_connection(Messenger *m)
 {
     FILE *fp = NULL;
-    
+
     if (DHT_isconnected(m->dht))
         return 0;
 
@@ -297,7 +297,7 @@ int main(int argc, char *argv[])
             strcpy(DATA_FILE, user_config_dir);
             strcat(DATA_FILE, CONFIGDIR);
             strcat(DATA_FILE, "data");
-            
+
             SRVLIST_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("DHTservers") + 1);
             strcpy(SRVLIST_FILE, user_config_dir);
             strcat(SRVLIST_FILE, CONFIGDIR);
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 12f8a201..e194a90e 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -365,7 +365,9 @@ static void execute(ToxWindow *self, Messenger *m, char *u_cmd)
             cmd[i] = '\0';
 
             int j = i;
+
             while (++j < MAX_STR_SIZE && isspace(cmd[j]));
+
             i = j - 1;
 
             numargs++;
diff --git a/testing/toxic/windows.c b/testing/toxic/windows.c
index de924329..8fdf4e19 100644
--- a/testing/toxic/windows.c
+++ b/testing/toxic/windows.c
@@ -88,23 +88,25 @@ int add_window(Messenger *m, ToxWindow w)
 {
     if (LINES < 2)
         return -1;
- 
+
     int i;
-    for(i = 0; i < MAX_WINDOWS_NUM; i++) {
-        if (windows[i].window) 
+
+    for (i = 0; i < MAX_WINDOWS_NUM; i++) {
+        if (windows[i].window)
             continue;
-        
+
         w.window = newwin(LINES - 2, COLS, 0, 0);
+
         if (w.window == NULL)
             return -1;
 
         windows[i] = w;
         w.onInit(&w, m);
-    
-        active_window = windows+i;
+
+        active_window = windows + i;
         return i;
     }
-    
+
     return -1;
 }
 
@@ -113,8 +115,10 @@ void del_window(ToxWindow *w)
 {
     active_window = windows; // Go to prompt screen
     delwin(w->window);
+
     if (w->x)
         free(w->x);
+
     w->window = NULL;
     memset(w, 0, sizeof(ToxWindow));
     clear();
@@ -124,19 +128,19 @@ void del_window(ToxWindow *w)
 /* Shows next window when tab or back-tab is pressed */
 void set_next_window(int ch)
 {
-    ToxWindow *end = windows+MAX_WINDOWS_NUM-1;
+    ToxWindow *end = windows + MAX_WINDOWS_NUM - 1;
     ToxWindow *inf = active_window;
-    while(true) {
+
+    while (true) {
         if (ch == '\t') {
             if (++active_window > end)
                 active_window = windows;
-        } else 
-            if (--active_window < windows)
-                active_window = end;
-        
+        } else if (--active_window < windows)
+            active_window = end;
+
         if (active_window->window)
             return;
-    
+
         if (active_window == inf) {    // infinite loop check
             endwin();
             exit(2);
@@ -148,14 +152,14 @@ void set_active_window(int index)
 {
     if (index < 0 || index >= MAX_WINDOWS_NUM)
         return;
-    
-    active_window = windows+index;
+
+    active_window = windows + index;
 }
 
 ToxWindow *init_windows()
 {
     int n_prompt = add_window(m, new_prompt());
-    
+
     if (n_prompt == -1
             || add_window(m, new_friendlist()) == -1
             || add_window(m, new_dhtstatus()) == -1) {
@@ -166,7 +170,7 @@ ToxWindow *init_windows()
 
     prompt = &windows[n_prompt];
     active_window = prompt;
-    
+
     return prompt;
 }
 
@@ -189,7 +193,7 @@ static void draw_bar()
 
     for (i = 0; i < (MAX_WINDOWS_NUM); ++i) {
         if (windows[i].window) {
-            if (windows+i == active_window)
+            if (windows + i == active_window)
                 attron(A_BOLD);
 
             odd = (odd + 1) % blinkrate;
@@ -197,13 +201,13 @@ static void draw_bar()
             if (windows[i].blink && (odd < (blinkrate / 2)))
                 attron(COLOR_PAIR(3));
 
-            clrtoeol();
+            clrtoeol();
             printw(" %s", windows[i].title);
 
             if (windows[i].blink && (odd < (blinkrate / 2)))
                 attroff(COLOR_PAIR(3));
 
-            if (windows+i == active_window) {
+            if (windows + i == active_window) {
                 attroff(A_BOLD);
             }
         }