diff options
author | irungentoo <irungentoo@gmail.com> | 2014-06-08 09:21:37 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-06-08 09:21:37 -0400 |
commit | 7a11c10429beb7337e8598bf204233e775b407b5 (patch) | |
tree | 7f0c65d6f5a5227160b4de805102d33a5d7e05ce /testing/nTox.c | |
parent | e7faa2cd111ffe2c91e3d53a724ee3dbbd0ad271 (diff) |
Fixed some nTox bugs.
Diffstat (limited to 'testing/nTox.c')
-rw-r--r-- | testing/nTox.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/testing/nTox.c b/testing/nTox.c index 95f377ce..b4a65448 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -390,7 +390,7 @@ void line_eval(Tox *m, char *line) | |||
390 | int num = strtoul(line + prompt_offset, posi, 0); | 390 | int num = strtoul(line + prompt_offset, posi, 0); |
391 | 391 | ||
392 | if (**posi != 0) { | 392 | if (**posi != 0) { |
393 | if (tox_send_message(m, num, (uint8_t *) *posi + 1, strlen(*posi + 1) + 1) < 1) { | 393 | if (tox_send_message(m, num, (uint8_t *) *posi + 1, strlen(*posi + 1)) < 1) { |
394 | char sss[256]; | 394 | char sss[256]; |
395 | sprintf(sss, "[i] could not send message to friend num %u", num); | 395 | sprintf(sss, "[i] could not send message to friend num %u", num); |
396 | new_lines(sss); | 396 | new_lines(sss); |
@@ -427,7 +427,7 @@ void line_eval(Tox *m, char *line) | |||
427 | } | 427 | } |
428 | 428 | ||
429 | status[i - 3] = 0; | 429 | status[i - 3] = 0; |
430 | tox_set_status_message(m, status, strlen((char *)status) + 1); | 430 | tox_set_status_message(m, status, strlen((char *)status)); |
431 | char numstring[100]; | 431 | char numstring[100]; |
432 | sprintf(numstring, "[i] changed status to %s", (char *)status); | 432 | sprintf(numstring, "[i] changed status to %s", (char *)status); |
433 | new_lines(numstring); | 433 | new_lines(numstring); |
@@ -518,7 +518,7 @@ void line_eval(Tox *m, char *line) | |||
518 | int groupnumber = strtoul(line + prompt_offset, posi, 0); | 518 | int groupnumber = strtoul(line + prompt_offset, posi, 0); |
519 | 519 | ||
520 | if (**posi != 0) { | 520 | if (**posi != 0) { |
521 | int res = tox_group_message_send(m, groupnumber, (uint8_t *)*posi + 1, strlen(*posi + 1) + 1); | 521 | int res = tox_group_message_send(m, groupnumber, (uint8_t *)*posi + 1, strlen(*posi + 1)); |
522 | 522 | ||
523 | if (res == 0) { | 523 | if (res == 0) { |
524 | char msg[32 + STRING_LENGTH]; | 524 | char msg[32 + STRING_LENGTH]; |
@@ -602,7 +602,7 @@ void line_eval(Tox *m, char *line) | |||
602 | if (conversation_default != 0) { | 602 | if (conversation_default != 0) { |
603 | if (conversation_default > 0) { | 603 | if (conversation_default > 0) { |
604 | int friendnumber = conversation_default - 1; | 604 | int friendnumber = conversation_default - 1; |
605 | uint32_t res = tox_send_message(m, friendnumber, (uint8_t *)line, strlen(line) + 1); | 605 | uint32_t res = tox_send_message(m, friendnumber, (uint8_t *)line, strlen(line)); |
606 | 606 | ||
607 | if (res == 0) { | 607 | if (res == 0) { |
608 | char sss[128]; | 608 | char sss[128]; |
@@ -612,7 +612,7 @@ void line_eval(Tox *m, char *line) | |||
612 | print_formatted_message(m, line, friendnumber, 1); | 612 | print_formatted_message(m, line, friendnumber, 1); |
613 | } else { | 613 | } else { |
614 | int groupnumber = - conversation_default - 1; | 614 | int groupnumber = - conversation_default - 1; |
615 | int res = tox_group_message_send(m, groupnumber, (uint8_t *)line, strlen(line) + 1); | 615 | int res = tox_group_message_send(m, groupnumber, (uint8_t *)line, strlen(line)); |
616 | 616 | ||
617 | if (res == 0) { | 617 | if (res == 0) { |
618 | char msg[32 + STRING_LENGTH]; | 618 | char msg[32 + STRING_LENGTH]; |
@@ -1060,7 +1060,7 @@ void print_groupchatpeers(Tox *m, int groupnumber) | |||
1060 | void print_groupmessage(Tox *m, int groupnumber, int peernumber, uint8_t *message, uint16_t length, void *userdata) | 1060 | void print_groupmessage(Tox *m, int groupnumber, int peernumber, uint8_t *message, uint16_t length, void *userdata) |
1061 | { | 1061 | { |
1062 | char msg[256 + length]; | 1062 | char msg[256 + length]; |
1063 | uint8_t name[TOX_MAX_NAME_LENGTH]; | 1063 | uint8_t name[TOX_MAX_NAME_LENGTH] = {0}; |
1064 | int len = tox_group_peername(m, groupnumber, peernumber, name); | 1064 | int len = tox_group_peername(m, groupnumber, peernumber, name); |
1065 | 1065 | ||
1066 | //print_groupchatpeers(m, groupnumber); | 1066 | //print_groupchatpeers(m, groupnumber); |
@@ -1093,7 +1093,7 @@ void print_groupnamelistchange(Tox *m, int groupnumber, int peernumber, uint8_t | |||
1093 | sprintf(msg, "[g] #%i: Peer %i left.", groupnumber, peernumber); | 1093 | sprintf(msg, "[g] #%i: Peer %i left.", groupnumber, peernumber); |
1094 | new_lines(msg); | 1094 | new_lines(msg); |
1095 | } else { | 1095 | } else { |
1096 | uint8_t peername[TOX_MAX_NAME_LENGTH]; | 1096 | uint8_t peername[TOX_MAX_NAME_LENGTH] = {0}; |
1097 | int len = tox_group_peername(m, groupnumber, peernumber, peername); | 1097 | int len = tox_group_peername(m, groupnumber, peernumber, peername); |
1098 | 1098 | ||
1099 | if (len <= 0) | 1099 | if (len <= 0) |
@@ -1104,7 +1104,7 @@ void print_groupnamelistchange(Tox *m, int groupnumber, int peernumber, uint8_t | |||
1104 | new_lines(msg); | 1104 | new_lines(msg); |
1105 | } | 1105 | } |
1106 | } else if (change == TOX_CHAT_CHANGE_PEER_NAME) { | 1106 | } else if (change == TOX_CHAT_CHANGE_PEER_NAME) { |
1107 | uint8_t peername[TOX_MAX_NAME_LENGTH]; | 1107 | uint8_t peername[TOX_MAX_NAME_LENGTH] = {0}; |
1108 | int len = tox_group_peername(m, groupnumber, peernumber, peername); | 1108 | int len = tox_group_peername(m, groupnumber, peernumber, peername); |
1109 | 1109 | ||
1110 | if (len <= 0) | 1110 | if (len <= 0) |