Skip to content

Commit 32e67ab

Browse files
committed
cleanup: use typedef for private message ID's in callback
1 parent 7b1db6a commit 32e67ab

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

auto_tests/group_message_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ typedef struct State {
1919
bool peer_joined;
2020
bool message_sent;
2121
bool message_received;
22-
uint32_t pseudo_msg_id;
22+
Tox_Group_Message_Id pseudo_msg_id;
2323
bool private_message_received;
2424
size_t custom_packets_received;
2525
size_t custom_private_packets_received;
@@ -287,7 +287,7 @@ static void group_private_message_handler(const Tox_Event_Group_Private_Message
287287
const Tox_Message_Type type = tox_event_group_private_message_get_type(event);
288288
const uint8_t *message = tox_event_group_private_message_get_message(event);
289289
const size_t length = tox_event_group_private_message_get_message_length(event);
290-
const uint32_t pseudo_msg_id = tox_event_group_private_message_get_message_id(event);
290+
const Tox_Group_Message_Id pseudo_msg_id = tox_event_group_private_message_get_message_id(event);
291291

292292
ck_assert_msg(length == TEST_PRIVATE_MESSAGE_LEN, "Failed to receive message. Invalid length: %zu\n", length);
293293

toxcore/tox.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ static void tox_group_password_handler(const Messenger *m, uint32_t group_number
524524

525525
non_null(1, 5) nullable(8)
526526
static void tox_group_message_handler(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id, unsigned int type,
527-
const uint8_t *message, size_t length, uint32_t message_id, void *user_data)
527+
const uint8_t *message, size_t length, Tox_Group_Message_Id message_id, void *user_data)
528528
{
529529
struct Tox_Userdata *tox_data = (struct Tox_Userdata *)user_data;
530530

@@ -538,7 +538,7 @@ static void tox_group_message_handler(const Messenger *m, uint32_t group_number,
538538

539539
non_null(1, 5) nullable(8)
540540
static void tox_group_private_message_handler(const Messenger *m, uint32_t group_number, GC_Peer_Id peer_id,
541-
unsigned int type, const uint8_t *message, size_t length, uint32_t message_id, void *user_data)
541+
unsigned int type, const uint8_t *message, size_t length, Tox_Group_Message_Id message_id, void *user_data)
542542
{
543543
struct Tox_Userdata *tox_data = (struct Tox_Userdata *)user_data;
544544

toxcore/tox.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4753,7 +4753,7 @@ void tox_callback_group_message(Tox *tox, tox_group_message_cb *callback);
47534753
*/
47544754
typedef void tox_group_private_message_cb(
47554755
Tox *tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type type,
4756-
const uint8_t message[], size_t length, uint32_t message_id, void *user_data);
4756+
const uint8_t message[], size_t length, Tox_Group_Message_Id message_id, void *user_data);
47574757

47584758
/**
47594759
* Set the callback for the `group_private_message` event. Pass NULL to unset.

0 commit comments

Comments
 (0)