Changeset 6919 for source/ariba/communication

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

Files:

• BaseCommunication.cpp (modified) (3 diffs)
• BaseCommunication.h (modified) (2 diffs)
• EndpointDescriptor.h (modified) (1 diff)
• messages/AribaBaseMsg.cpp (modified) (1 diff)
• networkinfo/AddressDiscovery.cpp (modified) (1 diff)
• networkinfo/NetworkChangeDetection.cpp (modified) (1 diff)
• networkinfo/NetworkChangeDetection.h (modified) (1 diff)
• networkinfo/NetworkInterface.cpp (modified) (1 diff)

source/ariba/communication/BaseCommunication.cpp

@@ -539 +539 @@
 /// query a descriptor by local link id
 BaseCommunication::LinkDescriptor& BaseCommunication::queryLocalLink( const LinkID& link ) const {
-        for (int i=0; i<linkSet.size();i++)
+        for (size_t i=0; i<linkSet.size();i++)
                 if (linkSet[i]->localLink == link) return (LinkDescriptor&)*linkSet[i];
 
@@ -547 +547 @@
 /// query a descriptor by remote link id
 BaseCommunication::LinkDescriptor& BaseCommunication::queryRemoteLink( const LinkID& link ) const {
-        for (int i=0; i<linkSet.size();i++)
+        for (size_t i=0; i<linkSet.size();i++)
                 if (linkSet[i]->remoteLink == link) return (LinkDescriptor&)*linkSet[i];
 
@@ -555 +555 @@
 LinkIDs BaseCommunication::getLocalLinks( const address_v* addr ) const {
         LinkIDs ids;
-        for (int i=0; i<linkSet.size(); i++){
+        for (size_t i=0; i<linkSet.size(); i++){
                 if( addr == NULL ){
                         ids.push_back( linkSet[i]->localLink );

source/ariba/communication/BaseCommunication.h

@@ -41 +41 @@
 
 // boost & std includes
-#include <ext/hash_map>
-#include <ext/hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
 #include <map>
 #include <set>
@@ -239 +239 @@
                 /// link identifiers
                 LinkID localLink;
+                const address_v* localLocator;
+
+                /// used underlay addresses for the link
                 LinkID remoteLink;
-
-                /// used underlay addresses for the link
-                const address_v* localLocator;
                 const address_v* remoteLocator;
 

source/ariba/communication/EndpointDescriptor.h

@@ -107 +107 @@
         EndpointDescriptor& operator=( const EndpointDescriptor& rhs) {
                 endpoints = rhs.endpoints;
+                return *this;
         }
 

source/ariba/communication/messages/AribaBaseMsg.cpp

@@ -66 +66 @@
                         return "typeLinkUpdate";
                 default:
-                        "unknown";
+                        return "unknown";
         }
         return "unknown";

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 )
 {
 }