diff options
author | irungentoo <irungentoo@gmail.com> | 2013-12-03 14:59:49 -0800 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-12-03 14:59:49 -0800 |
commit | e6a1754053bdb33ad235ba8a87eb38e828f1a2c1 (patch) | |
tree | 340d8110c46f4515652b98becf71eacf385369b2 /toxcore | |
parent | 632e69257731bf2be5bd6c444f096098e0d5d2c8 (diff) | |
parent | 3f2d815fab4b7f72d9bce7273ecfe823464f304c (diff) |
Merge pull request #672 from alexandervdm/master
fix naming inconsistency in tox.h
Diffstat (limited to 'toxcore')
-rw-r--r-- | toxcore/tox.c | 2 | ||||
-rw-r--r-- | toxcore/tox.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c index bdc110e6..487f2517 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -222,7 +222,7 @@ int tox_set_status_message(Tox *tox, uint8_t *status, uint16_t length) | |||
222 | return m_set_statusmessage(m, status, length); | 222 | return m_set_statusmessage(m, status, length); |
223 | } | 223 | } |
224 | 224 | ||
225 | int tox_set_userstatus(Tox *tox, TOX_USERSTATUS status) | 225 | int tox_set_user_status(Tox *tox, TOX_USERSTATUS status) |
226 | { | 226 | { |
227 | Messenger *m = tox; | 227 | Messenger *m = tox; |
228 | return m_set_userstatus(m, (USERSTATUS)status); | 228 | return m_set_userstatus(m, (USERSTATUS)status); |
diff --git a/toxcore/tox.h b/toxcore/tox.h index 407d7441..ccef8519 100644 --- a/toxcore/tox.h +++ b/toxcore/tox.h | |||
@@ -247,7 +247,7 @@ int tox_get_name(Tox *tox, int friendnumber, uint8_t *name); | |||
247 | * returns -1 on failure. | 247 | * returns -1 on failure. |
248 | */ | 248 | */ |
249 | int tox_set_status_message(Tox *tox, uint8_t *status, uint16_t length); | 249 | int tox_set_status_message(Tox *tox, uint8_t *status, uint16_t length); |
250 | int tox_set_userstatus(Tox *tox, TOX_USERSTATUS status); | 250 | int tox_set_user_status(Tox *tox, TOX_USERSTATUS status); |
251 | 251 | ||
252 | /* return the length of friendnumber's status message, including null. | 252 | /* return the length of friendnumber's status message, including null. |
253 | * Pass it into malloc | 253 | * Pass it into malloc |