Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-15 05:23:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into new_groupchats

Browse Source
This commit is contained in:
Jfreegman 2015-04-09 02:14:50 -04:00
commit b66932fcec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/avatars.c
View File

@ -32,7 +32,7 @@
extern FriendsList Friends; extern FriendsList Friends;
static struct Avatar { static struct Avatar {
char name[MAX_STR_SIZE + 1]; char name[TOX_MAX_FILENAME_LENGTH + 1];
size_t name_len; size_t name_len;
char path[PATH_MAX + 1]; char path[PATH_MAX + 1];
size_t path_len; size_t path_len;
@ -73,7 +73,7 @@ int avatar_send(Tox *m, uint32_t friendnum)
if (ft->file == NULL) if (ft->file == NULL)
return -1; return -1;
memcpy(ft->file_name, Avatar.name, Avatar.name_len + 1); snprintf(ft->file_name, sizeof(ft->file_name), "%s", Avatar.name);
ft->file_size = Avatar.size; ft->file_size = Avatar.size;
ft->state = FILE_TRANSFER_PENDING; ft->state = FILE_TRANSFER_PENDING;
ft->filenum = filenum; ft->filenum = filenum;
@ -126,7 +126,7 @@ int avatar_set(Tox *m, const char *path, size_t path_len)
get_file_name(Avatar.name, sizeof(Avatar.name), path); get_file_name(Avatar.name, sizeof(Avatar.name), path);
Avatar.name_len = strlen(Avatar.name); Avatar.name_len = strlen(Avatar.name);
memcpy(Avatar.path, path, sizeof(Avatar.path)); snprintf(Avatar.path, sizeof(Avatar.path), "%s", path);
Avatar.path_len = path_len; Avatar.path_len = path_len;
Avatar.size = size; Avatar.size = size;