diff options
Diffstat (limited to 'src/systemd/sd-adapt/nm-sd-adapt.h')
| -rw-r--r-- | src/systemd/sd-adapt/nm-sd-adapt.h | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h index a8ff18bc..0d291e26 100644 --- a/src/systemd/sd-adapt/nm-sd-adapt.h +++ b/src/systemd/sd-adapt/nm-sd-adapt.h @@ -32,12 +32,24 @@ #define CLOCK_BOOTTIME 7 #endif +#if defined(HAVE_DECL_EXPLICIT_BZERO) && HAVE_DECL_EXPLICIT_BZERO == 1 +#define HAVE_EXPLICIT_BZERO 1 +#else +#define HAVE_EXPLICIT_BZERO 0 +#endif + +#define ENABLE_DEBUG_HASHMAP 0 + +#ifndef HAVE_SYS_AUXV_H +#define HAVE_SYS_AUXV_H 0 +#endif + /*****************************************************************************/ static inline NMLogLevel _slog_level_to_nm (int slevel) { - switch (slevel) { + switch (LOG_PRI (slevel)) { case LOG_DEBUG: return LOGL_DEBUG; case LOG_WARNING: return LOGL_WARN; case LOG_CRIT: @@ -48,7 +60,15 @@ _slog_level_to_nm (int slevel) } } -#define log_internal(level, error, file, line, func, format, ...) \ +static inline int +_nm_log_get_max_level_realm (void) +{ + /* inline function, to avoid coverity warning about constant expression. */ + return LOG_DEBUG; +} +#define log_get_max_level_realm(realm) _nm_log_get_max_level_realm () + +#define log_internal_realm(level, error, file, line, func, format, ...) \ ({ \ const int _nm_e = (error); \ const NMLogLevel _nm_l = _slog_level_to_nm ((level)); \ @@ -61,11 +81,6 @@ _slog_level_to_nm (int slevel) (_nm_e > 0 ? -_nm_e : _nm_e); \ }) -#define log_full_errno(level, error, ...) \ -({ \ - log_internal(level, error, __FILE__, __LINE__, __func__, __VA_ARGS__); \ -}) - #define log_assert_failed(text, file, line, func) \ G_STMT_START { \ log_internal (LOG_CRIT, 0, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.", text, file, line, func); \ @@ -171,10 +186,6 @@ static inline pid_t gettid(void) { return (pid_t) syscall(SYS_gettid); } -static inline bool is_main_thread(void) { - return TRUE; -} - #endif /* (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_SYSTEMD */ #endif /* NM_SD_ADAPT_H */ |