From 632643de48157b4cc97a1e994f23e773fc9fc7d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 7 Oct 2022 12:13:47 -0400
Subject: [PATCH] misc: fix warnings by using libfmt
Change-Id: I7c22af5885e6e0386f4723d68bfee727faf8d068
---
src/ice_transport.cpp | 2 +-
src/logger.h | 1 +
src/sip/sipcall.cpp | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 7515a26a1b..514708a8dd 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -668,7 +668,7 @@ IceTransport::Impl::flushTimerHeapAndIoQueue()
auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::steady_clock::now() - start);
- JAMI_DBG("[ice:%p] Timer heap flushed after %ld ms", this, duration.count());
+ JAMI_DEBUG("[ice:{}] Timer heap flushed after {}", fmt::ptr(this), duration);
return static_cast<int>(pj_timer_heap_count(config_.stun_cfg.timer_heap));
}
diff --git a/src/logger.h b/src/logger.h
index 290b1ab534..37cfcdf80e 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -26,6 +26,7 @@
//#define __STDC_FORMAT_MACROS 1
#include <fmt/core.h>
#include <fmt/format.h>
+#include <fmt/chrono.h>
#include <cinttypes> // for PRIx64
#include <cstdarg>
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index ea12dea0c1..9458bcddd4 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -1838,9 +1838,9 @@ SIPCall::addLocalIceAttributes()
// resolution or other issues).
auto duration = std::chrono::steady_clock::now() - start;
if (duration > EXPECTED_ICE_INIT_MAX_TIME) {
- JAMI_WARN("[call:%s] ICE initialization time was unexpectedly high (%ld ms)",
- getCallId().c_str(),
- std::chrono::duration_cast<std::chrono::milliseconds>(duration).count());
+ JAMI_WARNING("[call:{:s}] ICE initialization time was unexpectedly high ({})",
+ getCallId(),
+ std::chrono::duration_cast<std::chrono::milliseconds>(duration));
}
}
--
GitLab