Changeset 6919 for source/ariba/communication/networkinfo

Timestamp:

Nov 13, 2009, 1:41:34 PM (14 years ago)

Author:

mies

Message:

Fixed tons of warnings when using CXXFLAGS="-Wall"!

Location:

source/ariba/communication/networkinfo

Files:

• AddressDiscovery.cpp (modified) (1 diff)
• NetworkChangeDetection.cpp (modified) (1 diff)
• NetworkChangeDetection.h (modified) (1 diff)
• NetworkInterface.cpp (modified) (1 diff)

source/ariba/communication/networkinfo/AddressDiscovery.cpp

@@ -95 +95 @@
 void AddressDiscovery::discover_ip_addresses( endpoint_set& endpoints ) {
         struct ifaddrs* ifaceBuffer = NULL;
-        struct ifaddrs* tmpAddr     = NULL;
         void*           tmpAddrPtr  = NULL;
 

source/ariba/communication/networkinfo/NetworkChangeDetection.cpp

@@ -190 +190 @@
 
                 for( ; bytesRead > 0; header = NLMSG_NEXT(header, bytesRead)) {
-                        if (    !NLMSG_OK(header, bytesRead) ||
+                        if (!NLMSG_OK(header, (int)bytesRead) ||
                                 (size_t) bytesRead < sizeof(struct nlmsghdr) ||
-                                (size_t) bytesRead < header->nlmsg_len) {
+                                (size_t) bytesRead < (size_t)header->nlmsg_len) {
                                 continue;
                         }

source/ariba/communication/networkinfo/NetworkChangeDetection.h

@@ -93 +93 @@
         void stopMonitoring();
 
+        volatile bool running;
         boost::thread* monitoringThread;
-        volatile bool running;
         static void monitoringThreadFunc( NetworkChangeDetection* obj );
 

source/ariba/communication/networkinfo/NetworkInterface.cpp

@@ -47 +47 @@
         name( "" ), index( -1 ), isRunning( false ),
         isUp( false ), isLoopback(false ), isBroadcast( false ),
-        mtu( -1 ), isMulticast( false ), txQueueLen( -1 )
+        isMulticast( false ), mtu( -1 ), txQueueLen( -1 )
 {
 }