forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from b03b571272..3e05824b80
3e05824b80 refactor: Rename `out` parameters to `out_$something`. 0199c0f17f cleanup: apply the same scheme to types aebbfabe26 cleanup: event length naming inconsistencies 2457125aa8 cleanup: align group send err enum order git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 3e05824b80eb9bee33e8254cba0780d84c522182
This commit is contained in:
@ -725,216 +725,216 @@ bool tox_event_pack(const Tox_Event *event, Bin_Pack *bp)
|
||||
}
|
||||
|
||||
non_null()
|
||||
static bool tox_event_type_from_int(uint32_t value, Tox_Event_Type *out)
|
||||
static bool tox_event_type_from_int(uint32_t value, Tox_Event_Type *out_enum)
|
||||
{
|
||||
switch (value) {
|
||||
case TOX_EVENT_SELF_CONNECTION_STATUS: {
|
||||
*out = TOX_EVENT_SELF_CONNECTION_STATUS;
|
||||
*out_enum = TOX_EVENT_SELF_CONNECTION_STATUS;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_REQUEST: {
|
||||
*out = TOX_EVENT_FRIEND_REQUEST;
|
||||
*out_enum = TOX_EVENT_FRIEND_REQUEST;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_CONNECTION_STATUS: {
|
||||
*out = TOX_EVENT_FRIEND_CONNECTION_STATUS;
|
||||
*out_enum = TOX_EVENT_FRIEND_CONNECTION_STATUS;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_LOSSY_PACKET: {
|
||||
*out = TOX_EVENT_FRIEND_LOSSY_PACKET;
|
||||
*out_enum = TOX_EVENT_FRIEND_LOSSY_PACKET;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_LOSSLESS_PACKET: {
|
||||
*out = TOX_EVENT_FRIEND_LOSSLESS_PACKET;
|
||||
*out_enum = TOX_EVENT_FRIEND_LOSSLESS_PACKET;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_NAME: {
|
||||
*out = TOX_EVENT_FRIEND_NAME;
|
||||
*out_enum = TOX_EVENT_FRIEND_NAME;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_STATUS: {
|
||||
*out = TOX_EVENT_FRIEND_STATUS;
|
||||
*out_enum = TOX_EVENT_FRIEND_STATUS;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_STATUS_MESSAGE: {
|
||||
*out = TOX_EVENT_FRIEND_STATUS_MESSAGE;
|
||||
*out_enum = TOX_EVENT_FRIEND_STATUS_MESSAGE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_MESSAGE: {
|
||||
*out = TOX_EVENT_FRIEND_MESSAGE;
|
||||
*out_enum = TOX_EVENT_FRIEND_MESSAGE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_READ_RECEIPT: {
|
||||
*out = TOX_EVENT_FRIEND_READ_RECEIPT;
|
||||
*out_enum = TOX_EVENT_FRIEND_READ_RECEIPT;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FRIEND_TYPING: {
|
||||
*out = TOX_EVENT_FRIEND_TYPING;
|
||||
*out_enum = TOX_EVENT_FRIEND_TYPING;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FILE_CHUNK_REQUEST: {
|
||||
*out = TOX_EVENT_FILE_CHUNK_REQUEST;
|
||||
*out_enum = TOX_EVENT_FILE_CHUNK_REQUEST;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FILE_RECV: {
|
||||
*out = TOX_EVENT_FILE_RECV;
|
||||
*out_enum = TOX_EVENT_FILE_RECV;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FILE_RECV_CHUNK: {
|
||||
*out = TOX_EVENT_FILE_RECV_CHUNK;
|
||||
*out_enum = TOX_EVENT_FILE_RECV_CHUNK;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_FILE_RECV_CONTROL: {
|
||||
*out = TOX_EVENT_FILE_RECV_CONTROL;
|
||||
*out_enum = TOX_EVENT_FILE_RECV_CONTROL;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_CONFERENCE_INVITE: {
|
||||
*out = TOX_EVENT_CONFERENCE_INVITE;
|
||||
*out_enum = TOX_EVENT_CONFERENCE_INVITE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_CONFERENCE_CONNECTED: {
|
||||
*out = TOX_EVENT_CONFERENCE_CONNECTED;
|
||||
*out_enum = TOX_EVENT_CONFERENCE_CONNECTED;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED: {
|
||||
*out = TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED;
|
||||
*out_enum = TOX_EVENT_CONFERENCE_PEER_LIST_CHANGED;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_CONFERENCE_PEER_NAME: {
|
||||
*out = TOX_EVENT_CONFERENCE_PEER_NAME;
|
||||
*out_enum = TOX_EVENT_CONFERENCE_PEER_NAME;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_CONFERENCE_TITLE: {
|
||||
*out = TOX_EVENT_CONFERENCE_TITLE;
|
||||
*out_enum = TOX_EVENT_CONFERENCE_TITLE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_CONFERENCE_MESSAGE: {
|
||||
*out = TOX_EVENT_CONFERENCE_MESSAGE;
|
||||
*out_enum = TOX_EVENT_CONFERENCE_MESSAGE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_PEER_NAME: {
|
||||
*out = TOX_EVENT_GROUP_PEER_NAME;
|
||||
*out_enum = TOX_EVENT_GROUP_PEER_NAME;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_PEER_STATUS: {
|
||||
*out = TOX_EVENT_GROUP_PEER_STATUS;
|
||||
*out_enum = TOX_EVENT_GROUP_PEER_STATUS;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_TOPIC: {
|
||||
*out = TOX_EVENT_GROUP_TOPIC;
|
||||
*out_enum = TOX_EVENT_GROUP_TOPIC;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_PRIVACY_STATE: {
|
||||
*out = TOX_EVENT_GROUP_PRIVACY_STATE;
|
||||
*out_enum = TOX_EVENT_GROUP_PRIVACY_STATE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_VOICE_STATE: {
|
||||
*out = TOX_EVENT_GROUP_VOICE_STATE;
|
||||
*out_enum = TOX_EVENT_GROUP_VOICE_STATE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_TOPIC_LOCK: {
|
||||
*out = TOX_EVENT_GROUP_TOPIC_LOCK;
|
||||
*out_enum = TOX_EVENT_GROUP_TOPIC_LOCK;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_PEER_LIMIT: {
|
||||
*out = TOX_EVENT_GROUP_PEER_LIMIT;
|
||||
*out_enum = TOX_EVENT_GROUP_PEER_LIMIT;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_PASSWORD: {
|
||||
*out = TOX_EVENT_GROUP_PASSWORD;
|
||||
*out_enum = TOX_EVENT_GROUP_PASSWORD;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_MESSAGE: {
|
||||
*out = TOX_EVENT_GROUP_MESSAGE;
|
||||
*out_enum = TOX_EVENT_GROUP_MESSAGE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_PRIVATE_MESSAGE: {
|
||||
*out = TOX_EVENT_GROUP_PRIVATE_MESSAGE;
|
||||
*out_enum = TOX_EVENT_GROUP_PRIVATE_MESSAGE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_CUSTOM_PACKET: {
|
||||
*out = TOX_EVENT_GROUP_CUSTOM_PACKET;
|
||||
*out_enum = TOX_EVENT_GROUP_CUSTOM_PACKET;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET: {
|
||||
*out = TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET;
|
||||
*out_enum = TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_INVITE: {
|
||||
*out = TOX_EVENT_GROUP_INVITE;
|
||||
*out_enum = TOX_EVENT_GROUP_INVITE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_PEER_JOIN: {
|
||||
*out = TOX_EVENT_GROUP_PEER_JOIN;
|
||||
*out_enum = TOX_EVENT_GROUP_PEER_JOIN;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_PEER_EXIT: {
|
||||
*out = TOX_EVENT_GROUP_PEER_EXIT;
|
||||
*out_enum = TOX_EVENT_GROUP_PEER_EXIT;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_SELF_JOIN: {
|
||||
*out = TOX_EVENT_GROUP_SELF_JOIN;
|
||||
*out_enum = TOX_EVENT_GROUP_SELF_JOIN;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_JOIN_FAIL: {
|
||||
*out = TOX_EVENT_GROUP_JOIN_FAIL;
|
||||
*out_enum = TOX_EVENT_GROUP_JOIN_FAIL;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_GROUP_MODERATION: {
|
||||
*out = TOX_EVENT_GROUP_MODERATION;
|
||||
*out_enum = TOX_EVENT_GROUP_MODERATION;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_DHT_GET_NODES_RESPONSE: {
|
||||
*out = TOX_EVENT_DHT_GET_NODES_RESPONSE;
|
||||
*out_enum = TOX_EVENT_DHT_GET_NODES_RESPONSE;
|
||||
return true;
|
||||
}
|
||||
|
||||
case TOX_EVENT_INVALID: {
|
||||
*out = TOX_EVENT_INVALID;
|
||||
*out_enum = TOX_EVENT_INVALID;
|
||||
return true;
|
||||
}
|
||||
|
||||
default: {
|
||||
*out = TOX_EVENT_INVALID;
|
||||
*out_enum = TOX_EVENT_INVALID;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user