diff --git a/src/data_transfer.cpp b/src/data_transfer.cpp index af6c463de3c23528b46b6472b0dec4dbbb9ea796..4a902c530d08692c563de3151b1448b02f1eaada 100644 --- a/src/data_transfer.cpp +++ b/src/data_transfer.cpp @@ -984,7 +984,7 @@ TransferManager::sendFile(const std::string& path, // If the transfer is already in progress (aka not finished) // we do not need to send the request and can ignore it. if (!it->second->isFinished()) { - JAMI_DBG("Can't send request for %lu. Already sending the file", tid); + JAMI_DEBUG("Can't send request for {}. Already sending the file", tid); return {}; } pimpl_->oMap_.erase(it); @@ -1024,7 +1024,7 @@ TransferManager::acceptFile(const DRing::DataTransferId& id, const std::string& std::lock_guard<std::mutex> lk {pimpl_->mapMutex_}; auto it = pimpl_->iMap_.find(id); if (it == pimpl_->iMap_.end()) { - JAMI_WARN("Cannot accept %lu, request not found", id); + JAMI_WARNING("Cannot accept {:d}, request not found", id); return false; } it->second->accept(path, 0); diff --git a/src/jamidht/connectionmanager.cpp b/src/jamidht/connectionmanager.cpp index f85179b0c1acc04cfd803c4dd6052645dfcfc879..ed6ab23457ca2ca4053667574a33b19135b3e315 100644 --- a/src/jamidht/connectionmanager.cpp +++ b/src/jamidht/connectionmanager.cpp @@ -912,7 +912,7 @@ ConnectionManager::Impl::onDhtPeerRequest(const PeerConnectionRequest& req, }; ice_config.tcpEnable = true; - ice_config.onInitDone = [w, req, deviceId, eraseInfo](bool ok) { + ice_config.onInitDone = [w, req, eraseInfo](bool ok) { auto shared = w.lock(); if (!shared) return; @@ -932,7 +932,7 @@ ConnectionManager::Impl::onDhtPeerRequest(const PeerConnectionRequest& req, }); }; - ice_config.onNegoDone = [w, req, eraseInfo, deviceId](bool ok) { + ice_config.onNegoDone = [w, req, eraseInfo](bool ok) { auto shared = w.lock(); if (!shared) return; diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp index c6dbeb089d5f8d493f4a0853b5b73617edc70d43..4c044e16ea4320337bc9b01780375b4e295f0e86 100644 --- a/src/jamidht/jamiaccount.cpp +++ b/src/jamidht/jamiaccount.cpp @@ -382,7 +382,7 @@ JamiAccount::newIncomingCall(const std::string& from, const std::vector<DRing::MediaMap>& mediaList, const std::shared_ptr<SipTransport>& sipTransp) { - JAMI_DBG("New incoming call from %s with %lu media", from.c_str(), mediaList.size()); + JAMI_DEBUG("New incoming call from {:s} with {:d} media", from, mediaList.size()); if (sipTransp) { std::unique_lock<std::mutex> connLock(sipConnsMtx_); diff --git a/src/jamidht/multiplexed_socket.cpp b/src/jamidht/multiplexed_socket.cpp index 727a0d2f6218fd7544644a88721d26bf23d1b0fd..0bf7ac5428c161e3fd6a013cab14f619dd164713 100644 --- a/src/jamidht/multiplexed_socket.cpp +++ b/src/jamidht/multiplexed_socket.cpp @@ -651,15 +651,15 @@ MultiplexedSocket::monitor() const if (!cert || !cert->issuer) return; auto userUri = cert->issuer->getId().toString(); - JAMI_DBG("- Socket with device: %s - account: %s", deviceId().to_c_str(), userUri.c_str()); + JAMI_DEBUG("- Socket with device: {:s} - account: {:s}", deviceId().to_c_str(), userUri); auto now = clock::now(); - JAMI_DBG("- Duration: %lu", - std::chrono::duration_cast<std::chrono::milliseconds>(now - pimpl_->start_).count()); + JAMI_DEBUG("- Duration: {}", + std::chrono::duration_cast<std::chrono::milliseconds>(now - pimpl_->start_)); pimpl_->endpoint->monitor(); std::lock_guard<std::mutex> lk(pimpl_->socketsMutex); for (const auto& [_, channel] : pimpl_->sockets) { if (channel) - JAMI_DBG("\t\t- Channel with name %s", channel->name().c_str()); + JAMI_DEBUG("\t\t- Channel with name {:s}", channel->name()); } } diff --git a/src/manager.cpp b/src/manager.cpp index b7ca600a221ead80a5c28d05ab9039f47e0fccd8..c8e894dd5e1d709994fea69ca51e3d9b0ddd77d2 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -1848,9 +1848,9 @@ Manager::incomingCall(const std::string& accountId, Call& call) JAMI_WARN("Incoming call %s has an empty media list", call.getCallId().c_str()); } - JAMI_INFO("Incoming call %s on account %s with %lu media", - call.getCallId().c_str(), - accountId.c_str(), + JAMI_DEBUG("Incoming call {:s} on account {:s} with {:d} media", + call.getCallId(), + accountId, mediaList.size()); // Report the call using new API.