summaryrefslogtreecommitdiff
path: root/toxcore
diff options
context:
space:
mode:
authorAZ Huang <aitjcize@gmail.com>2013-11-29 22:26:29 +0800
committerAZ Huang <aitjcize@gmail.com>2013-11-29 22:26:29 +0800
commit1df2d5880db375b6a2d5259bb8ff2560c9f1007d (patch)
treec4f520eb7f5764af6225ae0328f412b7473ee61a /toxcore
parenteec31edb1c6fe5d0ffdc79f6b38a89f6a4a9b20d (diff)
Should return 0 for tox_file_dataremaining since it returns unsigned
Diffstat (limited to 'toxcore')
-rw-r--r--toxcore/Messenger.c6
-rw-r--r--toxcore/tox.c2
-rw-r--r--toxcore/tox.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index a3295170..954b31dd 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1314,17 +1314,17 @@ int file_data(Messenger *m, int friendnumber, uint8_t filenumber, uint8_t *data,
1314uint64_t file_dataremaining(Messenger *m, int friendnumber, uint8_t filenumber, uint8_t send_receive) 1314uint64_t file_dataremaining(Messenger *m, int friendnumber, uint8_t filenumber, uint8_t send_receive)
1315{ 1315{
1316 if (friend_not_valid(m, friendnumber)) 1316 if (friend_not_valid(m, friendnumber))
1317 return -1; 1317 return 0;
1318 1318
1319 if (send_receive == 0) { 1319 if (send_receive == 0) {
1320 if (m->friendlist[friendnumber].file_sending[filenumber].status == FILESTATUS_NONE) 1320 if (m->friendlist[friendnumber].file_sending[filenumber].status == FILESTATUS_NONE)
1321 return -1; 1321 return 0;
1322 1322
1323 return m->friendlist[friendnumber].file_sending[filenumber].size - 1323 return m->friendlist[friendnumber].file_sending[filenumber].size -
1324 m->friendlist[friendnumber].file_sending[filenumber].transferred; 1324 m->friendlist[friendnumber].file_sending[filenumber].transferred;
1325 } else { 1325 } else {
1326 if (m->friendlist[friendnumber].file_receiving[filenumber].status == FILESTATUS_NONE) 1326 if (m->friendlist[friendnumber].file_receiving[filenumber].status == FILESTATUS_NONE)
1327 return -1; 1327 return 0;
1328 1328
1329 return m->friendlist[friendnumber].file_receiving[filenumber].size - 1329 return m->friendlist[friendnumber].file_receiving[filenumber].size -
1330 m->friendlist[friendnumber].file_receiving[filenumber].transferred; 1330 m->friendlist[friendnumber].file_receiving[filenumber].transferred;
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 02137b3c..f4e65ec8 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -620,7 +620,7 @@ int tox_filedata_size(Tox *tox, int friendnumber)
620 * send_receive is 0 if we want the sending files, 1 if we want the receiving. 620 * send_receive is 0 if we want the sending files, 1 if we want the receiving.
621 * 621 *
622 * return number of bytes remaining to be sent/received on success 622 * return number of bytes remaining to be sent/received on success
623 * return -1 on failure 623 * return 0 on failure
624 */ 624 */
625uint64_t tox_file_dataremaining(Tox *tox, int friendnumber, uint8_t filenumber, uint8_t send_receive) 625uint64_t tox_file_dataremaining(Tox *tox, int friendnumber, uint8_t filenumber, uint8_t send_receive)
626{ 626{
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 735d991a..ea373488 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -544,7 +544,7 @@ int tox_filedata_size(Tox *tox, int friendnumber);
544 * send_receive is 0 if we want the sending files, 1 if we want the receiving. 544 * send_receive is 0 if we want the sending files, 1 if we want the receiving.
545 * 545 *
546 * return number of bytes remaining to be sent/received on success 546 * return number of bytes remaining to be sent/received on success
547 * return -1 on failure 547 * return 0 on failure
548 */ 548 */
549uint64_t tox_file_dataremaining(Tox *tox, int friendnumber, uint8_t filenumber, uint8_t send_receive); 549uint64_t tox_file_dataremaining(Tox *tox, int friendnumber, uint8_t filenumber, uint8_t send_receive);
550 550