From e1183194678bfd94bf15dfaaf1e153076a07937a Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Fri, 7 Mar 2014 21:12:46 -0500 Subject: Some tox_wait_* improvements --- toxcore/Messenger.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'toxcore/Messenger.c') diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 81a347be..e48fa5fc 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -2342,19 +2342,24 @@ void do_messenger(Messenger *m) /* * functions to avoid excessive polling */ -int wait_prepare_messenger(Messenger *m, uint8_t *data, uint16_t *lenptr) +size_t wait_data_size() { - return networking_wait_prepare(m->net, sendqueue_total(m->net_crypto->lossless_udp), data, lenptr); + return networking_wait_data_size(); } -int wait_execute_messenger(Messenger *m, uint8_t *data, uint16_t len, uint16_t milliseconds) +int wait_prepare_messenger(Messenger *m, uint8_t *data) { - return networking_wait_execute(data, len, milliseconds); -}; + return networking_wait_prepare(m->net, sendqueue_total(m->net_crypto->lossless_udp), data); +} + +int wait_execute_messenger(uint8_t *data, long seconds, long microseconds) +{ + return networking_wait_execute(data, seconds, microseconds); +} -void wait_cleanup_messenger(Messenger *m, uint8_t *data, uint16_t len) +int wait_cleanup_messenger(Messenger *m, uint8_t *data) { - networking_wait_cleanup(m->net, data, len); + return networking_wait_cleanup(m->net, data); } /* new messenger format for load/save, more robust and forward compatible */ -- cgit v1.2.3