diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-07-23 14:11:30 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-30 11:45:54 +0100 |
| commit | 40e8d2078a1ee6ce5ea0f192c246680c5342743b (patch) | |
| tree | 7405bc7f00a05bc8fcb59caf8c90f206c5ca6e16 | |
| parent | 7bc46b3586b90338bb549355f393ff0b9fa75a48 (diff) | |
| download | NetworkManager-40e8d2078a1ee6ce5ea0f192c246680c5342743b.tar.gz | |
core/logging: define logging macros based on nm_log()
Base the definition of nm_log_*() macros on the nm_log() macro,
instead of directly on the _nm_log() function.
Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit 60cf1b8fcdc7c61a15738ddf59a4e27dfa1b5104)
| -rw-r--r-- | src/logging/nm-logging.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h index 19a82f1b6a..71ae39b003 100644 --- a/src/logging/nm-logging.h +++ b/src/logging/nm-logging.h @@ -92,20 +92,13 @@ typedef enum { GQuark nm_logging_error_quark (void); -#define nm_log_err(domain, ...) \ - _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_ERR, ## __VA_ARGS__ ) - -#define nm_log_warn(domain, ...) \ - _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_WARN, ## __VA_ARGS__ ) - -#define nm_log_info(domain, ...) \ - _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_INFO, ## __VA_ARGS__ ) - -#define nm_log_dbg(domain, ...) \ - _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_DEBUG, ## __VA_ARGS__ ) +#define nm_log_err(domain, ...) nm_log ((domain), LOGL_ERR, __VA_ARGS__) +#define nm_log_warn(domain, ...) nm_log ((domain), LOGL_WARN, __VA_ARGS__) +#define nm_log_info(domain, ...) nm_log ((domain), LOGL_INFO, __VA_ARGS__) +#define nm_log_dbg(domain, ...) nm_log ((domain), LOGL_DEBUG, __VA_ARGS__) #define nm_log(domain, level, ...) \ - _nm_log (G_STRLOC, G_STRFUNC, domain, level, ## __VA_ARGS__ ) + _nm_log (G_STRLOC, G_STRFUNC, domain, level, __VA_ARGS__) void _nm_log (const char *loc, const char *func, |