forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from e29e185c03..f1df709b87
f1df709b87 feat: add ngc events 1b6c907235 refactor: Make event dispatch ordered by receive time. b7f9367f6f test: Upgrade cppcheck, fix some warnings. 766e62bc89 chore: Use `pkg_search_module` directly in cmake. 00ff078f91 cleanup: Use target_link_libraries directly in cmake. c58928cc89 chore: Add `IMPORTED_TARGET` to pkg-config packages. 895a6af122 cleanup: Remove NaCl support. 41dfb1c1c0 fix: unpack enum function names in event impl generator 447666d1a1 chore: Disable targets for cross-compilation. 572924e924 chore: Build a docker image with coverage info in it. 415cb78f5e cleanup: Some portability/warning fixes for Windows builds. 425216d9ec fix: Correct a use-after-free and fix some memory leaks. 4b1cfa3e08 refactor: Change all enum-like `#define` sequences into enums. d3c2704fa9 chore: Fix make_single_file to support core-only. 0ce46b644e refactor: Change the `TCP_PACKET_*` defines into an enum. 22cd38ad50 adopt event impl generation tool to #2392 f31ea1088a add the event impl generation tool 4e603bb613 refactor: Use `enum-from-int` rule from tokstyle. 19d8f180d6 chore: Update github actions `uses`. 6a895be0c7 test: Make esp32 build actually try to instantiate tox. 65d09c9bfb cleanup: Remove test net support. REVERT: e29e185c03 feat: add ngc events git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: f1df709b8792da4c0e946d826b11df77d565064d
This commit is contained in:
@ -13,13 +13,14 @@ Tox_Events_State *tox_events_alloc(void *user_data)
|
||||
{
|
||||
Tox_Events_State *state = (Tox_Events_State *)user_data;
|
||||
assert(state != nullptr);
|
||||
assert(state->mem != nullptr);
|
||||
|
||||
if (state->events != nullptr) {
|
||||
// Already allocated.
|
||||
return state;
|
||||
}
|
||||
|
||||
state->events = (Tox_Events *)calloc(1, sizeof(Tox_Events));
|
||||
state->events = (Tox_Events *)mem_alloc(state->mem, sizeof(Tox_Events));
|
||||
|
||||
if (state->events == nullptr) {
|
||||
// It's still null => allocation failed.
|
||||
@ -28,6 +29,7 @@ Tox_Events_State *tox_events_alloc(void *user_data)
|
||||
*state->events = (Tox_Events) {
|
||||
nullptr
|
||||
};
|
||||
state->events->mem = state->mem;
|
||||
}
|
||||
|
||||
return state;
|
||||
@ -39,44 +41,35 @@ void tox_events_free(Tox_Events *events)
|
||||
return;
|
||||
}
|
||||
|
||||
tox_events_clear_conference_connected(events);
|
||||
tox_events_clear_conference_invite(events);
|
||||
tox_events_clear_conference_message(events);
|
||||
tox_events_clear_conference_peer_list_changed(events);
|
||||
tox_events_clear_conference_peer_name(events);
|
||||
tox_events_clear_conference_title(events);
|
||||
tox_events_clear_file_chunk_request(events);
|
||||
tox_events_clear_file_recv_chunk(events);
|
||||
tox_events_clear_file_recv_control(events);
|
||||
tox_events_clear_file_recv(events);
|
||||
tox_events_clear_friend_connection_status(events);
|
||||
tox_events_clear_friend_lossless_packet(events);
|
||||
tox_events_clear_friend_lossy_packet(events);
|
||||
tox_events_clear_friend_message(events);
|
||||
tox_events_clear_friend_name(events);
|
||||
tox_events_clear_friend_read_receipt(events);
|
||||
tox_events_clear_friend_request(events);
|
||||
tox_events_clear_friend_status(events);
|
||||
tox_events_clear_friend_status_message(events);
|
||||
tox_events_clear_friend_typing(events);
|
||||
tox_events_clear_self_connection_status(events);
|
||||
tox_events_clear_group_peer_name(events);
|
||||
tox_events_clear_group_peer_status(events);
|
||||
tox_events_clear_group_topic(events);
|
||||
tox_events_clear_group_privacy_state(events);
|
||||
tox_events_clear_group_voice_state(events);
|
||||
tox_events_clear_group_topic_lock(events);
|
||||
tox_events_clear_group_peer_limit(events);
|
||||
tox_events_clear_group_password(events);
|
||||
tox_events_clear_group_message(events);
|
||||
tox_events_clear_group_private_message(events);
|
||||
tox_events_clear_group_custom_packet(events);
|
||||
tox_events_clear_group_custom_private_packet(events);
|
||||
tox_events_clear_group_invite(events);
|
||||
tox_events_clear_group_peer_join(events);
|
||||
tox_events_clear_group_peer_exit(events);
|
||||
tox_events_clear_group_self_join(events);
|
||||
tox_events_clear_group_join_fail(events);
|
||||
tox_events_clear_group_moderation(events);
|
||||
free(events);
|
||||
for (uint32_t i = 0; i < events->events_size; ++i) {
|
||||
tox_event_destruct(&events->events[i], events->mem);
|
||||
}
|
||||
|
||||
mem_delete(events->mem, events->events);
|
||||
mem_delete(events->mem, events);
|
||||
}
|
||||
|
||||
bool tox_events_add(Tox_Events *events, const Tox_Event *event)
|
||||
{
|
||||
if (events->events_size == UINT32_MAX) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (events->events_size == events->events_capacity) {
|
||||
const uint32_t new_events_capacity = events->events_capacity * 2 + 1;
|
||||
Tox_Event *new_events = (Tox_Event *)mem_vrealloc(
|
||||
events->mem, events->events, new_events_capacity, sizeof(Tox_Event));
|
||||
|
||||
if (new_events == nullptr) {
|
||||
return false;
|
||||
}
|
||||
|
||||
events->events = new_events;
|
||||
events->events_capacity = new_events_capacity;
|
||||
}
|
||||
|
||||
events->events[events->events_size] = *event;
|
||||
++events->events_size;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user