Add braces to all if statements.

9 files changed, 232 insertions, 126 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 91e556c6..cd3ff5f7 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -90,10 +90,11 @@ void print_assoc(IPPTsPng *assoc, uint8_t ours)
 
     ipp = &assoc->ret_ip_port;
 
-    if (ours)
+    if (ours) {
         printf("OUR IP: %s Port: %u\n", ip_ntoa(&ipp->ip), ntohs(ipp->port));
-    else
+    } else {
         printf("RET IP: %s Port: %u\n", ip_ntoa(&ipp->ip), ntohs(ipp->port));
+    }
 
     printf("Timestamp: %llu\n", (long long unsigned int) assoc->ret_timestamp);
     print_hardening(&assoc->hardening);
@@ -108,8 +109,9 @@ void print_clientlist(DHT *dht)
     for (i = 0; i < LCLIENT_LIST; i++) {
         Client_data *client = &dht->close_clientlist[i];
 
-        if (public_key_cmp(client->public_key, zeroes_cid) == 0)
+        if (public_key_cmp(client->public_key, zeroes_cid) == 0) {
             continue;
+        }
 
         printf("ClientID: ");
         print_client_id(client->public_key);
@@ -139,8 +141,9 @@ void print_friendlist(DHT *dht)
         for (i = 0; i < MAX_FRIEND_CLIENTS; i++) {
             Client_data *client = &dht->friends_list[k].client_list[i];
 
-            if (public_key_cmp(client->public_key, zeroes_cid) == 0)
+            if (public_key_cmp(client->public_key, zeroes_cid) == 0) {
                 continue;
+            }
 
             printf("ClientID: ");
             print_client_id(client->public_key);
@@ -158,8 +161,9 @@ void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
     printf("--------------------BEGIN-----------------------------\n");
 
     for (i = 0; i < length; i++) {
-        if (data[i] < 16)
+        if (data[i] < 16) {
             printf("0");
+        }
 
         printf("%hhX", data[i]);
     }
@@ -178,8 +182,9 @@ int main(int argc, char *argv[])
     uint8_t ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */
     int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
 
-    if (argvoffset < 0)
+    if (argvoffset < 0) {
         exit(1);
+    }
 
     //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
     /* initialize networking */
@@ -192,8 +197,9 @@ int main(int argc, char *argv[])
     uint32_t i;
 
     for (i = 0; i < 32; i++) {
-        if (dht->self_public_key[i] < 16)
+        if (dht->self_public_key[i] < 16) {
             printf("0");
+        }
 
         printf("%hhX", dht->self_public_key[i]);
     }
@@ -201,11 +207,13 @@ int main(int argc, char *argv[])
     char temp_id[128];
     printf("\nEnter the public_key of the friend you wish to add (32 bytes HEX format):\n");
 
-    if (!fgets(temp_id, sizeof(temp_id), stdin))
+    if (!fgets(temp_id, sizeof(temp_id), stdin)) {
         exit(0);
+    }
 
-    if ((strlen(temp_id) > 0) && (temp_id[strlen(temp_id) - 1] == '\n'))
+    if ((strlen(temp_id) > 0) && (temp_id[strlen(temp_id) - 1] == '\n')) {
         temp_id[strlen(temp_id) - 1] = '\0';
+    }
 
     uint8_t *bin_id = hex_string_to_bin(temp_id);
     DHT_addfriend(dht, bin_id, 0, 0, 0, 0);
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index e39a1182..f31052e3 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -74,8 +74,9 @@ void print_request(Messenger *m, const uint8_t *public_key, const uint8_t *data,
     uint32_t j;
 
     for (j = 0; j < 32; j++) {
-        if (public_key[j] < 16)
+        if (public_key[j] < 16) {
             printf("0");
+        }
 
         printf("%hhX", public_key[j]);
     }
@@ -100,8 +101,9 @@ int main(int argc, char *argv[])
     uint8_t ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */
     int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
 
-    if (argvoffset < 0)
+    if (argvoffset < 0) {
         exit(1);
+    }
 
     /* with optional --ipvx, now it can be 1-4 arguments... */
     if ((argc != argvoffset + 2) && (argc != argvoffset + 4)) {
@@ -156,8 +158,9 @@ int main(int argc, char *argv[])
     getaddress(m, address);
 
     for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
-        if (address[i] < 16)
+        if (address[i] < 16) {
             printf("0");
+        }
 
         printf("%hhX", address[i]);
     }
@@ -167,12 +170,13 @@ int main(int argc, char *argv[])
     char temp_hex_id[128];
     printf("\nEnter the address of the friend you wish to add (38 bytes HEX format):\n");
 
-    if (!fgets(temp_hex_id, sizeof(temp_hex_id), stdin))
+    if (!fgets(temp_hex_id, sizeof(temp_hex_id), stdin)) {
         exit(0);
+    }
 
-    if ((strlen(temp_hex_id) > 0) && (temp_hex_id[strlen(temp_hex_id) - 1] == '\n'))
+    if ((strlen(temp_hex_id) > 0) && (temp_hex_id[strlen(temp_hex_id) - 1] == '\n')) {
         temp_hex_id[strlen(temp_hex_id) - 1] = '\0';
-
+    }
 
     uint8_t *bin_id = hex_string_to_bin(temp_hex_id);
     int num = m_addfriend(m, bin_id, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
diff --git a/testing/av_test.c b/testing/av_test.c
index 7c2922b7..e724bb0e 100644
--- a/testing/av_test.c
+++ b/testing/av_test.c
@@ -258,8 +258,9 @@ void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceCC, ToxA
         }
 
         if (tox_friend_get_connection_status(Alice, 0, NULL) == TOX_CONNECTION_UDP &&
-                tox_friend_get_connection_status(Bob, 0, NULL) == TOX_CONNECTION_UDP)
+                tox_friend_get_connection_status(Bob, 0, NULL) == TOX_CONNECTION_UDP) {
             break;
+        }
 
         c_sleep(20);
     }
@@ -316,8 +317,9 @@ void *iterate_toxav (void *data)
 
 #if defined TEST_TRANSFER_V && TEST_TRANSFER_V == 1
 
-        if (!rc)
+        if (!rc) {
             rc = 1;
+        }
 
         cvWaitKey(rc);
 #else
@@ -379,8 +381,9 @@ int print_audio_devices()
     for (i = 0; i < Pa_GetDeviceCount(); ++i) {
         const PaDeviceInfo *info = Pa_GetDeviceInfo(i);
 
-        if (info)
+        if (info) {
             printf("%d) %s\n", i, info->name);
+        }
     }
 
     return 0;
@@ -498,8 +501,9 @@ CHECK_ARG:
         }
     }
 
-    if (audio_out_dev_idx < 0)
+    if (audio_out_dev_idx < 0) {
         audio_out_dev_idx = Pa_GetDefaultOutputDevice();
+    }
 
     const PaDeviceInfo *audio_dev = Pa_GetDeviceInfo(audio_out_dev_idx);
 
@@ -548,8 +552,9 @@ CHECK_ARG:
             }
         }
 
-        while (!BobCC.incoming)
+        while (!BobCC.incoming) {
             iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        }
 
         { /* Answer */
             TOXAV_ERR_ANSWER rc;
@@ -561,8 +566,9 @@ CHECK_ARG:
             }
         }
 
-        while (AliceCC.state == 0)
+        while (AliceCC.state == 0) {
             iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        }
 
         /* Open audio file */
         af_handle = sf_open(af_name, SFM_READ, &af_info);
@@ -627,7 +633,7 @@ CHECK_ARG:
             }
 
             iterate_tox(bootstrap, AliceAV, BobAV, NULL);
-            c_sleep(abs(audio_frame_duration - (current_time_monotonic() - enc_start_time) - 1));
+            c_sleep((audio_frame_duration - (current_time_monotonic() - enc_start_time) - 1));
         }
 
         printf("Played file in: %lu; stopping stream...\n", time(NULL) - start_time);
@@ -651,19 +657,22 @@ CHECK_ARG:
         /* Stop decode thread */
         data.sig = -1;
 
-        while (data.sig != 1)
+        while (data.sig != 1) {
             pthread_yield();
+        }
 
         pthread_mutex_destroy(AliceCC.arb_mutex);
         pthread_mutex_destroy(BobCC.arb_mutex);
 
         void *f = NULL;
 
-        while (rb_read(AliceCC.arb, &f))
+        while (rb_read(AliceCC.arb, &f)) {
             free(f);
+        }
 
-        while (rb_read(BobCC.arb, &f))
+        while (rb_read(BobCC.arb, &f)) {
             free(f);
+        }
 
         printf("Success!");
     }
@@ -684,8 +693,9 @@ CHECK_ARG:
             }
         }
 
-        while (!BobCC.incoming)
+        while (!BobCC.incoming) {
             iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        }
 
         { /* Answer */
             TOXAV_ERR_ANSWER rc;
@@ -724,8 +734,9 @@ CHECK_ARG:
         while (start_time + 90 > time(NULL)) {
             IplImage *frame = cvQueryFrame(capture );
 
-            if (!frame)
+            if (!frame) {
                 break;
+            }
 
             send_opencv_img(AliceAV, 0, frame);
             iterate_tox(bootstrap, AliceAV, BobAV, NULL);
@@ -751,8 +762,9 @@ CHECK_ARG:
         printf("Stopping decode thread\n");
         data.sig = -1;
 
-        while (data.sig != 1)
+        while (data.sig != 1) {
             pthread_yield();
+        }
 
         printf("Success!");
     }
diff --git a/testing/dns3_test.c b/testing/dns3_test.c
index 1f6c6a12..975bc17b 100644
--- a/testing/dns3_test.c
+++ b/testing/dns3_test.c
@@ -54,11 +54,13 @@ int main(int argc, char *argv[])
     ip.family = AF_INET;
     sock_t sock = socket(ip.family, SOCK_DGRAM, IPPROTO_UDP);
 
-    if (!sock_valid(sock))
+    if (!sock_valid(sock)) {
         return -1;
+    }
 
-    if (!addr_resolve_or_parse_ip(argv[1], &ip, 0))
+    if (!addr_resolve_or_parse_ip(argv[1], &ip, 0)) {
         return -1;
+    }
 
     struct sockaddr_in target;
     size_t addrsize = sizeof(struct sockaddr_in);
@@ -77,8 +79,9 @@ int main(int argc, char *argv[])
     }*/
     int len = tox_generate_dns3_string(d, string + 1, sizeof(string) - 1, &request_id, (uint8_t *)argv[3], strlen(argv[3]));
 
-    if (len == -1)
+    if (len == -1) {
         return -1;
+    }
 
     string[0] = '_';
     memcpy(string + len + 1, "._tox.", sizeof("._tox."));
@@ -87,21 +90,26 @@ int main(int argc, char *argv[])
     uint8_t id = rand();
     uint32_t p_len = create_packet(packet, string, strlen((char *)string), id);
 
-    if (sendto(sock, (char *) packet, p_len, 0, (struct sockaddr *)&target, addrsize) != p_len)
+    if (sendto(sock, (char *) packet, p_len, 0, (struct sockaddr *)&target, addrsize) != p_len) {
         return -1;
+    }
 
     uint8_t buffer[512] = {};
     int r_len = recv(sock, buffer, sizeof(buffer), 0);
 
-    if (r_len < (int)p_len)
+    if (r_len < (int)p_len) {
         return -1;
+    }
 
-    for (i = r_len - 1; i != 0 && buffer[i] != '='; --i);
+    for (i = r_len - 1; i != 0 && buffer[i] != '='; --i) {
+        ;
+    }
 
     uint8_t tox_id[TOX_ADDRESS_SIZE];
 
-    if (tox_decrypt_dns3_TXT(d, tox_id, buffer + i + 1, r_len - (i + 1), request_id) != 0)
+    if (tox_decrypt_dns3_TXT(d, tox_id, buffer + i + 1, r_len - (i + 1), request_id) != 0) {
         return -1;
+    }
 
     printf("The Tox id for username %s is:\n", argv[3]);
 
diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c
index 8ee28d80..01e557d5 100644
--- a/testing/irc_syncbot.c
+++ b/testing/irc_syncbot.c
@@ -85,16 +85,18 @@ int current_group = -1;
 
 static void callback_group_invite(Tox *tox, int fid, uint8_t type, const uint8_t *data, uint16_t length, void *userdata)
 {
-    if (current_group == -1)
+    if (current_group == -1) {
         current_group = tox_join_groupchat(tox, fid, data, length);
+    }
 }
 
 void callback_friend_message(Tox *tox, uint32_t fid, TOX_MESSAGE_TYPE type, const uint8_t *message, size_t length,
                              void *userdata)
 {
     if (length == 1 && *message == 'c') {
-        if (tox_del_groupchat(tox, current_group) == 0)
+        if (tox_del_groupchat(tox, current_group) == 0) {
             current_group = -1;
+        }
     }
 
     if (length == 1 && *message == 'i') {
@@ -109,8 +111,9 @@ void callback_friend_message(Tox *tox, uint32_t fid, TOX_MESSAGE_TYPE type, cons
 static void copy_groupmessage(Tox *tox, int groupnumber, int friendgroupnumber, const uint8_t *message, uint16_t length,
                               void *userdata)
 {
-    if (tox_group_peernumber_is_ours(tox, groupnumber, friendgroupnumber))
+    if (tox_group_peernumber_is_ours(tox, groupnumber, friendgroupnumber)) {
         return;
+    }
 
     uint8_t name[TOX_MAX_NAME_LENGTH];
     int namelen = tox_group_peername(tox, groupnumber, friendgroupnumber, name);
@@ -136,29 +139,34 @@ static void copy_groupmessage(Tox *tox, int groupnumber, int friendgroupnumber,
     unsigned int i;
 
     for (i = 0; i < send_len; ++i) {
-        if (sendbuf[i] == '\n')
+        if (sendbuf[i] == '\n') {
             sendbuf[i] = '|';
+        }
 
-        if (sendbuf[i] == 0)
+        if (sendbuf[i] == 0) {
             sendbuf[i] = ' ';
+        }
     }
 
     sendbuf[send_len] = '\n';
     send_len += 1;
 
-    if (sock >= 0)
+    if (sock >= 0) {
         send(sock, sendbuf, send_len, MSG_NOSIGNAL);
+    }
 }
 
 void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len)
 {
-    if (len > 1350 || len == 0 || len == 1)
+    if (len > 1350 || len == 0 || len == 1) {
         return;
+    }
 
     --len;
 
-    if (*msg != ':')
+    if (*msg != ':') {
         return;
+    }
 
     uint8_t req[len];
     unsigned int i;
@@ -185,8 +193,9 @@ void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len)
 
     uint8_t *pmsg = (uint8_t *)strstr((char *)req, " PRIVMSG");
 
-    if (pmsg == NULL)
+    if (pmsg == NULL) {
         return;
+    }
 
     uint8_t *dt;
 
@@ -200,8 +209,9 @@ void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len)
     message[length] = ' ';
     length += 1;
 
-    if ((req_len + 2) >= len)
+    if ((req_len + 2) >= len) {
         return;
+    }
 
     memcpy(message + length, msg + req_len + 2, len - (req_len + 2));
     length += len - (req_len + 2);
@@ -213,8 +223,9 @@ Tox *init_tox(int argc, char *argv[])
     uint8_t ipv6enabled = 1; /* x */
     int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
 
-    if (argvoffset < 0)
+    if (argvoffset < 0) {
         exit(1);
+    }
 
     /* with optional --ipvx, now it can be 1-4 arguments... */
     if ((argc != argvoffset + 2) && (argc != argvoffset + 4)) {
@@ -224,8 +235,9 @@ Tox *init_tox(int argc, char *argv[])
 
     Tox *tox = tox_new(0, 0);
 
-    if (!tox)
+    if (!tox) {
         exit(1);
+    }
 
     tox_self_set_name(tox, (uint8_t *)IRC_NAME, sizeof(IRC_NAME) - 1, 0);
     tox_callback_friend_message(tox, &callback_friend_message);
@@ -263,8 +275,9 @@ int main(int argc, char *argv[])
 
     sock = reconnect();
 
-    if (sock < 0)
+    if (sock < 0) {
         return 1;
+    }
 
     uint64_t last_get = get_monotime_sec();
     int connected = 0, ping_sent = 0;
@@ -281,8 +294,9 @@ int main(int argc, char *argv[])
             recv(sock, data, count, MSG_NOSIGNAL);
             printf("%s", data);
 
-            if (!connected)
+            if (!connected) {
                 connected = 1;
+            }
 
             if (count > 6 && data[0] == 'P' && data[1] == 'I' && data[2] == 'N' && data[3] == 'G') {
                 data[1] = 'O';
@@ -309,8 +323,9 @@ int main(int argc, char *argv[])
                     break;
                 }
 
-                if (data[i] == ':')
+                if (data[i] == ':') {
                     break;
+                }
             }
 
             for (i = 0; i < count; ++i) {
@@ -329,8 +344,9 @@ int main(int argc, char *argv[])
         if (!ping_sent && last_get + (SILENT_TIMEOUT / 2) < get_monotime_sec()) {
             unsigned int p_s = sizeof("PING :test\n") - 1;
 
-            if (send(sock, "PING :test\n", p_s, MSG_NOSIGNAL) == p_s)
+            if (send(sock, "PING :test\n", p_s, MSG_NOSIGNAL) == p_s) {
                 ping_sent = 1;
+            }
         }
 
         int error = 0;
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index 52b739dc..ba49ebc8 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -46,8 +46,9 @@ uint8_t *hex_string_to_bin(char *hex_string)
     uint8_t *ret = malloc(len);
     char *pos = hex_string;
 
-    for (i = 0; i < len; ++i, pos += 2)
+    for (i = 0; i < len; ++i, pos += 2) {
         sscanf(pos, "%2hhx", &ret[i]);
+    }
 
     return ret;
 }
@@ -56,16 +57,16 @@ int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
 {
     int argvoffset = 0, argi;
 
-    for (argi = 1; argi < argc; argi++)
+    for (argi = 1; argi < argc; argi++) {
         if (!strncasecmp(argv[argi], "--ipv", 5)) {
             if (argv[argi][5] && !argv[argi][6]) {
                 char c = argv[argi][5];
 
-                if (c == '4')
+                if (c == '4') {
                     *ipv6enabled = 0;
-                else if (c == '6')
+                } else if (c == '6') {
                     *ipv6enabled = 1;
-                else {
+                } else {
                     printf("Invalid argument: %s. Try --ipv4 or --ipv6!\n", argv[argi]);
                     return -1;
                 }
@@ -81,6 +82,7 @@ int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
 
             argvoffset++;
         }
+    }
 
     return argvoffset;
 };
diff --git a/testing/nTox.c b/testing/nTox.c
index 8cc633bc..3494015c 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -152,8 +152,9 @@ uint32_t add_filesender(Tox *m, uint16_t friendnum, char *filename)
 {
     FILE *tempfile = fopen(filename, "rb");
 
-    if (tempfile == 0)
+    if (tempfile == 0) {
         return -1;
+    }
 
     fseek(tempfile, 0, SEEK_END);
     uint64_t filesize = ftell(tempfile);
@@ -161,8 +162,9 @@ uint32_t add_filesender(Tox *m, uint16_t friendnum, char *filename)
     uint32_t filenum = tox_file_send(m, friendnum, TOX_FILE_KIND_DATA, filesize, 0, (uint8_t *)filename,
                                      strlen(filename), 0);
 
-    if (filenum == -1)
+    if (filenum == -1) {
         return -1;
+    }
 
     file_senders[numfilesenders].file = tempfile;
     file_senders[numfilesenders].friendnum = friendnum;
@@ -183,11 +185,13 @@ static void fraddr_to_str(uint8_t *id_bin, char *id_str)
     for (i = 0; i < TOX_ADDRESS_SIZE; i++) {
         sprintf(&id_str[2 * i + delta], "%02hhX", id_bin[i]);
 
-        if ((i + 1) == TOX_PUBLIC_KEY_SIZE)
+        if ((i + 1) == TOX_PUBLIC_KEY_SIZE) {
             pos_extra = 2 * (i + 1) + delta;
+        }
 
-        if (i >= TOX_PUBLIC_KEY_SIZE)
+        if (i >= TOX_PUBLIC_KEY_SIZE) {
             sum_extra |= id_bin[i];
+        }
 
         if (!((i + 1) % FRADDR_TOSTR_CHUNK_LEN)) {
             id_str[2 * (i + 1) + delta] = ' ';
@@ -197,8 +201,9 @@ static void fraddr_to_str(uint8_t *id_bin, char *id_str)
 
     id_str[2 * i + delta] = 0;
 
-    if (!sum_extra)
+    if (!sum_extra) {
         id_str[pos_extra] = 0;
+    }
 }
 
 void get_id(Tox *m, char *data)
@@ -215,10 +220,11 @@ int getfriendname_terminated(Tox *m, int friendnum, char *namebuf)
     tox_friend_get_name(m, friendnum, (uint8_t *)namebuf, NULL);
     int res = tox_friend_get_name_size(m, friendnum, NULL);
 
-    if (res >= 0)
+    if (res >= 0) {
         namebuf[res] = 0;
-    else
+    } else {
         namebuf[0] = 0;
+    }
 
     return res;
 }
@@ -260,10 +266,11 @@ void print_friendlist(Tox *m)
     uint32_t i = 0;
 
     while (getfriendname_terminated(m, i, name) != -1) {
-        if (tox_friend_get_public_key(m, i, fraddr_bin, NULL))
+        if (tox_friend_get_public_key(m, i, fraddr_bin, NULL)) {
             fraddr_to_str(fraddr_bin, fraddr_str);
-        else
+        } else {
             sprintf(fraddr_str, "???");
+        }
 
         if (strlen(name) <= 0) {
             sprintf(fstring, ptrn_friend, i, "No name?", fraddr_str);
@@ -275,8 +282,9 @@ void print_friendlist(Tox *m)
         new_lines(fstring);
     }
 
-    if (i == 0)
+    if (i == 0) {
         new_lines("+ no friends! D:");
+    }
 }
 
 static int fmtmsg_tm_mday = -1;
@@ -338,8 +346,9 @@ void line_eval(Tox *m, char *line)
             for (i = 0; i < 128; i++) {
                 temp_id[i - delta] = line[i + prompt_offset];
 
-                if ((temp_id[i - delta] == ' ') || (temp_id[i - delta] == '+'))
+                if ((temp_id[i - delta] == ' ') || (temp_id[i - delta] == '+')) {
                     delta++;
+                }
             }
 
             unsigned char *bin_string = hex_string_to_bin(temp_id);
@@ -402,14 +411,17 @@ void line_eval(Tox *m, char *line)
                 } else {
                     print_formatted_message(m, *posi + 1, num, 1);
                 }
-            } else
+            } else {
                 new_lines("Error, bad input.");
+            }
         } else if (inpt_command == 'n') {
             uint8_t name[TOX_MAX_NAME_LENGTH];
             size_t i, len = strlen(line);
 
             for (i = 3; i < len; i++) {
-                if (line[i] == 0 || line[i] == '\n') break;
+                if (line[i] == 0 || line[i] == '\n') {
+                    break;
+                }
 
                 name[i - 3] = line[i];
             }
@@ -426,7 +438,9 @@ void line_eval(Tox *m, char *line)
             size_t i, len = strlen(line);
 
             for (i = 3; i < len; i++) {
-                if (line[i] == 0 || line[i] == '\n') break;
+                if (line[i] == 0 || line[i] == '\n') {
+                    break;
+                }
 
                 status[i - 3] = line[i];
             }
@@ -482,10 +496,11 @@ void line_eval(Tox *m, char *line)
             if (c == 'y') {
                 int res = tox_friend_delete(m, numf, NULL);
 
-                if (res)
+                if (res) {
                     sprintf(msg, "[i] [%i: %s] is no longer your friend", numf, fname);
-                else
+                } else {
                     sprintf(msg, "[i] failed to remove friend");
+                }
 
                 new_lines(msg);
             }
@@ -555,20 +570,22 @@ void line_eval(Tox *m, char *line)
                 if (conversation_default != 0) {
                     conversation_default = 0;
                     new_lines("[i] default conversation reset");
-                } else
+                } else {
                     new_lines("[i] default conversation wasn't set, nothing to do");
+                }
             } else if (line[3] != ' ') {
                 new_lines("[i] invalid command");
             } else {
                 int num = atoi(line + 4);
 
                 /* zero is also returned for not-a-number */
-                if (!num && strcmp(line + 4, "0"))
+                if (!num && strcmp(line + 4, "0")) {
                     num = -1;
+                }
 
-                if (num < 0)
+                if (num < 0) {
                     new_lines("[i] invalid command parameter");
-                else if (line[2] == 'f') {
+                } else if (line[2] == 'f') {
                     conversation_default = num + 1;
                     char buffer[128];
                     sprintf(buffer, "[i] default conversation is now to friend %i", num);
@@ -578,8 +595,9 @@ void line_eval(Tox *m, char *line)
                     conversation_default = - (num + 1);
                     sprintf(buffer, "[i] default conversation is now to group %i", num);
                     new_lines(buffer);
-                } else
+                } else {
                     new_lines("[i] invalid command");
+                }
             }
         } else if (inpt_command == 'p') { //list peers
             char *posi = NULL;
@@ -613,8 +631,9 @@ void line_eval(Tox *m, char *line)
                     char sss[128];
                     sprintf(sss, "[i] could not send message to friend no. %u", friendnumber);
                     new_lines(sss);
-                } else
+                } else {
                     print_formatted_message(m, line, friendnumber, 1);
+                }
             } else {
                 int groupnumber = - conversation_default - 1;
                 int res = tox_group_message_send(m, groupnumber, (uint8_t *)line, strlen(line));
@@ -629,8 +648,9 @@ void line_eval(Tox *m, char *line)
                     new_lines(msg);
                 }
             }
-        } else
+        } else {
             new_lines("[i] invalid input: neither command nor in conversation");
+        }
     }
 }
 
@@ -652,8 +672,9 @@ void wrap(char output[STRING_LENGTH_WRAPPED], char input[STRING_LENGTH], int lin
 
     /* if the line is very very short, don't insert continuation markers,
      * as they would use up too much of the line */
-    if ((size_t)line_width < 2 * wrap_cont_len)
+    if ((size_t)line_width < 2 * wrap_cont_len) {
         delta_remain = 0;
+    }
 
     for (i = line_width; i < len; i += line_width) {
         /* look backward for a space to expand/turn into a new line */
@@ -685,8 +706,9 @@ void wrap(char output[STRING_LENGTH_WRAPPED], char input[STRING_LENGTH], int lin
         } else {
             /* string ends right here:
              * don't add a continuation marker with nothing following */
-            if (i == len - 1)
+            if (i == len - 1) {
                 break;
+            }
 
             /* nothing found backwards */
             if (delta_remain > wrap_cont_len) {
@@ -728,8 +750,9 @@ void wrap_bars(char output[STRING_LENGTH_WRAPPED], char input[STRING_LENGTH], si
             /* not yet at the limit */
             char c = input[ipos];
 
-            if (c == ' ')
+            if (c == ' ') {
                 space_avail = opos;
+            }
 
             output[opos++] = input[ipos];
 
@@ -751,8 +774,9 @@ void wrap_bars(char output[STRING_LENGTH_WRAPPED], char input[STRING_LENGTH], si
                 output[opos++] = ' ';
             }
 
-            if (c == '\n')
+            if (c == '\n') {
                 nl_got = opos;
+            }
 
             continue;
         } else {
@@ -807,8 +831,9 @@ void wrap_bars(char output[STRING_LENGTH_WRAPPED], char input[STRING_LENGTH], si
         }
     }
 
-    if (opos >= STRING_LENGTH_WRAPPED)
+    if (opos >= STRING_LENGTH_WRAPPED) {
         opos = STRING_LENGTH_WRAPPED - 1;
+    }
 
     output[opos] = 0;
 }
@@ -819,8 +844,9 @@ int count_lines(char *string)
     int count = 1;
 
     for (i = 0; i < len; i++) {
-        if (string[i] == '\n')
+        if (string[i] == '\n') {
             count++;
+        }
     }
 
     return count;
@@ -845,10 +871,11 @@ void do_refresh()
     int i;
 
     for (i = 0; i < HISTORY; i++) {
-        if (flag[i])
+        if (flag[i]) {
             wrap_bars(wrap_output, lines[i], x);
-        else
+        } else {
             wrap(wrap_output, lines[i], x);
+        }
 
         int L = count_lines(wrap_output);
         count = count + L;
@@ -898,10 +925,11 @@ void print_nickchange(Tox *m, uint32_t friendnumber, const uint8_t *string, size
     if (getfriendname_terminated(m, friendnumber, name) != -1) {
         char msg[100 + length];
 
-        if (name[0] != 0)
+        if (name[0] != 0) {
             sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string);
-        else
+        } else {
             sprintf(msg, "[i] [%d] Friend's name is %s.", friendnumber, string);
+        }
 
         new_lines(msg);
     }
@@ -914,10 +942,11 @@ void print_statuschange(Tox *m, uint32_t friendnumber, const uint8_t *string, si
     if (getfriendname_terminated(m, friendnumber, name) != -1) {
         char msg[100 + length + strlen(name) + 1];
 
-        if (name[0] != 0)
+        if (name[0] != 0) {
             sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string);
-        else
+        } else {
             sprintf(msg, "[i] [%d] Their status changed to %s.", friendnumber, string);
+        }
 
         new_lines(msg);
     }
@@ -997,8 +1026,9 @@ static int save_data_file(Tox *m, char *path)
 {
     data_file_name = path;
 
-    if (save_data(m))
+    if (save_data(m)) {
         return 1;
+    }
 
     return 0;
 }
@@ -1032,8 +1062,9 @@ void print_groupchatpeers(Tox *m, int groupnumber)
 {
     int num = tox_group_number_peers(m, groupnumber);
 
-    if (num < 0)
+    if (num < 0) {
         return;
+    }
 
     if (!num) {
         new_lines("[g]+ no peers left in group.");
@@ -1084,13 +1115,15 @@ void print_groupmessage(Tox *m, int groupnumber, int peernumber, const uint8_t *
     int len = tox_group_peername(m, groupnumber, peernumber, name);
 
     //print_groupchatpeers(m, groupnumber);
-    if (len <= 0)
+    if (len <= 0) {
         name[0] = 0;
+    }
 
-    if (name[0] != 0)
+    if (name[0] != 0) {
         sprintf(msg, "[g] %u: %u <%s>: %s", groupnumber, peernumber, name, message);
-    else
+    } else {
         sprintf(msg, "[g] #%u: %u Unknown: %s", groupnumber, peernumber, message);
+    }
 
     new_lines(msg);
 }
@@ -1116,8 +1149,9 @@ void print_groupnamelistchange(Tox *m, int groupnumber, int peernumber, uint8_t
             uint8_t peername[TOX_MAX_NAME_LENGTH] = {0};
             int len = tox_group_peername(m, groupnumber, peernumber, peername);
 
-            if (len <= 0)
+            if (len <= 0) {
                 peername[0] = 0;
+            }
 
             sprintf(msg, "[g] #%i: Peer %i left. Former peer [%i: <%s>] is now peer %i.", groupnumber, peernumber,
                     peers_total, peername, peernumber);
@@ -1127,8 +1161,9 @@ void print_groupnamelistchange(Tox *m, int groupnumber, int peernumber, uint8_t
         uint8_t peername[TOX_MAX_NAME_LENGTH] = {0};
         int len = tox_group_peername(m, groupnumber, peernumber, peername);
 
-        if (len <= 0)
+        if (len <= 0) {
             peername[0] = 0;
+        }
 
         sprintf(msg, "[g] #%i: Peer %i's name changed: %s", groupnumber, peernumber, peername);
         new_lines(msg);
@@ -1154,8 +1189,9 @@ void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number,
     if (tox_file_control(tox, friend_number, file_number, TOX_FILE_CONTROL_RESUME, 0)) {
         sprintf(msg, "Accepted file transfer. (saving file as: %u.%u.bin)", friend_number, file_number);
         new_lines(msg);
-    } else
+    } else {
         new_lines("Could not accept file transfer.");
+    }
 }
 
 void file_print_control(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_CONTROL control,
@@ -1195,30 +1231,33 @@ void write_file(Tox *tox, uint32_t friendnumber, uint32_t filenumber, uint64_t p
     sprintf(filename, "%u.%u.bin", friendnumber, filenumber);
     FILE *pFile = fopen(filename, "r+b");
 
-    if (pFile == NULL)
+    if (pFile == NULL) {
         pFile = fopen(filename, "wb");
+    }
 
     fseek(pFile, position, SEEK_SET);
 
-    if (fwrite(data, length, 1, pFile) != 1)
+    if (fwrite(data, length, 1, pFile) != 1) {
         new_lines("Error writing to file");
+    }
 
     fclose(pFile);
 }
 
 void print_online(Tox *tox, uint32_t friendnumber, TOX_CONNECTION status, void *userdata)
 {
-    if (status)
+    if (status) {
         printf("\nOther went online.\n");
-    else {
+    } else {
         printf("\nOther went offline.\n");
         unsigned int i;
 
-        for (i = 0; i < NUM_FILE_SENDERS; ++i)
+        for (i = 0; i < NUM_FILE_SENDERS; ++i) {
             if (file_senders[i].file != 0 && file_senders[i].friendnum == friendnumber) {
                 fclose(file_senders[i].file);
                 file_senders[i].file = 0;
             }
+        }
     }
 }
 
@@ -1266,8 +1305,9 @@ int main(int argc, char *argv[])
     uint8_t ipv6enabled = 1; /* x */
     int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
 
-    if (argvoffset < 0)
+    if (argvoffset < 0) {
         exit(1);
+    }
 
     int on = 0;
     char *filename = "data";
@@ -1276,9 +1316,11 @@ int main(int argc, char *argv[])
 
     /* [-f keyfile] MUST be last two arguments, no point in walking over the list
      * especially not a good idea to accept it anywhere in the middle */
-    if (argc > argvoffset + 3)
-        if (!strcmp(argv[argc - 2], "-f"))
+    if (argc > argvoffset + 3) {
+        if (!strcmp(argv[argc - 2], "-f")) {
             filename = argv[argc - 1];
+        }
+    }
 
     data_file_name = filename;
     m = load_data();
@@ -1359,8 +1401,9 @@ int main(int argc, char *argv[])
 
         int c = timeout_getch(m);
 
-        if (c == ERR || c == 27)
+        if (c == ERR || c == 27) {
             continue;
+        }
 
         getmaxyx(stdscr, y, x);
 
diff --git a/testing/tox_shell.c b/testing/tox_shell.c
index 9c71a2d7..f6dae7b9 100644
--- a/testing/tox_shell.c
+++ b/testing/tox_shell.c
@@ -47,10 +47,11 @@
 
 void print_online(Tox *tox, uint32_t friendnumber, TOX_CONNECTION status, void *userdata)
 {
-    if (status)
+    if (status) {
         printf("\nOther went online.\n");
-    else
+    } else {
         printf("\nOther went offline.\n");
+    }
 }
 
 void print_message(Tox *tox, uint32_t friendnumber, TOX_MESSAGE_TYPE type, const uint8_t *string, size_t length,
@@ -66,8 +67,9 @@ int main(int argc, char *argv[])
     uint8_t ipv6enabled = 1; /* x */
     int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
 
-    if (argvoffset < 0)
+    if (argvoffset < 0) {
         exit(1);
+    }
 
     /* with optional --ipvx, now it can be 1-4 arguments... */
     if ((argc != argvoffset + 2) && (argc != argvoffset + 4)) {
@@ -147,8 +149,9 @@ int main(int argc, char *argv[])
             uint8_t buf[TOX_MAX_MESSAGE_LENGTH];
             ret = read(*master, buf, sizeof(buf));
 
-            if (ret <= 0)
+            if (ret <= 0) {
                 break;
+            }
 
             tox_friend_send_message(tox, num, TOX_MESSAGE_TYPE_NORMAL, buf, ret, 0);
         }
diff --git a/testing/tox_sync.c b/testing/tox_sync.c
index a90e343e..c80db339 100644
--- a/testing/tox_sync.c
+++ b/testing/tox_sync.c
@@ -82,8 +82,9 @@ uint32_t add_filesender(Tox *m, uint16_t friendnum, char *filename)
 {
     FILE *tempfile = fopen(filename, "rb");
 
-    if (tempfile == 0)
+    if (tempfile == 0) {
         return -1;
+    }
 
     fseek(tempfile, 0, SEEK_END);
     uint64_t filesize = ftell(tempfile);
@@ -91,8 +92,9 @@ uint32_t add_filesender(Tox *m, uint16_t friendnum, char *filename)
     uint32_t filenum = tox_file_send(m, friendnum, TOX_FILE_KIND_DATA, filesize, 0, (uint8_t *)filename,
                                      strlen(filename), 0);
 
-    if (filenum == -1)
+    if (filenum == -1) {
         return -1;
+    }
 
     file_senders[numfilesenders].file = tempfile;
     file_senders[numfilesenders].friendnum = friendnum;
@@ -105,19 +107,22 @@ void kill_filesender(Tox *m, uint32_t filenum)
 {
     uint32_t i;
 
-    for (i = 0; i < NUM_FILE_SENDERS; ++i)
+    for (i = 0; i < NUM_FILE_SENDERS; ++i) {
         if (file_senders[i].file != 0 && file_senders[i].filenumber == filenum) {
             fclose(file_senders[i].file);
             file_senders[i].file = 0;
         }
+    }
 }
 int not_sending()
 {
     uint32_t i;
 
-    for (i = 0; i < NUM_FILE_SENDERS; ++i)
-        if (file_senders[i].file != 0)
+    for (i = 0; i < NUM_FILE_SENDERS; ++i) {
+        if (file_senders[i].file != 0) {
             return 0;
+        }
+    }
 
     return 1;
 }
@@ -138,14 +143,16 @@ void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number,
     uint16_t rm = 0;
 
     for (i = 0; i < strlen((char *)filename); ++i) {
-        if (filename[i] == '/')
+        if (filename[i] == '/') {
             rm = i;
+        }
     }
 
-    if (path[strlen(path) - 1] == '/')
+    if (path[strlen(path) - 1] == '/') {
         sprintf(fullpath, "%s%s", path, filename + rm + 1);
-    else
+    } else {
         sprintf(fullpath, "%s/%s", path, filename + rm + 1);
+    }
 
     FILE *tempfile = fopen(fullpath, "rb");
 
@@ -202,16 +209,17 @@ void write_file(Tox *tox, uint32_t friendnumber, uint32_t filenumber, uint64_t p
     if (file_recv[file_index].file != 0) {
         fseek(file_recv[file_index].file, position, SEEK_SET);
 
-        if (fwrite(data, length, 1, file_recv[file_index].file) != 1)
+        if (fwrite(data, length, 1, file_recv[file_index].file) != 1) {
             printf("Error writing data\n");
+        }
     }
 }
 
 void print_online(Tox *tox, uint32_t friendnumber, TOX_CONNECTION status, void *userdata)
 {
-    if (status)
+    if (status) {
         printf("\nOther went online.\n");
-    else {
+    } else {
         printf("\nOther went offline.\n");
         unsigned int i;
 
@@ -234,8 +242,9 @@ int main(int argc, char *argv[])
     uint8_t ipv6enabled = 1; /* x */
     int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
 
-    if (argvoffset < 0)
+    if (argvoffset < 0) {
         exit(1);
+    }
 
     /* with optional --ipvx, now it can be 1-4 arguments... */
     if ((argc != argvoffset + 3) && (argc != argvoffset + 5)) {
@@ -303,10 +312,11 @@ int main(int argc, char *argv[])
                     if (dir->d_type == DT_REG) {
                         char fullpath[1024];
 
-                        if (path[strlen(path) - 1] == '/')
+                        if (path[strlen(path) - 1] == '/') {
                             sprintf(fullpath, "%s%s", path, dir->d_name);
-                        else
+                        } else {
                             sprintf(fullpath, "%s/%s", path, dir->d_name);
+                        }
 
                         add_filesender(tox, num, fullpath);
                     }