WebSVN - Projects - Path Comparison - /bioloid/ Rev 237 and /bioloid/ Rev 238

Ignore whitespace Rev 237 → Rev 238

 /bioloid/cli/SerialBus.h
 ,7 → 109,7
     bool        m_debug;
     int         m_fd;
-    int         m_dataBytes;
+    size_t      m_dataBytes;
     uint8_t     m_data[ 128 ];
 };

 /bioloid/cli/NetBus.cpp
 ,9 → 51,9
 */
 NetBus::NetBus()
-    : m_dataBytes( 0 ),
-      m_debug( false ),
-      m_initialized( false )
+    : m_debug( false ),
+      m_initialized( false ),
+      m_dataBytes( 0 )
 {
 }
 ,7 → 150,6
     {
         int   seg;
         char *segStr  = hostName;
-        char *endPtr;
         // The hostname is only made up of numbers and dots. We'll parse
         // it ourselves.
 ,6 → 273,8
                ntohs( m_sockAddr.sin_port ));
     Log( "Connected to %s\n", m_connectionInfo );
+    return true;
 }
 //***************************************************************************
 ,7 → 284,7
 void NetBus::WriteBuffer()
 {
-    size_t  bytesWritten;
+//    size_t  bytesWritten;
     if ( m_debug )
     {

 /bioloid/cli/NetBus.h
 ,6 → 32,7
 #if defined( WIN32 )
 #include <windows.h>
 #else
+typedef int SOCKET;
 #include <netinet/in.h>
 #endif
 ,8 → 114,8
     bool                m_initialized;
-    int                 m_socket;       ///< Socket handle
-    int                 m_dataBytes;
+    SOCKET              m_socket;       ///< Socket handle
+    size_t              m_dataBytes;
     uint8_t             m_data[ 128 ];
     unsigned short      m_defaultPort;  ///< Default Port number (if none specified)
     struct sockaddr_in  m_sockAddr;     ///< Socket address for the remote end

 /bioloid/cli/bioloid.cpp
 ,7 → 135,7
 */
 void AddDevType( BLD_DevType_t *devType )
 {
-    int     devTypeIdx;
+    unsigned    devTypeIdx;
     if ( gNumDevTypes >= MAX_DEV_TYPES )
     {
 ,7 → 256,6
     char               *shortOpts = shortOptsStr;
     struct option      *scanOpt;
     int                 opt;
-    int                 arg;
     const char         *baudStr = DEFAULT_BAUD;
     const char         *portStr = DEFAULT_PORT;
 #endif

 /bioloid/cli/SerialBus.cpp
 ,8 → 47,8
 SerialBus::SerialBus()
     : m_serialPort( NULL ),
-      m_dataBytes( 0 ),
-      m_debug( false )
+      m_debug( false ),
+      m_dataBytes( 0 )
 {
 }

/bioloid/cli/DevTypeParser.cpp
133,6 → 133,7
return false;
}
}
return true;
}

//***************************************************************************