Merged Ito and put it in the BU namespace. I should probably clean up the

formatting on the comments, some of the lines wrap, but I'm not too worried
about it right now.  I also fixed up the doxygen config and build.conf files
so that everything is building nice and smooth now.

1 files changed, 4 insertions, 12 deletions

diff --git a/src/socket.cpp b/src/socket.cpp
index c4f914b..455b5c8 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -118,6 +118,7 @@ void Bu::Socket::close()
         //}
 }
 
+/*
 void Bu::Socket::read()
 {
         char buffer[RBS];
@@ -132,7 +133,6 @@ void Bu::Socket::read()
                 if( nbytes < 0 && errno != 0 && errno != EAGAIN )
                 {
                         //printf("errno: %d, %s\n", errno, strerror( errno ) );
-                        /* Read error. */
                         //perror("readInput");
                         throw ConnectionException(
                                 excodeReadError,
@@ -146,15 +146,13 @@ void Bu::Socket::read()
                                 break;
                         nTotalRead += nbytes;
                         sReadBuf.append( buffer, nbytes );
-                        /* Data read. */
                         if( nbytes < RBS )
                         {
                                 break;
                         }
 
-                        /* New test, if data is divisible by RBS bytes on some libs the
-                         * read could block, this keeps it from happening.
-                         */
+                        // New test, if data is divisible by RBS bytes on some libs the
+                        // read could block, this keeps it from happening.
                         {
                                 fd_set rfds;
                                 FD_ZERO(&rfds);
@@ -171,13 +169,7 @@ void Bu::Socket::read()
                         }
                 }
         }
-
-        /*
-        if( pProtocol != NULL && nTotalRead > 0 )
-        {
-                pProtocol->onNewData();
-        }*/
-}
+}*/
 
 size_t Bu::Socket::read( void *pBuf, size_t nBytes )
 {