fix various warnings
Change-Id: Iecf54a3a0368c99705969679fe18ceda59ce4290
diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
index 55a6929..ecfc505 100644
--- a/src/connectionmanager.cpp
+++ b/src/connectionmanager.cpp
@@ -662,7 +662,7 @@
if (auto shared = w.lock()) {
shared->connectDevice(cert,
name,
- [cb, deviceId](const std::shared_ptr<ChannelSocket>& sock, const DeviceId& did){
+ [cb, deviceId](const std::shared_ptr<ChannelSocket>& sock, const DeviceId& /*did*/){
cb(sock, deviceId);
},
noNewSocket,
@@ -771,7 +771,6 @@
}
ice_config.tcpEnable = true;
ice_config.onInitDone = [w,
- deviceId = std::move(deviceId),
devicePk = std::move(devicePk),
name = std::move(name),
cert = std::move(cert),
diff --git a/src/multiplexed_socket.cpp b/src/multiplexed_socket.cpp
index 97c9e1c..28e5c11 100644
--- a/src/multiplexed_socket.cpp
+++ b/src/multiplexed_socket.cpp
@@ -62,9 +62,8 @@
const DeviceId& deviceId,
std::unique_ptr<TlsSocketEndpoint> endpoint)
: parent_(parent)
- , deviceId(deviceId)
, ctx_(std::move(ctx))
- , beaconTimer_(*ctx_)
+ , deviceId(deviceId)
, endpoint(std::move(endpoint))
, eventLoopThread_ {[this] {
try {
@@ -75,6 +74,7 @@
shutdown();
}
}}
+ , beaconTimer_(*ctx_)
{}
~Impl() {}
diff --git a/src/upnp/protocol/pupnp/pupnp.cpp b/src/upnp/protocol/pupnp/pupnp.cpp
index e5e1a42..d1feed9 100644
--- a/src/upnp/protocol/pupnp/pupnp.cpp
+++ b/src/upnp/protocol/pupnp/pupnp.cpp
@@ -78,7 +78,7 @@
}
static bool
-errorOnResponse(IXML_Document* doc)
+errorOnResponse(IXML_Document* doc, const std::shared_ptr<dht::log::Logger>& logger)
{
if (not doc)
return true;
@@ -86,9 +86,9 @@
auto errorCode = getFirstDocItem(doc, "errorCode");
if (not errorCode.empty()) {
auto errorDescription = getFirstDocItem(doc, "errorDescription");
- // if (logger_) logger_->warn("PUPnP: Response contains error: {:s}: {:s}",
- // errorCode,
- // errorDescription);
+ if (logger) logger->warn("PUPnP: Response contains error: {:s}: {:s}",
+ errorCode,
+ errorDescription);
return true;
}
return false;
@@ -1154,7 +1154,7 @@
}
XMLDocument response(response_container_ptr, ixmlDocument_free);
- if (errorOnResponse(response.get())) {
+ if (errorOnResponse(response.get(), logger_)) {
if (logger_) logger_->warn("PUPnP: Failed to get GetStatusInfo from {} -> {:d}: {}",
igd.getServiceType().c_str(),
upnp_err,
@@ -1206,7 +1206,7 @@
return {};
}
- if (errorOnResponse(response.get())) {
+ if (errorOnResponse(response.get(), logger_)) {
if (logger_) logger_->warn("PUPnP: Failed to get GetExternalIPAddress from {} -> {:d}: {}",
igd.getServiceType(),
upnp_err,