StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

a better way

Browse Source
This commit is contained in:
Jfreegman 2013-09-09 07:11:30 -04:00
parent 3853a30acf
commit 5a1897162b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toxcore/Messenger.c
View File

@ -351,12 +351,11 @@ static int m_sendname(Messenger *m, int friendnumber, uint8_t *name, uint16_t le
* return 0 if success. * return 0 if success.
* return -1 if failure. * return -1 if failure.
*/ */
static int setfriendname(Messenger *m, int friendnumber, uint8_t *name) static int setfriendname(Messenger *m, int friendnumber, uint8_t *name, uint8_t len)
{ {
if (friend_not_valid(m, friendnumber)) if (friend_not_valid(m, friendnumber))
return -1; return -1;
uint16_t len = strlen(name) + 1;
m->friendlist[friendnumber].name_length = len; m->friendlist[friendnumber].name_length = len;
memcpy(m->friendlist[friendnumber].name, name, len); memcpy(m->friendlist[friendnumber].name, name, len);
return 0; return 0;
@ -1029,7 +1028,7 @@ int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
for (i = 0; i < num; ++i) { for (i = 0; i < num; ++i) {
if (temp[i].status >= 3) { if (temp[i].status >= 3) {
int fnum = m_addfriend_norequest(m, temp[i].client_id); int fnum = m_addfriend_norequest(m, temp[i].client_id);
setfriendname(m, fnum, temp[i].name); setfriendname(m, fnum, temp[i].name, temp[i].name_length);
/* set_friend_statusmessage(fnum, temp[i].statusmessage, temp[i].statusmessage_length); */ /* set_friend_statusmessage(fnum, temp[i].statusmessage, temp[i].statusmessage_length); */
} else if (temp[i].status != 0) { } else if (temp[i].status != 0) {
/* TODO: This is not a good way to do this. */ /* TODO: This is not a good way to do this. */