Commit 768480b0 authored by Brendan Long's avatar Brendan Long

Fix unused parameter and variable warnings, plus no return value in void...

Fix unused parameter and variable warnings, plus no return value in void function warnings (due to DSB_ASSERT() only working on Apple platforms).
parent 23b7c92c
......@@ -75,68 +75,68 @@ adapter::zigbee::Adapter::Shutdown()
int32_t
adapter::zigbee::Adapter::EnumDevices(
bridge::EnumDeviceOptions opts,
bridge::AdapterDeviceVector& deviceList,
shared_ptr<bridge::IAdapterIoRequest>* req)
bridge::EnumDeviceOptions,
bridge::AdapterDeviceVector&,
shared_ptr<bridge::IAdapterIoRequest>*)
{
return -1;
}
int32_t
adapter::zigbee::Adapter::GetProperty(
shared_ptr<bridge::IAdapterProperty>& prop,
shared_ptr<bridge::IAdapterIoRequest>* req)
shared_ptr<bridge::IAdapterProperty>&,
shared_ptr<bridge::IAdapterIoRequest>*)
{
return -1;
}
int32_t
adapter::zigbee::Adapter::SetProperty(
shared_ptr<bridge::IAdapterProperty> const& prop,
shared_ptr<bridge::IAdapterIoRequest>* req)
shared_ptr<bridge::IAdapterProperty> const&,
shared_ptr<bridge::IAdapterIoRequest>*)
{
return -1;
}
int32_t
adapter::zigbee::Adapter::GetPropertyValue(
shared_ptr<bridge::IAdapterProperty> const& prop,
std::string const& attributeName,
shared_ptr<bridge::IAdapterValue>& value,
shared_ptr<bridge::IAdapterIoRequest>* req)
shared_ptr<bridge::IAdapterProperty> const&,
std::string const&,
shared_ptr<bridge::IAdapterValue>&,
shared_ptr<bridge::IAdapterIoRequest>*)
{
return -1;
}
int32_t
adapter::zigbee::Adapter::SetPropertyValue(
shared_ptr<bridge::IAdapterProperty> const& prop,
shared_ptr<bridge::IAdapterValue> const& value,
shared_ptr<bridge::IAdapterIoRequest>* req)
shared_ptr<bridge::IAdapterProperty> const&,
shared_ptr<bridge::IAdapterValue> const&,
shared_ptr<bridge::IAdapterIoRequest>*)
{
return -1;
}
int32_t
adapter::zigbee::Adapter::CallMethod(
shared_ptr<bridge::IAdapterMethod>& method,
shared_ptr<bridge::IAdapterIoRequest>* req)
shared_ptr<bridge::IAdapterMethod>&,
shared_ptr<bridge::IAdapterIoRequest>*)
{
return -1;
}
int32_t
adapter::zigbee::Adapter::RegisterSignalListener(
std::string const& signalName,
shared_ptr<bridge::IAdapterSignalListener> const& listener,
void* argp,
bridge::IAdapter::RegistrationHandle& handle)
std::string const&,
shared_ptr<bridge::IAdapterSignalListener> const&,
void*,
bridge::IAdapter::RegistrationHandle&)
{
return -1;
}
int32_t
adapter::zigbee::Adapter::UnregisterSignalListener(bridge::IAdapter::RegistrationHandle const& h)
adapter::zigbee::Adapter::UnregisterSignalListener(bridge::IAdapter::RegistrationHandle const&)
{
return -1;
}
......@@ -99,7 +99,7 @@ AllJoynAbout::GetDeviceId(std::string& deviceId)
}
QStatus
AllJoynAbout::ReadDeviceId(std::string& s)
AllJoynAbout::ReadDeviceId(std::string&)
{
// TODO read from config
return ER_FAIL;
......
......@@ -143,11 +143,12 @@ bridge::AllJoynHelper::SetMsgArg(IAdapterValue const& adapterValue, ajn::MsgArg&
}
QStatus
bridge::AllJoynHelper::SetMsgArgFromAdapterObject(IAdapterValue const& adapterValue, ajn::MsgArg& msg, DeviceMain* deviceMain)
bridge::AllJoynHelper::SetMsgArgFromAdapterObject(IAdapterValue const& adapterValue, ajn::MsgArg&, DeviceMain*)
{
// TODO:
QStatus st = ER_OK;
common::Variant const& val = adapterValue.GetData();
QCC_UNUSED(val);
// std::string path = deviceMain->GetBusObjectPath(adapterValue);
return st;
......@@ -187,7 +188,7 @@ bridge::AllJoynHelper::GetAdapterValue(IAdapterValue& adapterValue, ajn::MsgArg
}
QStatus
bridge::AllJoynHelper::GetAdapterObject(IAdapterValue& adapterValue, ajn::MsgArg const& msg, DeviceMain *deviceMain)
bridge::AllJoynHelper::GetAdapterObject(IAdapterValue&, ajn::MsgArg const&, DeviceMain*)
{
return ER_NOT_IMPLEMENTED;
}
......
......@@ -10,8 +10,8 @@ namespace
// TODO: make this configurable;
std::string const kBridgeConfigFile = "BridgeConfig.xml";
int const kMaxConnectionAttempts = 60;
int const kReconnectDelay = 500;
//int const kMaxConnectionAttempts = 60;
//int const kReconnectDelay = 500;
int const kDSBServicePort = 1000;
uint32_t const kSessionLinkTimeout = 30; // seconds
}
......@@ -128,13 +128,13 @@ ConfigManager::BuildServiceName()
}
bool
ConfigManager::AcceptSessionJoiner(ajn::SessionPort port, const char *joiner, const ajn::SessionOpts&)
ConfigManager::AcceptSessionJoiner(ajn::SessionPort port, const char*, const ajn::SessionOpts&)
{
return port == m_sessionPort;
}
void
ConfigManager::SessionJoined(ajn::SessionPort port, ajn::SessionId id, const char *joiner)
ConfigManager::SessionJoined(ajn::SessionPort, ajn::SessionId id, const char*)
{
m_busAttachment->EnableConcurrentCallbacks();
QStatus st = m_busAttachment->SetSessionListener(id, this);
......@@ -154,7 +154,7 @@ ConfigManager::SessionJoined(ajn::SessionPort port, ajn::SessionId id, const cha
}
void
ConfigManager::SessionMemberRemoved(ajn::SessionId, const char *uniqueName)
ConfigManager::SessionMemberRemoved(ajn::SessionId, const char*)
{
// TODO: Reset auth access
// TODO: End CSP file transfer
......
......@@ -18,7 +18,7 @@ bridge::DeviceMain::Shutdown()
}
QStatus
bridge::DeviceMain::Initialize(shared_ptr<BridgeDevice> const& parent)
bridge::DeviceMain::Initialize(shared_ptr<BridgeDevice> const&)
{
QStatus st = ER_OK;
return st;
......@@ -31,7 +31,7 @@ bridge::DeviceMain::IsMethodNameUnique(std::string const& name)
}
bool
bridge::DeviceMain::IsSignalNameUnique(std::string const& name)
bridge::DeviceMain::IsSignalNameUnique(std::string const&)
{
// TODO:
return false;
......
......@@ -29,7 +29,7 @@ namespace bridge
inline int GetIndexForMethod()
{ return m_indexForMethod++; }
inline std::string GetBusObjectPath(IAdapterProperty const& prop)
inline std::string GetBusObjectPath(IAdapterProperty const&)
{ return std::string(); }
private:
......
......@@ -9,31 +9,25 @@ bridge::DeviceMethod::~DeviceMethod()
}
uint32_t
bridge::DeviceMethod::InvokeMethod(
ajn::Message const& msg,
ajn::MsgArg* outargs,
size_t numOutArgs)
bridge::DeviceMethod::InvokeMethod(ajn::Message const&, ajn::MsgArg*, size_t)
{
return 0;
}
QStatus
bridge::DeviceMethod::Initialize(shared_ptr<DeviceMain> const& parent, shared_ptr<IAdapterMethod> const& adapterMethod)
bridge::DeviceMethod::Initialize(shared_ptr<DeviceMain> const&, shared_ptr<IAdapterMethod> const&)
{
return ER_NOT_IMPLEMENTED;
}
QStatus
bridge::DeviceMethod::SetName(std::string const& name)
bridge::DeviceMethod::SetName(std::string const&)
{
return ER_NOT_IMPLEMENTED;
}
QStatus
bridge::DeviceMethod::BuildSignature(
AdapterValueVector const& valueList,
std::string& signature,
std::string& parameterNames)
bridge::DeviceMethod::BuildSignature(AdapterValueVector const&, std::string&, std::string&)
{
return ER_NOT_IMPLEMENTED;
}
......
......@@ -6,17 +6,16 @@ using std::shared_ptr;
using std::weak_ptr;
using std::enable_shared_from_this;
using std::dynamic_pointer_cast;
#include <assert.h>
#define DSB_ASSERT(X) assert((X))
#else
#include <tr1/memory>
using std::tr1::shared_ptr;
using std::tr1::weak_ptr;
using std::tr1::enable_shared_from_this;
using std::tr1::dynamic_pointer_cast;
#define DSB_ASSERT(X)
#endif
#include <assert.h>
#define DSB_ASSERT(X) assert((X))
class AllJoynBusObject;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment