diff --git a/src/logger.cpp b/src/logger.cpp index e28bac5bec3ddfedf78e4d5c7c8e77485882b9a3..a440ddb871b85862a92fb04bfe4f3011188b28ce 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)