diff options
author | irungentoo <irungentoo@gmail.com> | 2014-03-18 20:02:50 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-03-18 20:02:50 -0400 |
commit | 5770a0e29ab35efb1ef656ab81c499635fc5fecf (patch) | |
tree | 7b28f3f181dcb37c5b137759398c3ba1aeb95b8f /auto_tests/friends_test.c | |
parent | 6f0f3632c08e317493a85160b54361f64106fd63 (diff) | |
parent | 5babb281c05a48c0b4bbfe3c6be1527f439beec2 (diff) |
Merge branch 'api-fix'
Main changes:
1. Strings no longer need to be NULL terminated.
2. tox_get_friend_id is now named tox_get_friend_number.
3. The friend request callback function is now (Tox *tox, uint8_t *,
uint8_t *, uint16_t, void *), the Tox object pointer has been added to
it.
Diffstat (limited to 'auto_tests/friends_test.c')
-rw-r--r-- | auto_tests/friends_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/auto_tests/friends_test.c b/auto_tests/friends_test.c index 5071319e..2448f97c 100644 --- a/auto_tests/friends_test.c +++ b/auto_tests/friends_test.c | |||
@@ -116,7 +116,7 @@ int parent_friend_request(DHT *dht) | |||
116 | return 0; | 116 | return 0; |
117 | } | 117 | } |
118 | 118 | ||
119 | void child_got_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata) | 119 | void child_got_request(Messenger *m, uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata) |
120 | { | 120 | { |
121 | fputs("OK\nsending status to parent", stdout); | 121 | fputs("OK\nsending status to parent", stdout); |
122 | fflush(stdout); | 122 | fflush(stdout); |