From 55dececf90fc9c221a0e4b8692784a60e61c2abd Mon Sep 17 00:00:00 2001
From: irungentoo <irungentoo@gmail.com>
Date: Wed, 23 Oct 2013 14:49:59 -0400
Subject: Code cleanups.

Fixed some tests.
---
 auto_tests/messenger_test.c | 18 +++++++++---------
 testing/Messenger_test.c    | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index 605fa4f3..52c49650 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -276,18 +276,18 @@ START_TEST(test_messenger_state_saveloadsave)
      * c) a second save() is of equal size
      * d) the second save() is of equal content */
     size_t i, extra = 64;
-    size_t size = Messenger_size(m);
+    size_t size = messenger_size(m);
     uint8_t buffer[size + 2 * extra];
     memset(buffer, 0xCD, extra);
     memset(buffer + extra + size, 0xCD, extra);
-    Messenger_save(m, buffer + extra);
+    messenger_save(m, buffer + extra);
 
     for (i = 0; i < extra; i++) {
-        ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from Messenger_save() @%u", i);
-        ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from Messenger_save() @%u", i);
+        ck_assert_msg(buffer[i] == 0xCD, "Buffer underwritten from messenger_save() @%u", i);
+        ck_assert_msg(buffer[extra + size + i] == 0xCD, "Buffer overwritten from messenger_save() @%u", i);
     }
 
-    int res = Messenger_load(m, buffer + extra, size);
+    int res = messenger_load(m, buffer + extra, size);
 
     if (res == -1)
         ck_assert_msg(res == 0, "Failed to load back stored buffer: res == -1");
@@ -300,11 +300,11 @@ START_TEST(test_messenger_state_saveloadsave)
         ck_assert_msg(res == 0, msg);
     }
 
-    size_t size2 = Messenger_size(m);
+    size_t size2 = messenger_size(m);
     ck_assert_msg(size == size2, "Messenger \"grew\" in size from a store/load cycle: %u -> %u", size, size2);
 
     uint8_t buffer2[size2];
-    Messenger_save(m, buffer2);
+    messenger_save(m, buffer2);
 
     ck_assert_msg(!memcmp(buffer + extra, buffer2, size), "Messenger state changed by store/load/store cycle");
 }
@@ -350,7 +350,7 @@ int main(int argc, char *argv[])
     bad_id    = hex_string_to_bin(bad_id_str);
 
     /* IPv6 status from global define */
-    m = initMessenger(TOX_ENABLE_IPV6_DEFAULT);
+    m = new_messenger(TOX_ENABLE_IPV6_DEFAULT);
 
     /* setup a default friend and friendnum */
     if (m_addfriend_norequest(m, (uint8_t *)friend_id) < 0)
@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
     free(good_id_b);
     free(bad_id);
 
-    cleanupMessenger(m);
+    kill_messenger(m);
 
     return number_failed;
 }
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 619d94b1..82dbd43c 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
-    m = initMessenger(ipv6enabled);
+    m = new_messenger(ipv6enabled);
 
     if ( !m ) {
         fputs("Failed to allocate messenger datastructure\n", stderr);
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
         int read;
         uint8_t buffer[128000];
         read = fread(buffer, 1, 128000, file);
-        printf("Messenger loaded: %i\n", Messenger_load(m, buffer, read));
+        printf("Messenger loaded: %i\n", messenger_load(m, buffer, read));
         fclose(file);
 
     }
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
         printf("%s\n", name);
 
         m_sendmessage(m, num, (uint8_t *)"Test", 5);
-        doMessenger(m);
+        do_messenger(m);
         c_sleep(30);
         FILE *file = fopen("Save.bak", "wb");
 
@@ -186,11 +186,11 @@ int main(int argc, char *argv[])
             return 1;
         }
 
-        uint8_t *buffer = malloc(Messenger_size(m));
-        Messenger_save(m, buffer);
-        size_t write_result = fwrite(buffer, 1, Messenger_size(m), file);
+        uint8_t *buffer = malloc(messenger_size(m));
+        messenger_save(m, buffer);
+        size_t write_result = fwrite(buffer, 1, messenger_size(m), file);
 
-        if (write_result < Messenger_size(m)) {
+        if (write_result < messenger_size(m)) {
             return 1;
         }
 
@@ -198,5 +198,5 @@ int main(int argc, char *argv[])
         fclose(file);
     }
 
-    cleanupMessenger(m);
+    kill_messenger(m);
 }
-- 
cgit v1.2.3