StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Remove redundant callback objects.

Browse Source 
These three objects and their callback IDs are always the same.
This commit is contained in:
iphydf 2016-09-27 14:22:48 +01:00
parent 621c3fddb2
commit 95b8365af6
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
toxcore/friend_connection.c
View File

@ -357,8 +357,9 @@ static int handle_status(void *object, int number, uint8_t status, void *userdat
for (i = 0; i < MAX_FRIEND_CONNECTION_CALLBACKS; ++i) {
if (friend_con->callbacks[i].status_callback) {
friend_con->callbacks[i].status_callback(friend_con->callbacks[i].status_callback_object,
friend_con->callbacks[i].status_callback_id, status, userdata);
friend_con->callbacks[i].status_callback(
friend_con->callbacks[i].callback_object,
friend_con->callbacks[i].callback_id, status, userdata);
}
}
}
@ -441,8 +442,8 @@ static int handle_packet(void *object, int number, const uint8_t *data, uint16_t
for (i = 0; i < MAX_FRIEND_CONNECTION_CALLBACKS; ++i) {
if (friend_con->callbacks[i].data_callback) {
friend_con->callbacks[i].data_callback(
friend_con->callbacks[i].data_callback_object,
friend_con->callbacks[i].data_callback_id, data, length, userdata);
friend_con->callbacks[i].callback_object,
friend_con->callbacks[i].callback_id, data, length, userdata);
}
friend_con = get_conn(fr_c, number);
@ -472,8 +473,9 @@ static int handle_lossy_packet(void *object, int number, const uint8_t *data, ui
for (i = 0; i < MAX_FRIEND_CONNECTION_CALLBACKS; ++i) {
if (friend_con->callbacks[i].lossy_data_callback) {
friend_con->callbacks[i].lossy_data_callback(friend_con->callbacks[i].lossy_data_callback_object,
friend_con->callbacks[i].lossy_data_callback_id, data, length, userdata);
friend_con->callbacks[i].lossy_data_callback(
friend_con->callbacks[i].callback_object,
friend_con->callbacks[i].callback_id, data, length, userdata);
}
friend_con = get_conn(fr_c, number);
@ -667,13 +669,9 @@ int friend_connection_callbacks(Friend_Connections *fr_c, int friendcon_id, unsi
friend_con->callbacks[index].data_callback = data_callback;
friend_con->callbacks[index].lossy_data_callback = lossy_data_callback;
friend_con->callbacks[index].status_callback_object =
friend_con->callbacks[index].data_callback_object =
friend_con->callbacks[index].lossy_data_callback_object = object;
friend_con->callbacks[index].callback_object = object;
friend_con->callbacks[index].callback_id = number;
friend_con->callbacks[index].status_callback_id =
friend_con->callbacks[index].data_callback_id =
friend_con->callbacks[index].lossy_data_callback_id = number;
return 0;
}

11
toxcore/friend_connection.h
View File

@ -79,16 +79,11 @@ typedef struct {
struct {
int (*status_callback)(void *object, int id, uint8_t status, void *userdata);
void *status_callback_object;
int status_callback_id;
int (*data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata);
void *data_callback_object;
int data_callback_id;
int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata);
void *lossy_data_callback_object;
int lossy_data_callback_id;
void *callback_object;
int callback_id;
} callbacks[MAX_FRIEND_CONNECTION_CALLBACKS];
uint16_t lock_count;