From 2be1278e76fa04b7d0bfea034f49488738e1e642 Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Thu, 6 Mar 2008 20:46:17 +0000 Subject: [PATCH] Remove warnings and text output git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24281 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/bluetooth/LocalDevice.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/kits/bluetooth/LocalDevice.cpp b/src/kits/bluetooth/LocalDevice.cpp index 93d7fc55b3..58dd793e36 100644 --- a/src/kits/bluetooth/LocalDevice.cpp +++ b/src/kits/bluetooth/LocalDevice.cpp @@ -108,7 +108,7 @@ uint32 LocalDevice::GetLocalDeviceCount() { if (SRetrieveBluetoothMessenger() != B_OK) - return NULL; + return 0; BMessage request(BT_MSG_COUNT_LOCAL_DEVICES); BMessage reply; @@ -116,7 +116,7 @@ LocalDevice::GetLocalDeviceCount() if (sfMessenger->SendMessage(&request, &reply) == B_OK) return reply.FindInt32("count"); else - return B_ERROR; + return 0; } @@ -165,14 +165,14 @@ LocalDevice::SetDiscoverable(int mode) BMessage reply; int8 bt_status = BT_ERROR; - /* ADD ID */ + request.AddInt32("hci_id", hid); - /* Add command */ + // TODO: Add the raw command to the BMessage + expected event if (fMessenger->SendMessage(&request, &reply) == B_OK) { if (reply.FindInt8("status", &bt_status ) == B_OK ) { - + return bt_status; } @@ -199,9 +199,7 @@ LocalDevice::GetBluetoothAddress() if (fMessenger->SendMessage(&request, &reply) == B_OK) { - if (reply.FindData("bdaddr", B_ANY_TYPE, 0, (const void**)&bdaddr, &size) == B_OK ){ - - printf("%s: %s size=%ld\n", __FUNCTION__, bdaddrUtils::ToString(*bdaddr), size); + if (reply.FindData("bdaddr", B_ANY_TYPE, 0, (const void**)&bdaddr, &size) == B_OK ){ return *bdaddr; @@ -242,7 +240,8 @@ DeviceClass LocalDevice::GetDeviceClass() { - return NULL; + return DeviceClass(0); + }