diff options
author | Coren[m] <Break@Ocean> | 2013-09-09 21:31:11 +0200 |
---|---|---|
committer | Coren[m] <Break@Ocean> | 2013-09-09 21:31:11 +0200 |
commit | b91b87f28548261a582c295afa397a6c569089d7 (patch) | |
tree | 0dd5cdcd2929812f8600239d11e7fba08afb9dd4 /toxcore/tox.c | |
parent | 447fdc74ec0794d334d2fa3b5b88091aa582e14a (diff) | |
parent | 1f5bfab3278164293dd798ca24ead081c54708da (diff) |
Merge branch 'master' into Integration
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r-- | toxcore/tox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c index d48de0d8..e37eac3e 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -184,7 +184,7 @@ uint16_t tox_getselfname(void *tox, uint8_t *name, uint16_t nlen) | |||
184 | /* Get name of friendnumber and put it in name. | 184 | /* Get name of friendnumber and put it in name. |
185 | * name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes. | 185 | * name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes. |
186 | * | 186 | * |
187 | * return 0 if success. | 187 | * return length of name (with the NULL terminator) if success. |
188 | * return -1 if failure. | 188 | * return -1 if failure. |
189 | */ | 189 | */ |
190 | int tox_getname(void *tox, int friendnumber, uint8_t *name) | 190 | int tox_getname(void *tox, int friendnumber, uint8_t *name) |