forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 73d9b845a3..e2c01e457b
e2c01e457b refactor: Use enum-specific pack functions for enum values. afc472402b refactor: Factor out union pack switch from event packer. 6caa7ce4b1 cleanup: Move the 2-element array pack out of individual events. 687af81f20 cleanup: Remove empty test doing nothing. fcf5882428 test: Add printf log statement to group_moderation_test. b4d8826228 cleanup: Remove old type-ordered event getters. 8c35e0fefb feat: add ngc events 97bdd83937 refactor: Make event dispatch ordered by receive time. 001d00ab30 fix: dont resolve to ipv6 addresses when its disabled d3b935f63f fix(test): tests use ipv6 by default, even with USE_IPV6 set to 0 29fc5ea1f7 chore: add clangd files to .gitignore d30c81acbc refactor: Move file streaming test to its own file. acdc67387b fix(ci): window builds now build in parallel REVERT: 73d9b845a3 cleanup: Remove old type-ordered event getters. REVERT: b0840cc02d feat: add ngc events REVERT: 7df9a51349 refactor: Make event dispatch ordered by receive time. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: e2c01e457bfb8a59537175c8fe17ca9ab1c9e3e1
This commit is contained in:
@ -14,6 +14,7 @@
|
||||
#include "../mem.h"
|
||||
#include "../tox.h"
|
||||
#include "../tox_events.h"
|
||||
#include "../tox_pack.h"
|
||||
#include "../tox_unpack.h"
|
||||
|
||||
|
||||
@ -158,13 +159,10 @@ static void tox_event_group_peer_exit_destruct(Tox_Event_Group_Peer_Exit *group_
|
||||
bool tox_event_group_peer_exit_pack(
|
||||
const Tox_Event_Group_Peer_Exit *event, Bin_Pack *bp)
|
||||
{
|
||||
assert(event != nullptr);
|
||||
return bin_pack_array(bp, 2)
|
||||
&& bin_pack_u32(bp, TOX_EVENT_GROUP_PEER_EXIT)
|
||||
&& bin_pack_array(bp, 5)
|
||||
return bin_pack_array(bp, 5)
|
||||
&& bin_pack_u32(bp, event->group_number)
|
||||
&& bin_pack_u32(bp, event->peer_id)
|
||||
&& bin_pack_u32(bp, event->exit_type)
|
||||
&& tox_group_exit_type_pack(event->exit_type, bp)
|
||||
&& bin_pack_bin(bp, event->name, event->name_length)
|
||||
&& bin_pack_bin(bp, event->part_message, event->part_message_length);
|
||||
}
|
||||
@ -180,7 +178,7 @@ static bool tox_event_group_peer_exit_unpack_into(
|
||||
|
||||
return bin_unpack_u32(bu, &event->group_number)
|
||||
&& bin_unpack_u32(bu, &event->peer_id)
|
||||
&& tox_group_exit_type_unpack(bu, &event->exit_type)
|
||||
&& tox_group_exit_type_unpack(&event->exit_type, bu)
|
||||
&& bin_unpack_bin(bu, &event->name, &event->name_length)
|
||||
&& bin_unpack_bin(bu, &event->part_message, &event->part_message_length);
|
||||
}
|
||||
|
Reference in New Issue
Block a user