Changeset 6919 for source/ariba/utility/bootstrap

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/utility/bootstrap/modules

Files:

• bluetoothsdp/BluetoothSdp.cpp (modified) (5 diffs)
• periodicbroadcast/PeriodicBroadcast.h (modified) (2 diffs)

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp

@@ -64 +64 @@
 namespace utility {
 
+static bdaddr_t bd_addr_any = {{0, 0, 0, 0, 0, 0}};
+static bdaddr_t bd_addr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
+
 use_logging_cpp(BluetoothSdp);
 OverlayBootstrap* BluetoothSdp::CONNECTION_CHECKER = NULL;
@@ -216 +219 @@
         // connect to the local SDP server, register the service record
         if( sdp_session_ == NULL ){
-                sdp_session_ = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY);
+                sdp_session_ = sdp_connect(&bd_addr_any, &bd_addr_local, SDP_RETRY_IF_BUSY);
         }
 
@@ -275 +278 @@
 
                 bdaddr_t address;
-                uint8_t channel;
+//              uint8_t channel;
 
                 dev_id = hci_get_route(NULL);
@@ -339 +342 @@
         char name[256], info1[256], info2[256], info3[256];
 
-        session = sdp_connect(BDADDR_ANY, &target, SDP_RETRY_IF_BUSY);
+        session = sdp_connect(&bd_addr_any, &target, SDP_RETRY_IF_BUSY);
 
         if (session == NULL) {
@@ -401 +404 @@
          * Returns a string holding the bt adress in human readable form.
          */
-        char addr[32] = { 0 };
         char str[32] = { 0 };
         ba2str(ba, str);

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h

@@ -197 +197 @@
         public:
                 udp_server(boost::asio::io_service& io_service, ServiceList* _services, boost::mutex* _servicesmutex)
-                        : services(_services), servicesmutex(_servicesmutex),
-                                socket_v4(io_service), socket_v6(io_service) {
+                        : socket_v4(io_service), socket_v6(io_service),
+                          services(_services), servicesmutex(_servicesmutex) {
 
                         if( open4() ) start_receive_4();
@@ -350 +350 @@
 
                                 { // insert new found service
-                                        boost::mutex::scoped_lock( *servicesmutex );
+                                        boost::mutex::scoped_lock lock( *servicesmutex );
 
                                         ServiceList::iterator it = services->find( msg.getName() );