libtox: update to 0.2.20

1 files changed, 55 insertions, 55 deletions

diff --git a/protocols/Tox/libtox/src/toxcore/tox_unpack.c b/protocols/Tox/libtox/src/toxcore/tox_unpack.c
index b5e05da872..5caef02c07 100644
--- a/protocols/Tox/libtox/src/toxcore/tox_unpack.c
+++ b/protocols/Tox/libtox/src/toxcore/tox_unpack.c
@@ -11,21 +11,21 @@
 #include "tox.h"
 
 non_null()
-static bool tox_conference_type_from_int(uint32_t value, Tox_Conference_Type *out)
+static bool tox_conference_type_from_int(uint32_t value, Tox_Conference_Type *out_enum)
 {
     switch (value) {
         case TOX_CONFERENCE_TYPE_TEXT: {
-            *out = TOX_CONFERENCE_TYPE_TEXT;
+            *out_enum = TOX_CONFERENCE_TYPE_TEXT;
             return true;
         }
 
         case TOX_CONFERENCE_TYPE_AV: {
-            *out = TOX_CONFERENCE_TYPE_AV;
+            *out_enum = TOX_CONFERENCE_TYPE_AV;
             return true;
         }
 
         default: {
-            *out = TOX_CONFERENCE_TYPE_TEXT;
+            *out_enum = TOX_CONFERENCE_TYPE_TEXT;
             return false;
         }
     }
@@ -38,26 +38,26 @@ bool tox_conference_type_unpack(Tox_Conference_Type *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_connection_from_int(uint32_t value, Tox_Connection *out)
+static bool tox_connection_from_int(uint32_t value, Tox_Connection *out_enum)
 {
     switch (value) {
         case TOX_CONNECTION_NONE: {
-            *out = TOX_CONNECTION_NONE;
+            *out_enum = TOX_CONNECTION_NONE;
             return true;
         }
 
         case TOX_CONNECTION_TCP: {
-            *out = TOX_CONNECTION_TCP;
+            *out_enum = TOX_CONNECTION_TCP;
             return true;
         }
 
         case TOX_CONNECTION_UDP: {
-            *out = TOX_CONNECTION_UDP;
+            *out_enum = TOX_CONNECTION_UDP;
             return true;
         }
 
         default: {
-            *out = TOX_CONNECTION_NONE;
+            *out_enum = TOX_CONNECTION_NONE;
             return false;
         }
     }
@@ -71,26 +71,26 @@ bool tox_connection_unpack(Tox_Connection *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_file_control_from_int(uint32_t value, Tox_File_Control *out)
+static bool tox_file_control_from_int(uint32_t value, Tox_File_Control *out_enum)
 {
     switch (value) {
         case TOX_FILE_CONTROL_RESUME: {
-            *out = TOX_FILE_CONTROL_RESUME;
+            *out_enum = TOX_FILE_CONTROL_RESUME;
             return true;
         }
 
         case TOX_FILE_CONTROL_PAUSE: {
-            *out = TOX_FILE_CONTROL_PAUSE;
+            *out_enum = TOX_FILE_CONTROL_PAUSE;
             return true;
         }
 
         case TOX_FILE_CONTROL_CANCEL: {
-            *out = TOX_FILE_CONTROL_CANCEL;
+            *out_enum = TOX_FILE_CONTROL_CANCEL;
             return true;
         }
 
         default: {
-            *out = TOX_FILE_CONTROL_RESUME;
+            *out_enum = TOX_FILE_CONTROL_RESUME;
             return false;
         }
     }
@@ -104,21 +104,21 @@ bool tox_file_control_unpack(Tox_File_Control *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_message_type_from_int(uint32_t value, Tox_Message_Type *out)
+static bool tox_message_type_from_int(uint32_t value, Tox_Message_Type *out_enum)
 {
     switch (value) {
         case TOX_MESSAGE_TYPE_NORMAL: {
-            *out = TOX_MESSAGE_TYPE_NORMAL;
+            *out_enum = TOX_MESSAGE_TYPE_NORMAL;
             return true;
         }
 
         case TOX_MESSAGE_TYPE_ACTION: {
-            *out = TOX_MESSAGE_TYPE_ACTION;
+            *out_enum = TOX_MESSAGE_TYPE_ACTION;
             return true;
         }
 
         default: {
-            *out = TOX_MESSAGE_TYPE_NORMAL;
+            *out_enum = TOX_MESSAGE_TYPE_NORMAL;
             return false;
         }
     }
@@ -132,26 +132,26 @@ bool tox_message_type_unpack(Tox_Message_Type *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_user_status_from_int(uint32_t value, Tox_User_Status *out)
+static bool tox_user_status_from_int(uint32_t value, Tox_User_Status *out_enum)
 {
     switch (value) {
         case TOX_USER_STATUS_NONE: {
-            *out = TOX_USER_STATUS_NONE;
+            *out_enum = TOX_USER_STATUS_NONE;
             return true;
         }
 
         case TOX_USER_STATUS_AWAY: {
-            *out = TOX_USER_STATUS_AWAY;
+            *out_enum = TOX_USER_STATUS_AWAY;
             return true;
         }
 
         case TOX_USER_STATUS_BUSY: {
-            *out = TOX_USER_STATUS_BUSY;
+            *out_enum = TOX_USER_STATUS_BUSY;
             return true;
         }
 
         default: {
-            *out = TOX_USER_STATUS_NONE;
+            *out_enum = TOX_USER_STATUS_NONE;
             return false;
         }
     }
@@ -165,19 +165,19 @@ bool tox_user_status_unpack(Tox_User_Status *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_group_privacy_state_from_int(uint32_t value, Tox_Group_Privacy_State *out)
+static bool tox_group_privacy_state_from_int(uint32_t value, Tox_Group_Privacy_State *out_enum)
 {
     switch (value) {
         case TOX_GROUP_PRIVACY_STATE_PUBLIC: {
-            *out = TOX_GROUP_PRIVACY_STATE_PUBLIC;
+            *out_enum = TOX_GROUP_PRIVACY_STATE_PUBLIC;
             return true;
         }
         case TOX_GROUP_PRIVACY_STATE_PRIVATE: {
-            *out = TOX_GROUP_PRIVACY_STATE_PRIVATE;
+            *out_enum = TOX_GROUP_PRIVACY_STATE_PRIVATE;
             return true;
         }
         default: {
-            *out = TOX_GROUP_PRIVACY_STATE_PUBLIC;
+            *out_enum = TOX_GROUP_PRIVACY_STATE_PUBLIC;
             return false;
         }
     }
@@ -189,23 +189,23 @@ bool tox_group_privacy_state_unpack(Tox_Group_Privacy_State *val, Bin_Unpack *bu
            && tox_group_privacy_state_from_int(u32, val);
 }
 non_null()
-static bool tox_group_voice_state_from_int(uint32_t value, Tox_Group_Voice_State *out)
+static bool tox_group_voice_state_from_int(uint32_t value, Tox_Group_Voice_State *out_enum)
 {
     switch (value) {
         case TOX_GROUP_VOICE_STATE_ALL: {
-            *out = TOX_GROUP_VOICE_STATE_ALL;
+            *out_enum = TOX_GROUP_VOICE_STATE_ALL;
             return true;
         }
         case TOX_GROUP_VOICE_STATE_MODERATOR: {
-            *out = TOX_GROUP_VOICE_STATE_MODERATOR;
+            *out_enum = TOX_GROUP_VOICE_STATE_MODERATOR;
             return true;
         }
         case TOX_GROUP_VOICE_STATE_FOUNDER: {
-            *out = TOX_GROUP_VOICE_STATE_FOUNDER;
+            *out_enum = TOX_GROUP_VOICE_STATE_FOUNDER;
             return true;
         }
         default: {
-            *out = TOX_GROUP_VOICE_STATE_ALL;
+            *out_enum = TOX_GROUP_VOICE_STATE_ALL;
             return false;
         }
     }
@@ -218,19 +218,19 @@ bool tox_group_voice_state_unpack(Tox_Group_Voice_State *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_group_topic_lock_from_int(uint32_t value, Tox_Group_Topic_Lock *out)
+static bool tox_group_topic_lock_from_int(uint32_t value, Tox_Group_Topic_Lock *out_enum)
 {
     switch (value) {
         case TOX_GROUP_TOPIC_LOCK_ENABLED: {
-            *out = TOX_GROUP_TOPIC_LOCK_ENABLED;
+            *out_enum = TOX_GROUP_TOPIC_LOCK_ENABLED;
             return true;
         }
         case TOX_GROUP_TOPIC_LOCK_DISABLED: {
-            *out = TOX_GROUP_TOPIC_LOCK_DISABLED;
+            *out_enum = TOX_GROUP_TOPIC_LOCK_DISABLED;
             return true;
         }
         default: {
-            *out = TOX_GROUP_TOPIC_LOCK_ENABLED;
+            *out_enum = TOX_GROUP_TOPIC_LOCK_ENABLED;
             return false;
         }
     }
@@ -243,23 +243,23 @@ bool tox_group_topic_lock_unpack(Tox_Group_Topic_Lock *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_group_join_fail_from_int(uint32_t value, Tox_Group_Join_Fail *out)
+static bool tox_group_join_fail_from_int(uint32_t value, Tox_Group_Join_Fail *out_enum)
 {
     switch (value) {
         case TOX_GROUP_JOIN_FAIL_PEER_LIMIT: {
-            *out = TOX_GROUP_JOIN_FAIL_PEER_LIMIT;
+            *out_enum = TOX_GROUP_JOIN_FAIL_PEER_LIMIT;
             return true;
         }
         case TOX_GROUP_JOIN_FAIL_INVALID_PASSWORD: {
-            *out = TOX_GROUP_JOIN_FAIL_INVALID_PASSWORD;
+            *out_enum = TOX_GROUP_JOIN_FAIL_INVALID_PASSWORD;
             return true;
         }
         case TOX_GROUP_JOIN_FAIL_UNKNOWN: {
-            *out = TOX_GROUP_JOIN_FAIL_UNKNOWN;
+            *out_enum = TOX_GROUP_JOIN_FAIL_UNKNOWN;
             return true;
         }
         default: {
-            *out = TOX_GROUP_JOIN_FAIL_PEER_LIMIT;
+            *out_enum = TOX_GROUP_JOIN_FAIL_PEER_LIMIT;
             return false;
         }
     }
@@ -272,27 +272,27 @@ bool tox_group_join_fail_unpack(Tox_Group_Join_Fail *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_group_mod_event_from_int(uint32_t value, Tox_Group_Mod_Event *out)
+static bool tox_group_mod_event_from_int(uint32_t value, Tox_Group_Mod_Event *out_enum)
 {
     switch (value) {
         case TOX_GROUP_MOD_EVENT_KICK: {
-            *out = TOX_GROUP_MOD_EVENT_KICK;
+            *out_enum = TOX_GROUP_MOD_EVENT_KICK;
             return true;
         }
         case TOX_GROUP_MOD_EVENT_OBSERVER: {
-            *out = TOX_GROUP_MOD_EVENT_OBSERVER;
+            *out_enum = TOX_GROUP_MOD_EVENT_OBSERVER;
             return true;
         }
         case TOX_GROUP_MOD_EVENT_USER: {
-            *out = TOX_GROUP_MOD_EVENT_USER;
+            *out_enum = TOX_GROUP_MOD_EVENT_USER;
             return true;
         }
         case TOX_GROUP_MOD_EVENT_MODERATOR: {
-            *out = TOX_GROUP_MOD_EVENT_MODERATOR;
+            *out_enum = TOX_GROUP_MOD_EVENT_MODERATOR;
             return true;
         }
         default: {
-            *out = TOX_GROUP_MOD_EVENT_KICK;
+            *out_enum = TOX_GROUP_MOD_EVENT_KICK;
             return false;
         }
     }
@@ -305,35 +305,35 @@ bool tox_group_mod_event_unpack(Tox_Group_Mod_Event *val, Bin_Unpack *bu)
 }
 
 non_null()
-static bool tox_group_exit_type_from_int(uint32_t value, Tox_Group_Exit_Type *out)
+static bool tox_group_exit_type_from_int(uint32_t value, Tox_Group_Exit_Type *out_enum)
 {
     switch (value) {
         case TOX_GROUP_EXIT_TYPE_QUIT: {
-            *out = TOX_GROUP_EXIT_TYPE_QUIT;
+            *out_enum = TOX_GROUP_EXIT_TYPE_QUIT;
             return true;
         }
         case TOX_GROUP_EXIT_TYPE_TIMEOUT: {
-            *out = TOX_GROUP_EXIT_TYPE_TIMEOUT;
+            *out_enum = TOX_GROUP_EXIT_TYPE_TIMEOUT;
             return true;
         }
         case TOX_GROUP_EXIT_TYPE_DISCONNECTED: {
-            *out = TOX_GROUP_EXIT_TYPE_DISCONNECTED;
+            *out_enum = TOX_GROUP_EXIT_TYPE_DISCONNECTED;
             return true;
         }
         case TOX_GROUP_EXIT_TYPE_SELF_DISCONNECTED: {
-            *out = TOX_GROUP_EXIT_TYPE_SELF_DISCONNECTED;
+            *out_enum = TOX_GROUP_EXIT_TYPE_SELF_DISCONNECTED;
             return true;
         }
         case TOX_GROUP_EXIT_TYPE_KICK: {
-            *out = TOX_GROUP_EXIT_TYPE_KICK;
+            *out_enum = TOX_GROUP_EXIT_TYPE_KICK;
             return true;
         }
         case TOX_GROUP_EXIT_TYPE_SYNC_ERROR: {
-            *out = TOX_GROUP_EXIT_TYPE_SYNC_ERROR;
+            *out_enum = TOX_GROUP_EXIT_TYPE_SYNC_ERROR;
             return true;
         }
         default: {
-            *out = TOX_GROUP_EXIT_TYPE_QUIT;
+            *out_enum = TOX_GROUP_EXIT_TYPE_QUIT;
             return false;
         }
     }