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 /testing/tox_sync.c | |
parent | a9a7f6a5952d0385904ec9df078ac065a3f5887f (diff) | |
parent | c4f0650ae33e1669bfc994ef4f76c6c31e4d63c0 (diff) |
Resolved conflicts when merging upstream
Diffstat (limited to 'testing/tox_sync.c')
-rw-r--r-- | testing/tox_sync.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testing/tox_sync.c b/testing/tox_sync.c index 68cad9f4..523f2c56 100644 --- a/testing/tox_sync.c +++ b/testing/tox_sync.c | |||
@@ -130,7 +130,7 @@ int not_sending() | |||
130 | 130 | ||
131 | static char path[1024]; | 131 | static char path[1024]; |
132 | 132 | ||
133 | void file_request_accept(Tox *m, int friendnumber, uint8_t filenumber, uint64_t filesize, uint8_t *filename, | 133 | void file_request_accept(Tox *m, int friendnumber, uint8_t filenumber, uint64_t filesize, const uint8_t *filename, |
134 | uint16_t filename_length, void *userdata) | 134 | uint16_t filename_length, void *userdata) |
135 | { | 135 | { |
136 | char fullpath[1024]; | 136 | char fullpath[1024]; |
@@ -169,7 +169,7 @@ void file_request_accept(Tox *m, int friendnumber, uint8_t filenumber, uint64_t | |||
169 | } | 169 | } |
170 | 170 | ||
171 | void file_print_control(Tox *m, int friendnumber, uint8_t recieve_send, uint8_t filenumber, uint8_t control_type, | 171 | void file_print_control(Tox *m, int friendnumber, uint8_t recieve_send, uint8_t filenumber, uint8_t control_type, |
172 | uint8_t *data, | 172 | const uint8_t *data, |
173 | uint16_t length, void *userdata) | 173 | uint16_t length, void *userdata) |
174 | { | 174 | { |
175 | if (recieve_send == 1 && (control_type == TOX_FILECONTROL_KILL || control_type == TOX_FILECONTROL_FINISHED)) { | 175 | if (recieve_send == 1 && (control_type == TOX_FILECONTROL_KILL || control_type == TOX_FILECONTROL_FINISHED)) { |
@@ -185,7 +185,7 @@ void file_print_control(Tox *m, int friendnumber, uint8_t recieve_send, uint8_t | |||
185 | } | 185 | } |
186 | } | 186 | } |
187 | 187 | ||
188 | void write_file(Tox *m, int friendnumber, uint8_t filenumber, uint8_t *data, uint16_t length, void *userdata) | 188 | void write_file(Tox *m, int friendnumber, uint8_t filenumber, const uint8_t *data, uint16_t length, void *userdata) |
189 | { | 189 | { |
190 | if (file_recv[filenumber].file != 0) | 190 | if (file_recv[filenumber].file != 0) |
191 | if (fwrite(data, length, 1, file_recv[filenumber].file) != 1) | 191 | if (fwrite(data, length, 1, file_recv[filenumber].file) != 1) |