diff options
author | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
commit | f8a2a865dc32bfa626cc150a509d30d897e1181b (patch) | |
tree | 5bb6b234149cdf2a79422815dc59a0c53cb3cb0e /auto_tests/tox_test.c | |
parent | a9a7f6a5952d0385904ec9df078ac065a3f5887f (diff) | |
parent | c4f0650ae33e1669bfc994ef4f76c6c31e4d63c0 (diff) |
Resolved conflicts when merging upstream
Diffstat (limited to 'auto_tests/tox_test.c')
-rw-r--r-- | auto_tests/tox_test.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c index f8da8560..1a3c5868 100644 --- a/auto_tests/tox_test.c +++ b/auto_tests/tox_test.c | |||
@@ -30,7 +30,7 @@ void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *dat | |||
30 | } | 30 | } |
31 | uint32_t messages_received; | 31 | uint32_t messages_received; |
32 | 32 | ||
33 | void print_message(Tox *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) | 33 | void print_message(Tox *m, int friendnumber, const uint8_t *string, uint16_t length, void *userdata) |
34 | { | 34 | { |
35 | if (*((uint32_t *)userdata) != 974536) | 35 | if (*((uint32_t *)userdata) != 974536) |
36 | return; | 36 | return; |
@@ -44,7 +44,7 @@ void print_message(Tox *m, int friendnumber, uint8_t *string, uint16_t length, v | |||
44 | 44 | ||
45 | uint32_t name_changes; | 45 | uint32_t name_changes; |
46 | 46 | ||
47 | void print_nickchange(Tox *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata) | 47 | void print_nickchange(Tox *m, int friendnumber, const uint8_t *string, uint16_t length, void *userdata) |
48 | { | 48 | { |
49 | if (*((uint32_t *)userdata) != 974536) | 49 | if (*((uint32_t *)userdata) != 974536) |
50 | return; | 50 | return; |
@@ -69,7 +69,7 @@ void print_typingchange(Tox *m, int friendnumber, uint8_t typing, void *userdata | |||
69 | uint8_t filenum; | 69 | uint8_t filenum; |
70 | uint32_t file_accepted; | 70 | uint32_t file_accepted; |
71 | uint64_t file_size; | 71 | uint64_t file_size; |
72 | void file_request_accept(Tox *m, int friendnumber, uint8_t filenumber, uint64_t filesize, uint8_t *filename, | 72 | void file_request_accept(Tox *m, int friendnumber, uint8_t filenumber, uint64_t filesize, const uint8_t *filename, |
73 | uint16_t filename_length, void *userdata) | 73 | uint16_t filename_length, void *userdata) |
74 | { | 74 | { |
75 | if (*((uint32_t *)userdata) != 974536) | 75 | if (*((uint32_t *)userdata) != 974536) |
@@ -85,7 +85,7 @@ void file_request_accept(Tox *m, int friendnumber, uint8_t filenumber, uint64_t | |||
85 | uint32_t file_sent; | 85 | uint32_t file_sent; |
86 | uint32_t sendf_ok; | 86 | uint32_t sendf_ok; |
87 | void file_print_control(Tox *m, int friendnumber, uint8_t send_recieve, uint8_t filenumber, uint8_t control_type, | 87 | void file_print_control(Tox *m, int friendnumber, uint8_t send_recieve, uint8_t filenumber, uint8_t control_type, |
88 | uint8_t *data, uint16_t length, void *userdata) | 88 | const uint8_t *data, uint16_t length, void *userdata) |
89 | { | 89 | { |
90 | if (*((uint32_t *)userdata) != 974536) | 90 | if (*((uint32_t *)userdata) != 974536) |
91 | return; | 91 | return; |
@@ -100,7 +100,7 @@ void file_print_control(Tox *m, int friendnumber, uint8_t send_recieve, uint8_t | |||
100 | 100 | ||
101 | uint64_t size_recv; | 101 | uint64_t size_recv; |
102 | uint8_t num; | 102 | uint8_t num; |
103 | void write_file(Tox *m, int friendnumber, uint8_t filenumber, uint8_t *data, uint16_t length, void *userdata) | 103 | void write_file(Tox *m, int friendnumber, uint8_t filenumber, const uint8_t *data, uint16_t length, void *userdata) |
104 | { | 104 | { |
105 | if (*((uint32_t *)userdata) != 974536) | 105 | if (*((uint32_t *)userdata) != 974536) |
106 | return; | 106 | return; |