Merged normal message function and send action function into one

messaging function.

This removes code duplication and allows us to easily add new message
types to the api without having to add new functions.

2 files changed, 12 insertions, 7 deletions

diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index 2e1fe92a..2a813c9b 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -50,10 +50,10 @@ START_TEST(test_m_sendmesage)
     int bad_len = MAX_CRYPTO_PACKET_SIZE;
 
 
-    ck_assert(m_sendmessage(m, -1, (uint8_t *)message, good_len, 0) == -1);
-    ck_assert(m_sendmessage(m, REALLY_BIG_NUMBER, (uint8_t *)message, good_len, 0) == -1);
-    ck_assert(m_sendmessage(m, 17, (uint8_t *)message, good_len, 0) == -1);
-    ck_assert(m_sendmessage(m, friend_id_num, (uint8_t *)message, bad_len, 0) == -2);
+    ck_assert(m_send_message_generic(m, -1, MESSAGE_NORMAL, (uint8_t *)message, good_len, 0) == -1);
+    ck_assert(m_send_message_generic(m, REALLY_BIG_NUMBER, MESSAGE_NORMAL, (uint8_t *)message, good_len, 0) == -1);
+    ck_assert(m_send_message_generic(m, 17, MESSAGE_NORMAL, (uint8_t *)message, good_len, 0) == -1);
+    ck_assert(m_send_message_generic(m, friend_id_num, MESSAGE_NORMAL, (uint8_t *)message, bad_len, 0) == -2);
 }
 END_TEST
 
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index 6a318fe0..abffafeb 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -33,11 +33,16 @@ void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *dat
 }
 uint32_t messages_received;
 
-void print_message(Tox *m, uint32_t friendnumber, const uint8_t *string, size_t length, void *userdata)
+void print_message(Tox *m, uint32_t friendnumber, TOX_MESSAGE_TYPE type, const uint8_t *string, size_t length,
+                   void *userdata)
 {
     if (*((uint32_t *)userdata) != 974536)
         return;
 
+    if (type != TOX_MESSAGE_TYPE_MESSAGE) {
+        ck_abort_msg("Bad type");
+    }
+
     uint8_t cmp_msg[TOX_MAX_MESSAGE_LENGTH];
     memset(cmp_msg, 'G', sizeof(cmp_msg));
 
@@ -395,9 +400,9 @@ START_TEST(test_few_clients)
     uint8_t msgs[TOX_MAX_MESSAGE_LENGTH + 1];
     memset(msgs, 'G', sizeof(msgs));
     TOX_ERR_FRIEND_SEND_MESSAGE errm;
-    tox_friend_send_message(tox2, 0, msgs, TOX_MAX_MESSAGE_LENGTH + 1, &errm);
+    tox_friend_send_message(tox2, 0, TOX_MESSAGE_TYPE_MESSAGE, msgs, TOX_MAX_MESSAGE_LENGTH + 1, &errm);
     ck_assert_msg(errm == TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG, "TOX_MAX_MESSAGE_LENGTH is too small\n");
-    tox_friend_send_message(tox2, 0, msgs, TOX_MAX_MESSAGE_LENGTH, &errm);
+    tox_friend_send_message(tox2, 0, TOX_MESSAGE_TYPE_MESSAGE, msgs, TOX_MAX_MESSAGE_LENGTH, &errm);
     ck_assert_msg(errm == TOX_ERR_FRIEND_SEND_MESSAGE_OK, "TOX_MAX_MESSAGE_LENGTH is too big\n");
 
     while (1) {