diff --git a/external/toxcore/c-toxcore/other/event_tooling/generate_event_c.cpp b/external/toxcore/c-toxcore/other/event_tooling/generate_event_c.cpp index c3322480..92b01060 100644 --- a/external/toxcore/c-toxcore/other/event_tooling/generate_event_c.cpp +++ b/external/toxcore/c-toxcore/other/event_tooling/generate_event_c.cpp @@ -306,7 +306,7 @@ void generate_event_impl(const std::string& event_name, std::vector e f << " Tox_Event_" << event_name << " *event, Bin_Unpack *bu)\n{\n"; f << " assert(event != nullptr);\n"; if (event_types.size() > 1) { - f << " if (!bin_unpack_array_fixed(bu, " << event_types.size() << ")) {\n return false;\n }\n\n"; + f << " if (!bin_unpack_array_fixed(bu, " << event_types.size() << ", nullptr)) {\n return false;\n }\n\n"; } bool first = true; diff --git a/external/toxcore/c-toxcore/toxcore/events/group_custom_packet.c b/external/toxcore/c-toxcore/toxcore/events/group_custom_packet.c index 395c4eeb..8bfc8192 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_custom_packet.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_custom_packet.c @@ -120,7 +120,7 @@ static bool tox_event_group_custom_packet_unpack( Tox_Event_Group_Custom_Packet *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 3)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_custom_private_packet.c b/external/toxcore/c-toxcore/toxcore/events/group_custom_private_packet.c index bbae8658..2d752593 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_custom_private_packet.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_custom_private_packet.c @@ -120,7 +120,7 @@ static bool tox_event_group_custom_private_packet_unpack( Tox_Event_Group_Custom_Private_Packet *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 3)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_invite.c b/external/toxcore/c-toxcore/toxcore/events/group_invite.c index dddc1f48..8522bb9c 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_invite.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_invite.c @@ -142,7 +142,7 @@ static bool tox_event_group_invite_unpack( Tox_Event_Group_Invite *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 3)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_join_fail.c b/external/toxcore/c-toxcore/toxcore/events/group_join_fail.c index c6c28531..347fa120 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_join_fail.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_join_fail.c @@ -84,7 +84,7 @@ static bool tox_event_group_join_fail_unpack( Tox_Event_Group_Join_Fail *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 2)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_message.c b/external/toxcore/c-toxcore/toxcore/events/group_message.c index ab4d23d4..992ad4b7 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_message.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_message.c @@ -150,7 +150,7 @@ static bool tox_event_group_message_unpack( Tox_Event_Group_Message *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 5)) { + if (!bin_unpack_array_fixed(bu, 5, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_moderation.c b/external/toxcore/c-toxcore/toxcore/events/group_moderation.c index 5015994a..f6b7d17f 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_moderation.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_moderation.c @@ -114,7 +114,7 @@ static bool tox_event_group_moderation_unpack( Tox_Event_Group_Moderation *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 4)) { + if (!bin_unpack_array_fixed(bu, 4, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_password.c b/external/toxcore/c-toxcore/toxcore/events/group_password.c index 45b2650b..2bf16d3a 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_password.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_password.c @@ -105,7 +105,7 @@ static bool tox_event_group_password_unpack( Tox_Event_Group_Password *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 2)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_peer_exit.c b/external/toxcore/c-toxcore/toxcore/events/group_peer_exit.c index 20d11b2e..81085d38 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_peer_exit.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_exit.c @@ -172,7 +172,7 @@ static bool tox_event_group_peer_exit_unpack( Tox_Event_Group_Peer_Exit *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 5)) { + if (!bin_unpack_array_fixed(bu, 5, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_peer_join.c b/external/toxcore/c-toxcore/toxcore/events/group_peer_join.c index cff0e680..d872611a 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_peer_join.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_join.c @@ -84,7 +84,7 @@ static bool tox_event_group_peer_join_unpack( Tox_Event_Group_Peer_Join *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 2)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_peer_limit.c b/external/toxcore/c-toxcore/toxcore/events/group_peer_limit.c index 0cdf6c41..2c1f21d8 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_peer_limit.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_limit.c @@ -84,7 +84,7 @@ static bool tox_event_group_peer_limit_unpack( Tox_Event_Group_Peer_Limit *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 2)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_peer_name.c b/external/toxcore/c-toxcore/toxcore/events/group_peer_name.c index b5eb859d..6de30457 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_peer_name.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_name.c @@ -120,7 +120,7 @@ static bool tox_event_group_peer_name_unpack( Tox_Event_Group_Peer_Name *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 3)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_peer_status.c b/external/toxcore/c-toxcore/toxcore/events/group_peer_status.c index b5e63b66..0a290e98 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_peer_status.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_peer_status.c @@ -99,7 +99,7 @@ static bool tox_event_group_peer_status_unpack( Tox_Event_Group_Peer_Status *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 3)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_privacy_state.c b/external/toxcore/c-toxcore/toxcore/events/group_privacy_state.c index caa00f03..dfad858a 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_privacy_state.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_privacy_state.c @@ -84,7 +84,7 @@ static bool tox_event_group_privacy_state_unpack( Tox_Event_Group_Privacy_State *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 2)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_private_message.c b/external/toxcore/c-toxcore/toxcore/events/group_private_message.c index f5af54a4..9fed263a 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_private_message.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_private_message.c @@ -135,7 +135,7 @@ static bool tox_event_group_private_message_unpack( Tox_Event_Group_Private_Message *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 4)) { + if (!bin_unpack_array_fixed(bu, 4, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_topic.c b/external/toxcore/c-toxcore/toxcore/events/group_topic.c index c9d81523..ca213e9a 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_topic.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_topic.c @@ -120,7 +120,7 @@ static bool tox_event_group_topic_unpack( Tox_Event_Group_Topic *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 3)) { + if (!bin_unpack_array_fixed(bu, 3, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_topic_lock.c b/external/toxcore/c-toxcore/toxcore/events/group_topic_lock.c index 898fe6e3..b9c2c27c 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_topic_lock.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_topic_lock.c @@ -84,7 +84,7 @@ static bool tox_event_group_topic_lock_unpack( Tox_Event_Group_Topic_Lock *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 2)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; } diff --git a/external/toxcore/c-toxcore/toxcore/events/group_voice_state.c b/external/toxcore/c-toxcore/toxcore/events/group_voice_state.c index 8169efad..efc9d135 100644 --- a/external/toxcore/c-toxcore/toxcore/events/group_voice_state.c +++ b/external/toxcore/c-toxcore/toxcore/events/group_voice_state.c @@ -84,7 +84,7 @@ static bool tox_event_group_voice_state_unpack( Tox_Event_Group_Voice_State *event, Bin_Unpack *bu) { assert(event != nullptr); - if (!bin_unpack_array_fixed(bu, 2)) { + if (!bin_unpack_array_fixed(bu, 2, nullptr)) { return false; }