X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_handler.cpp;h=b2bbcd145302ebbdd99485a1b815f963f088ab2e;hp=dfaa23c9516b2b545eddb8c25c2a61a5417ca7f1;hb=9a5d7790b094439b9a6f16983e20493c0e43ee02;hpb=fb3345ada7ea94225b78994fd50e3de693a2a3d5 diff --git a/src/socket_handler.cpp b/src/socket_handler.cpp index dfaa23c..b2bbcd1 100644 --- a/src/socket_handler.cpp +++ b/src/socket_handler.cpp @@ -159,6 +159,7 @@ void socket_handler::set_write_timeout(long long new_write_timeout) @param[in,out] usec_timeout wait until new data is found, max timeout usecs. -1: wait endless 0: return instantly + @param[out] usec_timeout_remaining microseconds from the timeout that were not used */ bool socket_handler::data_waiting(long long usec_timeout,long long* usec_timeout_remaining) { @@ -200,11 +201,12 @@ bool socket_handler::data_waiting(long long usec_timeout,long long* usec_timeout @param[in,out] usec_timeout wait until new data is found, max timeout usecs. -1: wait endless 0: return instantly + @param[out] usec_timeout_remaining microseconds from the timeout that were not used */ -bool socket_handler::fill_buffer(std::string& buffer, long long usec_timeout, long long *timeout_remaining) +bool socket_handler::fill_buffer(std::string& buffer, long long usec_timeout, long long *usec_timeout_remaining) { // fast path for timeout==0 - if (usec_timeout==0 || data_waiting(usec_timeout,timeout_remaining)) + if (usec_timeout==0 || data_waiting(usec_timeout,usec_timeout_remaining)) return fill_buffer(buffer); else return false;