From 95728e1ebe23610a88541d1ae61ca0aaf7788546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 21 Nov 2019 13:49:49 -0500
Subject: [PATCH] sipcall: cleanup
Change-Id: Ie1ff7315e0d5dca1a63cb16aac4a3a4bff09415f
---
src/security/certstore.cpp | 3 +--
src/sip/sipcall.cpp | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp
index 78ecbfa894..309c838feb 100644
--- a/src/security/certstore.cpp
+++ b/src/security/certstore.cpp
@@ -84,8 +84,7 @@ void
CertificateStore::loadRevocations(crypto::Certificate& crt) const
{
auto dir = crlPath_+DIR_SEPARATOR_CH+crt.getId().toString();
- auto crl_dir_content = fileutils::readDirectory(dir);
- for (const auto& crl : crl_dir_content) {
+ for (const auto& crl : fileutils::readDirectory(dir)) {
try {
crt.addRevocationList(std::make_shared<crypto::RevocationList>(fileutils::loadFile(dir+DIR_SEPARATOR_CH+crl)));
} catch (const std::exception& e) {
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index 386e18a8dd..a541f1a534 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -243,11 +243,11 @@ SIPCall::sendSIPInfo(const char *const body, const char *const subtype)
if (not inv or not inv->dlg)
throw VoipLinkException("Couldn't get invite dialog");
- pj_str_t methodName = CONST_PJ_STR("INFO");
+ constexpr pj_str_t methodName = CONST_PJ_STR("INFO");
constexpr pj_str_t type = CONST_PJ_STR("application");
pjsip_method method;
- pjsip_method_init_np(&method, &methodName);
+ pjsip_method_init_np(&method, (pj_str_t*)&methodName);
/* Create request message. */
pjsip_tx_data *tdata;
--
GitLab