Passed everything through astyle.

3 files changed, 143 insertions, 132 deletions

diff --git a/auto_tests/crypto_test.c b/auto_tests/crypto_test.c
index 8b5397e4..6b9f6113 100644
--- a/auto_tests/crypto_test.c
+++ b/auto_tests/crypto_test.c
@@ -10,8 +10,8 @@
 void rand_bytes(uint8_t *b, size_t blen)
 {
     size_t i;
-    for (i = 0; i < blen; i++)
-    {
+
+    for (i = 0; i < blen; i++) {
         b[i] = rand();
     }
 }
@@ -19,65 +19,65 @@ void rand_bytes(uint8_t *b, size_t blen)
 // These test vectors are from libsodium's test suite
 
 unsigned char alicesk[32] = {
-    0x77,0x07,0x6d,0x0a,0x73,0x18,0xa5,0x7d,
-    0x3c,0x16,0xc1,0x72,0x51,0xb2,0x66,0x45,
-    0xdf,0x4c,0x2f,0x87,0xeb,0xc0,0x99,0x2a,
-    0xb1,0x77,0xfb,0xa5,0x1d,0xb9,0x2c,0x2a
+    0x77, 0x07, 0x6d, 0x0a, 0x73, 0x18, 0xa5, 0x7d,
+    0x3c, 0x16, 0xc1, 0x72, 0x51, 0xb2, 0x66, 0x45,
+    0xdf, 0x4c, 0x2f, 0x87, 0xeb, 0xc0, 0x99, 0x2a,
+    0xb1, 0x77, 0xfb, 0xa5, 0x1d, 0xb9, 0x2c, 0x2a
 };
 
 unsigned char bobpk[32] = {
-    0xde,0x9e,0xdb,0x7d,0x7b,0x7d,0xc1,0xb4,
-    0xd3,0x5b,0x61,0xc2,0xec,0xe4,0x35,0x37,
-    0x3f,0x83,0x43,0xc8,0x5b,0x78,0x67,0x4d,
-    0xad,0xfc,0x7e,0x14,0x6f,0x88,0x2b,0x4f
+    0xde, 0x9e, 0xdb, 0x7d, 0x7b, 0x7d, 0xc1, 0xb4,
+    0xd3, 0x5b, 0x61, 0xc2, 0xec, 0xe4, 0x35, 0x37,
+    0x3f, 0x83, 0x43, 0xc8, 0x5b, 0x78, 0x67, 0x4d,
+    0xad, 0xfc, 0x7e, 0x14, 0x6f, 0x88, 0x2b, 0x4f
 };
 
 unsigned char nonce[24] = {
-    0x69,0x69,0x6e,0xe9,0x55,0xb6,0x2b,0x73,
-    0xcd,0x62,0xbd,0xa8,0x75,0xfc,0x73,0xd6,
-    0x82,0x19,0xe0,0x03,0x6b,0x7a,0x0b,0x37
+    0x69, 0x69, 0x6e, 0xe9, 0x55, 0xb6, 0x2b, 0x73,
+    0xcd, 0x62, 0xbd, 0xa8, 0x75, 0xfc, 0x73, 0xd6,
+    0x82, 0x19, 0xe0, 0x03, 0x6b, 0x7a, 0x0b, 0x37
 };
 
 unsigned char test_m[131] = {
-    0xbe,0x07,0x5f,0xc5,0x3c,0x81,0xf2,0xd5,
-    0xcf,0x14,0x13,0x16,0xeb,0xeb,0x0c,0x7b,
-    0x52,0x28,0xc5,0x2a,0x4c,0x62,0xcb,0xd4,
-    0x4b,0x66,0x84,0x9b,0x64,0x24,0x4f,0xfc,
-    0xe5,0xec,0xba,0xaf,0x33,0xbd,0x75,0x1a,
-    0x1a,0xc7,0x28,0xd4,0x5e,0x6c,0x61,0x29,
-    0x6c,0xdc,0x3c,0x01,0x23,0x35,0x61,0xf4,
-    0x1d,0xb6,0x6c,0xce,0x31,0x4a,0xdb,0x31,
-    0x0e,0x3b,0xe8,0x25,0x0c,0x46,0xf0,0x6d,
-    0xce,0xea,0x3a,0x7f,0xa1,0x34,0x80,0x57,
-    0xe2,0xf6,0x55,0x6a,0xd6,0xb1,0x31,0x8a,
-    0x02,0x4a,0x83,0x8f,0x21,0xaf,0x1f,0xde,
-    0x04,0x89,0x77,0xeb,0x48,0xf5,0x9f,0xfd,
-    0x49,0x24,0xca,0x1c,0x60,0x90,0x2e,0x52,
-    0xf0,0xa0,0x89,0xbc,0x76,0x89,0x70,0x40,
-    0xe0,0x82,0xf9,0x37,0x76,0x38,0x48,0x64,
-    0x5e,0x07,0x05
+    0xbe, 0x07, 0x5f, 0xc5, 0x3c, 0x81, 0xf2, 0xd5,
+    0xcf, 0x14, 0x13, 0x16, 0xeb, 0xeb, 0x0c, 0x7b,
+    0x52, 0x28, 0xc5, 0x2a, 0x4c, 0x62, 0xcb, 0xd4,
+    0x4b, 0x66, 0x84, 0x9b, 0x64, 0x24, 0x4f, 0xfc,
+    0xe5, 0xec, 0xba, 0xaf, 0x33, 0xbd, 0x75, 0x1a,
+    0x1a, 0xc7, 0x28, 0xd4, 0x5e, 0x6c, 0x61, 0x29,
+    0x6c, 0xdc, 0x3c, 0x01, 0x23, 0x35, 0x61, 0xf4,
+    0x1d, 0xb6, 0x6c, 0xce, 0x31, 0x4a, 0xdb, 0x31,
+    0x0e, 0x3b, 0xe8, 0x25, 0x0c, 0x46, 0xf0, 0x6d,
+    0xce, 0xea, 0x3a, 0x7f, 0xa1, 0x34, 0x80, 0x57,
+    0xe2, 0xf6, 0x55, 0x6a, 0xd6, 0xb1, 0x31, 0x8a,
+    0x02, 0x4a, 0x83, 0x8f, 0x21, 0xaf, 0x1f, 0xde,
+    0x04, 0x89, 0x77, 0xeb, 0x48, 0xf5, 0x9f, 0xfd,
+    0x49, 0x24, 0xca, 0x1c, 0x60, 0x90, 0x2e, 0x52,
+    0xf0, 0xa0, 0x89, 0xbc, 0x76, 0x89, 0x70, 0x40,
+    0xe0, 0x82, 0xf9, 0x37, 0x76, 0x38, 0x48, 0x64,
+    0x5e, 0x07, 0x05
 };
 
 unsigned char test_c[147] = {
-    0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5,
-    0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9,
-    0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73,
-    0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce,
-    0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4,
-    0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a,
-    0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b,
-    0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72,
-    0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2,
-    0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38,
-    0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a,
-    0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae,
-    0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea,
-    0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda,
-    0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde,
-    0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3,
-    0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6,
-    0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74,
-    0xe3,0x55,0xa5
+    0xf3, 0xff, 0xc7, 0x70, 0x3f, 0x94, 0x00, 0xe5,
+    0x2a, 0x7d, 0xfb, 0x4b, 0x3d, 0x33, 0x05, 0xd9,
+    0x8e, 0x99, 0x3b, 0x9f, 0x48, 0x68, 0x12, 0x73,
+    0xc2, 0x96, 0x50, 0xba, 0x32, 0xfc, 0x76, 0xce,
+    0x48, 0x33, 0x2e, 0xa7, 0x16, 0x4d, 0x96, 0xa4,
+    0x47, 0x6f, 0xb8, 0xc5, 0x31, 0xa1, 0x18, 0x6a,
+    0xc0, 0xdf, 0xc1, 0x7c, 0x98, 0xdc, 0xe8, 0x7b,
+    0x4d, 0xa7, 0xf0, 0x11, 0xec, 0x48, 0xc9, 0x72,
+    0x71, 0xd2, 0xc2, 0x0f, 0x9b, 0x92, 0x8f, 0xe2,
+    0x27, 0x0d, 0x6f, 0xb8, 0x63, 0xd5, 0x17, 0x38,
+    0xb4, 0x8e, 0xee, 0xe3, 0x14, 0xa7, 0xcc, 0x8a,
+    0xb9, 0x32, 0x16, 0x45, 0x48, 0xe5, 0x26, 0xae,
+    0x90, 0x22, 0x43, 0x68, 0x51, 0x7a, 0xcf, 0xea,
+    0xbd, 0x6b, 0xb3, 0x73, 0x2b, 0xc0, 0xe9, 0xda,
+    0x99, 0x83, 0x2b, 0x61, 0xca, 0x01, 0xb6, 0xde,
+    0x56, 0x24, 0x4a, 0x9e, 0x88, 0xd5, 0xf9, 0xb3,
+    0x79, 0x73, 0xf6, 0x22, 0xa4, 0x3d, 0x14, 0xa6,
+    0x59, 0x9b, 0x1f, 0x65, 0x4c, 0xb4, 0x5a, 0x74,
+    0xe3, 0x55, 0xa5
 };
 
 START_TEST(test_known)
@@ -86,19 +86,20 @@ START_TEST(test_known)
     unsigned char m[131];
     int clen, mlen;
 
-    ck_assert_msg(sizeof(c) == sizeof(m) + ENCRYPTION_PADDING * sizeof(unsigned char), "cyphertext should be ENCRYPTION_PADDING bytes longer than plaintext");
+    ck_assert_msg(sizeof(c) == sizeof(m) + ENCRYPTION_PADDING * sizeof(unsigned char),
+                  "cyphertext should be ENCRYPTION_PADDING bytes longer than plaintext");
     ck_assert_msg(sizeof(test_c) == sizeof(c), "sanity check failed");
     ck_assert_msg(sizeof(test_m) == sizeof(m), "sanity check failed");
 
-    clen = encrypt_data(bobpk, alicesk, nonce, test_m, sizeof(test_m)/sizeof(unsigned char), c);
+    clen = encrypt_data(bobpk, alicesk, nonce, test_m, sizeof(test_m) / sizeof(unsigned char), c);
 
     ck_assert_msg(memcmp(test_c, c, sizeof(c)) == 0, "cyphertext doesn't match test vector");
-    ck_assert_msg(clen == sizeof(c)/sizeof(unsigned char), "wrong ciphertext length");
+    ck_assert_msg(clen == sizeof(c) / sizeof(unsigned char), "wrong ciphertext length");
 
-    mlen = decrypt_data(bobpk, alicesk, nonce, test_c, sizeof(test_c)/sizeof(unsigned char), m);
+    mlen = decrypt_data(bobpk, alicesk, nonce, test_c, sizeof(test_c) / sizeof(unsigned char), m);
 
     ck_assert_msg(memcmp(test_m, m, sizeof(m)) == 0, "decrypted text doesn't match test vector");
-    ck_assert_msg(mlen == sizeof(m)/sizeof(unsigned char), "wrong plaintext length");
+    ck_assert_msg(mlen == sizeof(m) / sizeof(unsigned char), "wrong plaintext length");
 }
 END_TEST
 
@@ -111,20 +112,21 @@ START_TEST(test_fast_known)
 
     encrypt_precompute(bobpk, alicesk, k);
 
-    ck_assert_msg(sizeof(c) == sizeof(m) + ENCRYPTION_PADDING * sizeof(unsigned char), "cyphertext should be ENCRYPTION_PADDING bytes longer than plaintext");
+    ck_assert_msg(sizeof(c) == sizeof(m) + ENCRYPTION_PADDING * sizeof(unsigned char),
+                  "cyphertext should be ENCRYPTION_PADDING bytes longer than plaintext");
     ck_assert_msg(sizeof(test_c) == sizeof(c), "sanity check failed");
     ck_assert_msg(sizeof(test_m) == sizeof(m), "sanity check failed");
 
-    clen = encrypt_data_fast(k, nonce, test_m, sizeof(test_m)/sizeof(unsigned char), c);
+    clen = encrypt_data_fast(k, nonce, test_m, sizeof(test_m) / sizeof(unsigned char), c);
 
     ck_assert_msg(memcmp(test_c, c, sizeof(c)) == 0, "cyphertext doesn't match test vector");
-    ck_assert_msg(clen == sizeof(c)/sizeof(unsigned char), "wrong ciphertext length");
+    ck_assert_msg(clen == sizeof(c) / sizeof(unsigned char), "wrong ciphertext length");
 
-    mlen = decrypt_data_fast(k, nonce, test_c, sizeof(test_c)/sizeof(unsigned char), m);
+    mlen = decrypt_data_fast(k, nonce, test_c, sizeof(test_c) / sizeof(unsigned char), m);
 
     ck_assert_msg(memcmp(test_m, m, sizeof(m)) == 0, "decrypted text doesn't match test vector");
-    ck_assert_msg(mlen == sizeof(m)/sizeof(unsigned char), "wrong plaintext length");
-   
+    ck_assert_msg(mlen == sizeof(m) / sizeof(unsigned char), "wrong plaintext length");
+
 }
 END_TEST
 
@@ -156,23 +158,22 @@ START_TEST(test_endtoend)
     int testno;
 
     // Test 100 random messages and keypairs
-    for (testno = 0; testno < 100; testno++)
-    {
+    for (testno = 0; testno < 100; testno++) {
         //Generate random message (random length from 100 to 500)
         mlen = (rand() % 400) + 100;
         rand_bytes(m, mlen);
         rand_bytes(n, crypto_box_NONCEBYTES);
-        
+
         //Generate keypairs
-        crypto_box_keypair(pk1,sk1);
-        crypto_box_keypair(pk2,sk2);
-        
+        crypto_box_keypair(pk1, sk1);
+        crypto_box_keypair(pk2, sk2);
+
         //Precompute shared keys
         encrypt_precompute(pk2, sk1, k1);
         encrypt_precompute(pk1, sk2, k2);
-        
+
         ck_assert_msg(memcmp(k1, k2, crypto_box_BEFORENMBYTES) == 0, "encrypt_precompute: bad");
-        
+
         //Encrypt all four ways
         c1len = encrypt_data(pk2, sk1, n, m, mlen, c1);
         c2len = encrypt_data(pk1, sk2, n, m, mlen, c2);
@@ -181,7 +182,8 @@ START_TEST(test_endtoend)
 
         ck_assert_msg(c1len == c2len && c1len == c3len && c1len == c4len, "cyphertext lengths differ");
         ck_assert_msg(c1len == mlen + ENCRYPTION_PADDING, "wrong cyphertext length");
-        ck_assert_msg(memcmp(c1, c2, c1len) == 0 && memcmp(c1, c3, c1len) == 0 && memcmp(c1, c4, c1len) == 0, "crypertexts differ");
+        ck_assert_msg(memcmp(c1, c2, c1len) == 0 && memcmp(c1, c3, c1len) == 0
+                      && memcmp(c1, c4, c1len) == 0, "crypertexts differ");
 
         //Decrypt all four ways
         m1len = decrypt_data(pk2, sk1, n, c1, c1len, m1);
@@ -191,7 +193,8 @@ START_TEST(test_endtoend)
 
         ck_assert_msg(m1len == m2len && m1len == m3len && m1len == m4len, "decrypted text lengths differ");
         ck_assert_msg(m1len == mlen, "wrong decrypted text length");
-        ck_assert_msg(memcmp(m1, m2, mlen) == 0 && memcmp(m1, m3, mlen) == 0 && memcmp(m1, m4, mlen) == 0, "decrypted texts differ");
+        ck_assert_msg(memcmp(m1, m2, mlen) == 0 && memcmp(m1, m3, mlen) == 0
+                      && memcmp(m1, m4, mlen) == 0, "decrypted texts differ");
         ck_assert_msg(memcmp(m1, m, mlen) == 0, "wrong decrypted text");
     }
 }
@@ -217,18 +220,18 @@ START_TEST(test_large_data)
     rand_bytes(m1, sizeof(m1));
     rand_bytes(m2, sizeof(m2));
     rand_bytes(n, crypto_box_NONCEBYTES);
-    
+
     //Generate key
     rand_bytes(k, crypto_box_BEFORENMBYTES);
-    
+
     c1len = encrypt_data_fast(k, n, m1, sizeof(m1), c1);
     c2len = encrypt_data_fast(k, n, m2, sizeof(m2), c2);
-    
+
     ck_assert_msg(c1len == sizeof(m1) + ENCRYPTION_PADDING, "Could not encrypt max size");
     ck_assert_msg(c2len == -1, "incorrectly succeeded encrypting massive size");
-    
+
     m1plen = decrypt_data_fast(k, n, c1, c1len, m1prime);
-    
+
     ck_assert_msg(m1plen == sizeof(m1), "decrypted text lengths differ");
     ck_assert_msg(memcmp(m1prime, m1, sizeof(m1)) == 0, "decrypted texts differ");
 }
@@ -239,7 +242,7 @@ END_TEST
     tcase_add_test(NAME, test_##NAME); \
     suite_add_tcase(s, NAME);
 
-Suite* crypto_suite(void)
+Suite *crypto_suite(void)
 {
     Suite *s = suite_create("Crypto");
 
@@ -251,7 +254,7 @@ Suite* crypto_suite(void)
     return s;
 }
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
     srand((unsigned int) time(NULL));
 
diff --git a/auto_tests/friends_test.c b/auto_tests/friends_test.c
index 3c15b35b..dd2db3e3 100755..100644
--- a/auto_tests/friends_test.c
+++ b/auto_tests/friends_test.c
@@ -56,22 +56,22 @@ void do_tox(void)
 {
     static int dht_on = 0;
 
-    if(!dht_on && DHT_isconnected()) {
+    if (!dht_on && DHT_isconnected()) {
         dht_on = 1;
-    } else if(dht_on && !DHT_isconnected()) {
+    } else if (dht_on && !DHT_isconnected()) {
         dht_on = 0;
     }
 
     doMessenger(m);
 }
 
-void parent_confirm_message(Messenger *m, int num, uint8_t *data, uint16_t length, void* userdata)
+void parent_confirm_message(Messenger *m, int num, uint8_t *data, uint16_t length, void *userdata)
 {
     puts("OK");
     request_flags |= SECOND_FLAG;
 }
 
-void parent_confirm_status(Messenger *m, int num, uint8_t *data, uint16_t length, void* userdata)
+void parent_confirm_status(Messenger *m, int num, uint8_t *data, uint16_t length, void *userdata)
 {
     puts("OK");
     request_flags |= FIRST_FLAG;
@@ -89,16 +89,18 @@ int parent_friend_request(void)
     m_addfriend(m, child_id, (uint8_t *)message, len);
 
     /* wait on the status change */
-    for(i = 0; i < WAIT_COUNT; i++) {
+    for (i = 0; i < WAIT_COUNT; i++) {
         do_tox();
-        if(request_flags & FIRST_FLAG)
+
+        if (request_flags & FIRST_FLAG)
             break;
+
         fputs(".", stdout);
         fflush(stdout);
         c_sleep(WAIT_TIME);
     }
 
-    if(!(request_flags & FIRST_FLAG)) {
+    if (!(request_flags & FIRST_FLAG)) {
         fputs("\nfriends_test: The child took to long to respond!\n"
               "Friend requests may be broken, failing build!\n", stderr);
         kill(child_pid, SIGKILL);
@@ -108,7 +110,7 @@ int parent_friend_request(void)
     return 0;
 }
 
-void child_got_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
+void child_got_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
 {
     fputs("OK\nsending status to parent", stdout);
     fflush(stdout);
@@ -116,7 +118,7 @@ void child_got_request(uint8_t *public_key, uint8_t *data, uint16_t length, void
     request_flags |= FIRST_FLAG;
 }
 
-void child_got_statuschange(Messenger *m, int friend_num, uint8_t *string, uint16_t length, void* userdata)
+void child_got_statuschange(Messenger *m, int friend_num, uint8_t *string, uint16_t length, void *userdata)
 {
     request_flags |= SECOND_FLAG;
 }
@@ -128,16 +130,18 @@ int parent_wait_for_message(void)
     fputs("Parent waiting for message.", stdout);
     fflush(stdout);
 
-    for(i = 0; i < WAIT_COUNT; i++) {
+    for (i = 0; i < WAIT_COUNT; i++) {
         do_tox();
-        if(request_flags & SECOND_FLAG)
+
+        if (request_flags & SECOND_FLAG)
             break;
+
         fputs(".", stdout);
         fflush(stdout);
         c_sleep(WAIT_TIME);
     }
 
-    if(!(request_flags & SECOND_FLAG)) {
+    if (!(request_flags & SECOND_FLAG)) {
         fputs("\nParent hasn't received the message yet!\n"
               "Messaging may be broken, failing the build!\n", stderr);
         kill(child_pid, SIGKILL);
@@ -160,12 +164,13 @@ int main(int argc, char *argv[])
 
     /* set up the global memory */
     parent_id = mmap(NULL, crypto_box_PUBLICKEYBYTES, PROT_READ | PROT_WRITE,
-                        MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+                     MAP_SHARED | MAP_ANONYMOUS, -1, 0);
     child_id = mmap(NULL, crypto_box_PUBLICKEYBYTES, PROT_READ | PROT_WRITE,
-                        MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+                    MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 
     fputs("friends_test: Starting test...\n", stdout);
-    if((child_pid = fork()) == 0) {
+
+    if ((child_pid = fork()) == 0) {
         /* child */
         int i = 0;
         char *message = "Y-yes Mr. Watson?";
@@ -179,14 +184,14 @@ int main(int argc, char *argv[])
         m_callback_statusmessage(m, child_got_statuschange, NULL);
 
         /* wait on the friend request */
-       while(!(request_flags & FIRST_FLAG))
+        while (!(request_flags & FIRST_FLAG))
             do_tox();
 
         /* wait for the status change */
-        while(!(request_flags & SECOND_FLAG))
+        while (!(request_flags & SECOND_FLAG))
             do_tox();
 
-        for(i = 0; i < 6; i++) {
+        for (i = 0; i < 6; i++) {
             /* send the message six times, just to be sure */
             m_sendmessage(m, 0, (uint8_t *)message, strlen(message));
             do_tox();
@@ -198,7 +203,7 @@ int main(int argc, char *argv[])
     }
 
     /* parent */
-    if(atexit(cleanup) != 0) {
+    if (atexit(cleanup) != 0) {
         fputs("friends_test: atexit() failed!\nFailing build...\n", stderr);
         kill(child_pid, SIGKILL);
         return -1;
@@ -215,10 +220,10 @@ int main(int argc, char *argv[])
 
     Messenger_save(m, parent_id);
 
-    if(parent_friend_request() == -1)
+    if (parent_friend_request() == -1)
         return -1;
 
-    if(parent_wait_for_message() == -1)
+    if (parent_wait_for_message() == -1)
         return -1;
 
     wait(NULL);
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index f04d3f10..374bc5a6 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -36,14 +36,16 @@ int friend_id_num = 0;
 
 Messenger *m;
 
-unsigned char * hex_string_to_bin(char hex_string[])
+unsigned char *hex_string_to_bin(char hex_string[])
 {
     size_t len = strlen(hex_string);
     unsigned char *val = calloc(1, len);
     char *pos = hex_string;
     int i = 0;
-    for(i = 0; i < len; ++i, pos+=2)
-        sscanf(pos,"%2hhx",&val[i]);
+
+    for (i = 0; i < len; ++i, pos += 2)
+        sscanf(pos, "%2hhx", &val[i]);
+
     return val;
 }
 
@@ -65,17 +67,17 @@ START_TEST(test_m_get_userstatus_size)
 {
     int rc = 0;
     ck_assert_msg((m_get_statusmessage_size(m, -1) == -1),
-                "m_get_statusmessage_size did NOT catch an argument of -1");
+                  "m_get_statusmessage_size did NOT catch an argument of -1");
     ck_assert_msg((m_get_statusmessage_size(m, REALLY_BIG_NUMBER) == -1),
-            "m_get_statusmessage_size did NOT catch the following argument: %d\n",
-                                                            REALLY_BIG_NUMBER);
+                  "m_get_statusmessage_size did NOT catch the following argument: %d\n",
+                  REALLY_BIG_NUMBER);
     rc = m_get_statusmessage_size(m, friend_id_num);
 
     /* this WILL error if the original m_addfriend_norequest() failed */
     ck_assert_msg((rc > 0 && rc <= MAX_STATUSMESSAGE_LENGTH),
-        "m_get_statusmessage_size is returning out of range values!\n"
-        "(this can be caused by the error of m_addfriend_norequest"
-        " in the beginning of the suite)\n");
+                  "m_get_statusmessage_size is returning out of range values!\n"
+                  "(this can be caused by the error of m_addfriend_norequest"
+                  " in the beginning of the suite)\n");
 }
 END_TEST
 
@@ -85,11 +87,11 @@ START_TEST(test_m_set_userstatus)
     uint16_t good_length = strlen(status);
     uint16_t bad_length = REALLY_BIG_NUMBER;
 
-    if(m_set_statusmessage(m, (uint8_t *)status, bad_length) != -1)
+    if (m_set_statusmessage(m, (uint8_t *)status, bad_length) != -1)
         ck_abort_msg("m_set_userstatus did NOT catch the following length: %d\n",
-                                                            REALLY_BIG_NUMBER);
+                     REALLY_BIG_NUMBER);
 
-    if((m_set_statusmessage(m, (uint8_t *)status, good_length)) != 0)
+    if ((m_set_statusmessage(m, (uint8_t *)status, good_length)) != 0)
         ck_abort_msg("m_set_userstatus did NOT return 0 on the following length: %d\n"
                      "MAX_STATUSMESSAGE_LENGTH: %d\n", good_length, MAX_STATUSMESSAGE_LENGTH);
 }
@@ -98,20 +100,20 @@ END_TEST
 START_TEST(test_m_friendstatus)
 {
     ck_assert_msg((m_friendstatus(m, -1) == NOFRIEND),
-        "m_friendstatus did NOT catch an argument of -1.\n");
+                  "m_friendstatus did NOT catch an argument of -1.\n");
     ck_assert_msg((m_friendstatus(m, REALLY_BIG_NUMBER) == NOFRIEND),
-        "m_friendstatus did NOT catch an argument of %d.\n",
-                                        REALLY_BIG_NUMBER);
+                  "m_friendstatus did NOT catch an argument of %d.\n",
+                  REALLY_BIG_NUMBER);
 }
 END_TEST
 
 START_TEST(test_m_delfriend)
 {
     ck_assert_msg((m_delfriend(m, -1) == -1),
-        "m_delfriend did NOT catch an argument of -1\n");
+                  "m_delfriend did NOT catch an argument of -1\n");
     ck_assert_msg((m_delfriend(m, REALLY_BIG_NUMBER) == -1),
-        "m_delfriend did NOT catch the following number: %d\n",
-                                            REALLY_BIG_NUMBER);
+                  "m_delfriend did NOT catch the following number: %d\n",
+                  REALLY_BIG_NUMBER);
 }
 END_TEST
 /*
@@ -124,12 +126,12 @@ START_TEST(test_m_addfriend)
     int bad_len = strlen(bad_data);
     int really_bad_len = (MAX_DATA_SIZE - crypto_box_PUBLICKEYBYTES
                      - crypto_box_NONCEBYTES - crypto_box_BOXZEROBYTES
-                                      + crypto_box_ZEROBYTES + 100); */   
+                                      + crypto_box_ZEROBYTES + 100); */
 /* TODO: Update this properly to latest master
     if(m_addfriend(m, (uint8_t *)friend_id, (uint8_t *)good_data, really_bad_len) != FAERR_TOOLONG)
         ck_abort_msg("m_addfriend did NOT catch the following length: %d\n", really_bad_len);
 */
-    /* this will error if the original m_addfriend_norequest() failed */
+/* this will error if the original m_addfriend_norequest() failed */
 /*    if(m_addfriend(m, (uint8_t *)friend_id, (uint8_t *)good_data, good_len) != FAERR_ALREADYSENT)
         ck_abort_msg("m_addfriend did NOT catch adding a friend we already have.\n"
                      "(this can be caused by the error of m_addfriend_norequest in"
@@ -138,13 +140,13 @@ START_TEST(test_m_addfriend)
     if(m_addfriend(m, (uint8_t *)good_id_b, (uint8_t *)bad_data, bad_len) != FAERR_NOMESSAGE)
         ck_abort_msg("m_addfriend did NOT catch the following length: %d\n", bad_len);
 */
-    /* this should REALLY error */
-    /*
-     * TODO: validate client_id in m_addfriend?
-    if(m_addfriend((uint8_t *)bad_id, (uint8_t *)good_data, good_len) >= 0)
-        ck_abort_msg("The following ID passed through "
-              "m_addfriend without an error:\n'%s'\n", bad_id_str);
-    
+/* this should REALLY error */
+/*
+ * TODO: validate client_id in m_addfriend?
+if(m_addfriend((uint8_t *)bad_id, (uint8_t *)good_data, good_len) >= 0)
+    ck_abort_msg("The following ID passed through "
+          "m_addfriend without an error:\n'%s'\n", bad_id_str);
+
 }
 END_TEST */
 
@@ -154,10 +156,11 @@ START_TEST(test_setname)
     int good_length = strlen(good_name);
     int bad_length = REALLY_BIG_NUMBER;
 
-    if(setname(m, (uint8_t *)good_name, bad_length) != -1)
+    if (setname(m, (uint8_t *)good_name, bad_length) != -1)
         ck_abort_msg("setname() did NOT error on %d as a length argument!\n",
-                                                                bad_length);
-    if(setname(m, (uint8_t *)good_name, good_length) != 0)
+                     bad_length);
+
+    if (setname(m, (uint8_t *)good_name, good_length) != 0)
         ck_abort_msg("setname() did NOT return 0 on good arguments!\n");
 }
 END_TEST
@@ -172,8 +175,8 @@ START_TEST(test_getself_name)
     getself_name(m, (uint8_t *)nick_check, len);
 
     ck_assert_msg((!STRINGS_EQUAL(nickname, nick_check)),
-        "getself_name failed to return the known name!\n"
-        "known name: %s\nreturned: %s\n", nickname, nick_check);
+                  "getself_name failed to return the known name!\n"
+                  "known name: %s\nreturned: %s\n", nickname, nick_check);
 }
 END_TEST
 
@@ -261,12 +264,12 @@ int main(int argc, char *argv[])
     m = initMessenger();
 
     /* setup a default friend and friendnum */
-    if(m_addfriend_norequest(m, (uint8_t *)friend_id) < 0)
+    if (m_addfriend_norequest(m, (uint8_t *)friend_id) < 0)
         fputs("m_addfriend_norequest() failed on a valid ID!\n"
               "this was CRITICAL to the test, and the build WILL fail.\n"
               "the tests will continue now...\n\n", stderr);
 
-    if((friend_id_num = getfriend_id(m, (uint8_t *)friend_id)) < 0)
+    if ((friend_id_num = getfriend_id(m, (uint8_t *)friend_id)) < 0)
         fputs("getfriend_id() failed on a valid ID!\n"
               "this was CRITICAL to the test, and the build WILL fail.\n"
               "the tests will continue now...\n\n", stderr);