X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_handler.hxx;h=b91a505df7615052c070728af8ece0f12fef7077;hp=623f31c9495743eba3aad88af309afadf553133f;hb=238ad35f4e3b6516d4ba7611b540a0edeea71427;hpb=c7857475c8b0f02cac3ce29a617a4d542fa59f37

diff --git a/src/socket_handler.hxx b/src/socket_handler.hxx
index 623f31c..b91a505 100644
--- a/src/socket_handler.hxx
+++ b/src/socket_handler.hxx
@@ -38,7 +38,7 @@ class socket_handler
 
         socket_type_value socket_type;
 
-        bool data_waiting(long long usec_timeout,long long *timeout_remaining=NULL);
+        bool data_waiting(long long usec_timeout,long long *usec_timeout_remaining=NULL);
         void wait_ready_to_write(int socket, long long write_block_timeout);
 
     protected:
@@ -48,6 +48,7 @@ class socket_handler
         long long write_timeout;
 
         socket_handler(int _sock, socket_type_value _socket_type);
+        // TODO: No destructor?
 
         void set_socket_options(int sock);
 
@@ -58,7 +59,7 @@ class socket_handler
 
         virtual void close();
 
-        bool fill_buffer(std::string& buffer, long long usec_timeout, long long*timeout_remaining=NULL);
+        bool fill_buffer(std::string& buffer, long long usec_timeout, long long* usec_timeout_remaining=NULL);
         bool fill_buffer(std::string& buffer);
 
     public: