Restyle cleanup: Expand CONST_FUNCTION and remove the macro.

toxcore/tox_api.c

@@ -16,35 +16,89 @@
         }                             \
     } while (0)
 
-//!TOKSTYLE-
+uint32_t tox_version_major(void)
+{
+    return TOX_VERSION_MAJOR;
+}
+uint32_t tox_version_minor(void)
+{
+    return TOX_VERSION_MINOR;
+}
+uint32_t tox_version_patch(void)
+{
+    return TOX_VERSION_PATCH;
+}
+uint32_t tox_public_key_size(void)
+{
+    return TOX_PUBLIC_KEY_SIZE;
+}
+uint32_t tox_secret_key_size(void)
+{
+    return TOX_SECRET_KEY_SIZE;
+}
+uint32_t tox_conference_uid_size(void)
+{
+    return TOX_CONFERENCE_UID_SIZE;
+}
+uint32_t tox_conference_id_size(void)
+{
+    return TOX_CONFERENCE_ID_SIZE;
+}
+uint32_t tox_nospam_size(void)
+{
+    return TOX_NOSPAM_SIZE;
+}
+uint32_t tox_address_size(void)
+{
+    return TOX_ADDRESS_SIZE;
+}
+uint32_t tox_max_name_length(void)
+{
+    return TOX_MAX_NAME_LENGTH;
+}
+uint32_t tox_max_status_message_length(void)
+{
+    return TOX_MAX_STATUS_MESSAGE_LENGTH;
+}
+uint32_t tox_max_friend_request_length(void)
+{
+    return TOX_MAX_FRIEND_REQUEST_LENGTH;
+}
+uint32_t tox_max_message_length(void)
+{
+    return TOX_MAX_MESSAGE_LENGTH;
+}
+uint32_t tox_max_custom_packet_size(void)
+{
+    return TOX_MAX_CUSTOM_PACKET_SIZE;
+}
+uint32_t tox_hash_length(void)
+{
+    return TOX_HASH_LENGTH;
+}
+uint32_t tox_file_id_length(void)
+{
+    return TOX_FILE_ID_LENGTH;
+}
+uint32_t tox_max_filename_length(void)
+{
+    return TOX_MAX_FILENAME_LENGTH;
+}
+uint32_t tox_max_hostname_length(void)
+{
+    return TOX_MAX_HOSTNAME_LENGTH;
+}
+uint32_t tox_dht_node_ip_string_size(void)
+{
+    return TOX_DHT_NODE_IP_STRING_SIZE;
+}
+uint32_t tox_dht_node_public_key_size(void)
+{
+    return TOX_DHT_NODE_PUBLIC_KEY_SIZE;
+}
 
-#define CONST_FUNCTION(lowercase, uppercase) \
-uint32_t tox_##lowercase(void) \
-{ \
-    return TOX_##uppercase; \
-}
-
-CONST_FUNCTION(version_major, VERSION_MAJOR)
-CONST_FUNCTION(version_minor, VERSION_MINOR)
-CONST_FUNCTION(version_patch, VERSION_PATCH)
-CONST_FUNCTION(public_key_size, PUBLIC_KEY_SIZE)
-CONST_FUNCTION(secret_key_size, SECRET_KEY_SIZE)
-CONST_FUNCTION(conference_uid_size, CONFERENCE_UID_SIZE)
-CONST_FUNCTION(conference_id_size, CONFERENCE_ID_SIZE)
-CONST_FUNCTION(nospam_size, NOSPAM_SIZE)
-CONST_FUNCTION(address_size, ADDRESS_SIZE)
-CONST_FUNCTION(max_name_length, MAX_NAME_LENGTH)
-CONST_FUNCTION(max_status_message_length, MAX_STATUS_MESSAGE_LENGTH)
-CONST_FUNCTION(max_friend_request_length, MAX_FRIEND_REQUEST_LENGTH)
-CONST_FUNCTION(max_message_length, MAX_MESSAGE_LENGTH)
-CONST_FUNCTION(max_custom_packet_size, MAX_CUSTOM_PACKET_SIZE)
-CONST_FUNCTION(hash_length, HASH_LENGTH)
-CONST_FUNCTION(file_id_length, FILE_ID_LENGTH)
-CONST_FUNCTION(max_filename_length, MAX_FILENAME_LENGTH)
-CONST_FUNCTION(max_hostname_length, MAX_HOSTNAME_LENGTH)
-CONST_FUNCTION(dht_node_ip_string_size, DHT_NODE_IP_STRING_SIZE)
-CONST_FUNCTION(dht_node_public_key_size, DHT_NODE_PUBLIC_KEY_SIZE)
 
+//!TOKSTYLE-
 
 #define ACCESSORS(type, ns, name) \
 type tox_options_get_##ns##name(const struct Tox_Options *options) \

toxcore/tox_test.cc

@@ -5,6 +5,7 @@
 #include <array>
 
 #include "crypto_core.h"
+#include "tox_private.h"
 
 namespace {
 
@@ -19,6 +20,36 @@ static void set_random_name_and_status_message(Tox *tox, uint8_t *name, uint8_t
     }
 }
 
+TEST(Tox, CurrentVersionIsCompatibleWithItself)
+{
+    EXPECT_TRUE(
+        TOX_VERSION_IS_API_COMPATIBLE(TOX_VERSION_MAJOR, TOX_VERSION_MINOR, TOX_VERSION_PATCH));
+    EXPECT_TRUE(TOX_VERSION_IS_ABI_COMPATIBLE());
+    EXPECT_TRUE(
+        tox_version_is_compatible(tox_version_major(), tox_version_minor(), tox_version_patch()));
+}
+
+TEST(Tox, ConstantsAreNonZero)
+{
+    EXPECT_GT(tox_public_key_size(), 0);
+    EXPECT_GT(tox_secret_key_size(), 0);
+    EXPECT_GT(tox_conference_uid_size(), 0);
+    EXPECT_GT(tox_conference_id_size(), 0);
+    EXPECT_GT(tox_nospam_size(), 0);
+    EXPECT_GT(tox_address_size(), 0);
+    EXPECT_GT(tox_max_name_length(), 0);
+    EXPECT_GT(tox_max_status_message_length(), 0);
+    EXPECT_GT(tox_max_friend_request_length(), 0);
+    EXPECT_GT(tox_max_message_length(), 0);
+    EXPECT_GT(tox_max_custom_packet_size(), 0);
+    EXPECT_GT(tox_hash_length(), 0);
+    EXPECT_GT(tox_file_id_length(), 0);
+    EXPECT_GT(tox_max_filename_length(), 0);
+    EXPECT_GT(tox_max_hostname_length(), 0);
+    EXPECT_GT(tox_dht_node_ip_string_size(), 0);
+    EXPECT_GT(tox_dht_node_public_key_size(), 0);
+}
+
 TEST(Tox, BootstrapErrorCodes)
 {
     Tox *tox = tox_new(nullptr, nullptr);