From 0cc48cfdfb2d38d4ad8e78a2d47752e7eee848e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sat, 23 Jul 2022 18:37:22 -0400
Subject: [PATCH] logger: move more symbols in jami namespace
Change-Id: I0fe99a8d44f8bc5271bea0b7b6a0e377f051f0ab
---
src/logger.cpp | 68 +++++++++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/logger.cpp b/src/logger.cpp
index e28bac5bec..a440ddb871 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -89,6 +89,40 @@
#define LOGFILE "jami"
+static const char*
+check_error(int result, char* buffer)
+{
+ switch (result) {
+ case 0:
+ return buffer;
+
+ case ERANGE: /* should never happen */
+ return "unknown (too big to display)";
+
+ default:
+ return "unknown (invalid error number)";
+ }
+}
+
+static const char*
+check_error(char* result, char*)
+{
+ return result;
+}
+
+void
+strErr(void)
+{
+#ifdef __GLIBC__
+ JAMI_ERR("%m");
+#else
+ char buf[1000];
+ JAMI_ERR("%s", check_error(strerror_r(errno, buf, sizeof(buf)), buf));
+#endif
+}
+
+namespace jami {
+
static constexpr auto ENDL = '\n';
// extract the last component of a pathname (extract a filename from its dirname)
@@ -172,40 +206,6 @@ contextHeader(const char* const file, int line)
return out.str();
}
-static const char*
-check_error(int result, char* buffer)
-{
- switch (result) {
- case 0:
- return buffer;
-
- case ERANGE: /* should never happen */
- return "unknown (too big to display)";
-
- default:
- return "unknown (invalid error number)";
- }
-}
-
-static const char*
-check_error(char* result, char*)
-{
- return result;
-}
-
-void
-strErr(void)
-{
-#ifdef __GLIBC__
- JAMI_ERR("%m");
-#else
- char buf[1000];
- JAMI_ERR("%s", check_error(strerror_r(errno, buf, sizeof(buf)), buf));
-#endif
-}
-
-namespace jami {
-
struct BufDeleter
{
void operator()(char* ptr)
--
GitLab