X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_handler.cpp;h=91d5899c006300c8976685759837df12835732ae;hp=7740780a07a4ae0e66f0f1072198891817f89ea9;hb=4b995a82e29808cf8125889f83ec70fc7b5c77af;hpb=e1614a6d1d9c022b83c0aa8cdb948bd7dc98ff23

diff --git a/src/socket_handler.cpp b/src/socket_handler.cpp
index 7740780..91d5899 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;
@@ -221,6 +223,7 @@ bool socket_handler::fill_buffer(std::string& buffer)
     char socket_buffer[recv_buffer_size];
 
     int nbytes = read (sock, socket_buffer, recv_buffer_size);
+
     if (nbytes < 0)
     {
         if (errno == EAGAIN)
@@ -264,7 +267,7 @@ bool socket_handler::fill_buffer(std::string& buffer)
 /// connection because it encapsulates the data.
 void socket_handler::socket_write(const std::string& data)
 {
-    int offset = 0;
+    unsigned int offset = 0;
     while (offset < data.size())
     {
         unsigned int write_size=write_block_size;