diff options
author | iphydf <iphydf@users.noreply.github.com> | 2017-06-04 12:59:34 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2017-06-04 17:48:23 +0000 |
commit | 1e8fa85aadf602bdca3a540de09a8184f7139a6c (patch) | |
tree | 4caab80957f7f9a2098fb97e776be763defc44ab /toxcore/group.c | |
parent | 03f99bde2ecee3722d47a5b6a1031fc88e7210b7 (diff) |
Add a monolith_test that includes all toxcore sources.
This requires that every symbol, even if static (file-scope), is unique.
The idea is that we can easily run "whole" program static analysis on
programs that include monolith.h ("whole" is in quotes, as we don't
include dependencies like libsodium in this static analysis).
Diffstat (limited to 'toxcore/group.c')
-rw-r--r-- | toxcore/group.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toxcore/group.c b/toxcore/group.c index 73aca875..d3f068df 100644 --- a/toxcore/group.c +++ b/toxcore/group.c | |||
@@ -659,7 +659,7 @@ static void set_conns_status_groups(Group_Chats *g_c, int friendcon_id, uint8_t | |||
659 | } | 659 | } |
660 | } | 660 | } |
661 | 661 | ||
662 | static int handle_status(void *object, int friendcon_id, uint8_t status, void *userdata) | 662 | static int g_handle_status(void *object, int friendcon_id, uint8_t status, void *userdata) |
663 | { | 663 | { |
664 | Group_Chats *g_c = (Group_Chats *)object; | 664 | Group_Chats *g_c = (Group_Chats *)object; |
665 | 665 | ||
@@ -673,7 +673,7 @@ static int handle_status(void *object, int friendcon_id, uint8_t status, void *u | |||
673 | return 0; | 673 | return 0; |
674 | } | 674 | } |
675 | 675 | ||
676 | static int handle_packet(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata); | 676 | static int g_handle_packet(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata); |
677 | static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata); | 677 | static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata); |
678 | 678 | ||
679 | /* Add friend to group chat. | 679 | /* Add friend to group chat. |
@@ -715,7 +715,7 @@ static int add_conn_to_groupchat(Group_Chats *g_c, int friendcon_id, int groupnu | |||
715 | g->close[ind].number = friendcon_id; | 715 | g->close[ind].number = friendcon_id; |
716 | g->close[ind].closest = closest; | 716 | g->close[ind].closest = closest; |
717 | // TODO(irungentoo): | 717 | // TODO(irungentoo): |
718 | friend_connection_callbacks(g_c->m->fr_c, friendcon_id, GROUPCHAT_CALLBACK_INDEX, &handle_status, &handle_packet, | 718 | friend_connection_callbacks(g_c->m->fr_c, friendcon_id, GROUPCHAT_CALLBACK_INDEX, &g_handle_status, &g_handle_packet, |
719 | &handle_lossy, g_c, friendcon_id); | 719 | &handle_lossy, g_c, friendcon_id); |
720 | 720 | ||
721 | return ind; | 721 | return ind; |
@@ -2124,7 +2124,7 @@ static void handle_message_packet_group(Group_Chats *g_c, int groupnumber, const | |||
2124 | send_message_all_close(g_c, groupnumber, data, length, -1/* TODO(irungentoo) close_index */); | 2124 | send_message_all_close(g_c, groupnumber, data, length, -1/* TODO(irungentoo) close_index */); |
2125 | } | 2125 | } |
2126 | 2126 | ||
2127 | static int handle_packet(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata) | 2127 | static int g_handle_packet(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata) |
2128 | { | 2128 | { |
2129 | Group_Chats *g_c = (Group_Chats *)object; | 2129 | Group_Chats *g_c = (Group_Chats *)object; |
2130 | 2130 | ||