diff --git a/src/jamidht/contact_list.cpp b/src/jamidht/contact_list.cpp index f096bd7011da807504222875dd66de397ddf7c65..0480873f635efd64d4a19c1e780096112c8506e9 100644 --- a/src/jamidht/contact_list.cpp +++ b/src/jamidht/contact_list.cpp @@ -515,21 +515,20 @@ ContactList::foundAccountDevice(const std::shared_ptr<dht::crypto::Certificate>& // match certificate chain auto verifyResult = accountTrust_.verify(*crt); if (not verifyResult) { - JAMI_WARN("[Contacts] Found invalid account device: %s: %s", - id.toString().c_str(), - verifyResult.toString().c_str()); + JAMI_WARNING("[Contacts] Found invalid account device: {:s}: {:s}", + id, verifyResult.toString()); return false; } // insert device auto it = knownDevices_.emplace(id, KnownDevice {crt, name, updated}); if (it.second) { - JAMI_DBG("[Contacts] Found account device: %s %s", name.c_str(), id.toString().c_str()); + JAMI_LOG("[Contacts] Found account device: {} {}", name, id); jami::Manager::instance().certStore(accountId_).pinCertificate(crt); if (crt->ocspResponse) { unsigned int status = crt->ocspResponse->getCertificateStatus(); if (status == GNUTLS_OCSP_CERT_REVOKED) { - JAMI_ERR("Certificate %s has revoked OCSP status", id.to_c_str()); + JAMI_ERROR("Certificate {} has revoked OCSP status", id); trust_->setCertificateStatus(crt, dhtnet::tls::TrustStore::PermissionStatus::BANNED, false); } } @@ -538,7 +537,7 @@ ContactList::foundAccountDevice(const std::shared_ptr<dht::crypto::Certificate>& } else { // update device name if (not name.empty() and it.first->second.name != name) { - JAMI_DBG("[Contacts] Updating device name: %s %s", name.c_str(), id.to_c_str()); + JAMI_LOG("[Contacts] updating device name: {} {}", name, id); it.first->second.name = name; saveKnownDevices(); callbacks_.devicesChanged(knownDevices_); diff --git a/src/jamidht/namedirectory.cpp b/src/jamidht/namedirectory.cpp index ffb384f3221e532a82deb8afbefe427e66b42ea5..d61fc8babc540b638b6e204ee771ed92d30e21a5 100644 --- a/src/jamidht/namedirectory.cpp +++ b/src/jamidht/namedirectory.cpp @@ -486,7 +486,7 @@ NameDirectory::loadCache() std::lock_guard lock(dhtnet::fileutils::getFileLock(cachePath_)); std::ifstream file(cachePath_); if (!file.is_open()) { - JAMI_DEBUG("Unable to load %s", cachePath_); + JAMI_DEBUG("Unable to load {}", cachePath_); return; } std::string line;