From 01a2b611988941c5739de2fb8a48a9409a60a1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 26 Mar 2019 14:36:53 -0400
Subject: [PATCH] dring: fix SonarQube issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I273f3e53c6d702ebe87bb0feeafb39f590eee516
Reviewed-by: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
---
src/manager.cpp | 2 +-
src/manager.h | 2 +-
src/ringdht/namedirectory.cpp | 4 ++--
src/threadloop.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/manager.cpp b/src/manager.cpp
index 181a668b41..9344bba7f9 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -707,7 +707,7 @@ Manager::init(const std::string &config_file)
#endif
#define PJSIP_TRY(ret) do { \
- if (ret != PJ_SUCCESS) \
+ if ((ret) != PJ_SUCCESS) \
throw std::runtime_error(#ret " failed"); \
} while (0)
diff --git a/src/manager.h b/src/manager.h
index f5b3a430a5..f50bf67c21 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -899,7 +899,7 @@ private:
// Helper to install a callback to be called once by the main event loop
template<typename Callback>
static void runOnMainThread(Callback&& cb) {
- Manager::instance().scheduler().run([cb = std::move(cb)]() mutable {
+ Manager::instance().scheduler().run([cb = std::forward<Callback>(cb)]() mutable {
cb();
});
}
diff --git a/src/ringdht/namedirectory.cpp b/src/ringdht/namedirectory.cpp
index 1d19143ab9..c4dd81bec5 100644
--- a/src/ringdht/namedirectory.cpp
+++ b/src/ringdht/namedirectory.cpp
@@ -193,12 +193,12 @@ void NameDirectory::lookupName(const std::string& n, LookupCallback cb)
}
restbed::Uri uri(HTTPS_PROTO + serverHost_ + QUERY_NAME + name);
+ RING_DBG("Name lookup for %s: %s", name.c_str(), uri.to_string().c_str());
+
auto request = std::make_shared<restbed::Request>(std::move(uri));
request->set_header("Accept", "*/*");
request->set_header("Host", serverHost_);
- RING_DBG("Name lookup for %s: %s", name.c_str(), uri.to_string().c_str());
-
auto ret = restbed::Http::async(request, [this,cb,name](const std::shared_ptr<restbed::Request>&,
const std::shared_ptr<restbed::Response>& reply) {
auto code = reply->get_status_code();
diff --git a/src/threadloop.h b/src/threadloop.h
index d687fb58a6..4eaa8ca9e4 100644
--- a/src/threadloop.h
+++ b/src/threadloop.h
@@ -117,7 +117,7 @@ public:
throw std::runtime_error("Can not call wait outside thread context");
std::unique_lock<std::mutex> lk(mutex_);
- cv_.wait(lk, [this, p = std::move(pred)]{ return isStopping() || p(); });
+ cv_.wait(lk, [this, p = std::forward<Pred>(pred)]{ return isStopping() || p(); });
}
private:
--
GitLab