diff options
Diffstat (limited to 'src/nm-cloud-setup/nm-cloud-setup-utils.h')
| -rw-r--r-- | src/nm-cloud-setup/nm-cloud-setup-utils.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/nm-cloud-setup/nm-cloud-setup-utils.h b/src/nm-cloud-setup/nm-cloud-setup-utils.h index 3ca7298f..e1502b95 100644 --- a/src/nm-cloud-setup/nm-cloud-setup-utils.h +++ b/src/nm-cloud-setup/nm-cloud-setup-utils.h @@ -3,7 +3,7 @@ #ifndef __NM_CLOUD_SETUP_UTILS_H__ #define __NM_CLOUD_SETUP_UTILS_H__ -#include "libnm-glib-aux/nm-logging-fwd.h" +#include "libnm-glib-aux/nm-logging-base.h" /*****************************************************************************/ @@ -13,26 +13,14 @@ /*****************************************************************************/ -extern volatile NMLogLevel _nm_logging_configured_level; - -static inline gboolean -nm_logging_enabled(NMLogLevel level) -{ - return level >= _nm_logging_configured_level; -} - -void _nm_logging_enabled_init(const char *level_str); - -void _nm_log_impl_cs(NMLogLevel level, const char *fmt, ...) _nm_printf(2, 3); - -#define _nm_log(level, ...) _nm_log_impl_cs((level), __VA_ARGS__); +#define _nm_log(level, ...) _nm_log_simple_printf((level), __VA_ARGS__); #define _NMLOG(level, ...) \ G_STMT_START \ { \ const NMLogLevel _level = (level); \ \ - if (nm_logging_enabled(_level)) { \ + if (_nm_logging_enabled(_level)) { \ _nm_log(_level, __VA_ARGS__); \ } \ } \ @@ -41,7 +29,7 @@ void _nm_log_impl_cs(NMLogLevel level, const char *fmt, ...) _nm_printf(2, 3); /*****************************************************************************/ #ifndef NM_DIST_VERSION - #define NM_DIST_VERSION VERSION +#define NM_DIST_VERSION VERSION #endif /*****************************************************************************/ |