diff options
| author | Michael Biebl <biebl@debian.org> | 2015-08-28 01:14:03 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-08-28 01:14:03 +0200 |
| commit | 235f4801bff27219c6448c83874b5d9f8686ce58 (patch) | |
| tree | 7084e0f7d7a63901c21b56b67fbd3e203d5dbb80 /src/settings/plugins/ifcfg-rh/plugin.c | |
| parent | 79436717ed9d593754a40402b6dc1b0cabac605e (diff) | |
| parent | 81836c2d44802b4cca833d7775dd627e0797a7e2 (diff) | |
Merge tag 'upstream/1.0.6'
Upstream version 1.0.6
Diffstat (limited to 'src/settings/plugins/ifcfg-rh/plugin.c')
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/plugin.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index 1a3f791a..526cdafe 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -42,7 +42,7 @@ #include <selinux/selinux.h> #endif -#include <nm-setting-connection.h> +#include "nm-setting-connection.h" #include "common.h" #include "nm-dbus-glib-types.h" @@ -64,22 +64,15 @@ #define DBUS_OBJECT_PATH "/com/redhat/ifcfgrh1" -#define _LOG_DEFAULT_DOMAIN LOGD_SETTINGS - -#define _LOG(level, domain, ...) \ +#define _NMLOG_DOMAIN LOGD_SETTINGS +#define _NMLOG(level, ...) \ G_STMT_START { \ - nm_log ((level), (domain), \ + nm_log ((level), (_NMLOG_DOMAIN), \ "%s" _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ "ifcfg-rh: " \ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ } G_STMT_END -#define _LOGT(...) _LOG (LOGL_TRACE, _LOG_DEFAULT_DOMAIN, __VA_ARGS__) -#define _LOGD(...) _LOG (LOGL_DEBUG, _LOG_DEFAULT_DOMAIN, __VA_ARGS__) -#define _LOGI(...) _LOG (LOGL_INFO, _LOG_DEFAULT_DOMAIN, __VA_ARGS__) -#define _LOGW(...) _LOG (LOGL_WARN, _LOG_DEFAULT_DOMAIN, __VA_ARGS__) -#define _LOGE(...) _LOG (LOGL_ERR, _LOG_DEFAULT_DOMAIN, __VA_ARGS__) - #define ERR_GET_MSG(err) (((err) && (err)->message) ? (err)->message : "(unknown)") |