diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 18:07:03 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 18:15:57 +0100 |
| commit | 2567f558da3eb9911678227d4aeb15162e707d89 (patch) | |
| tree | 13c80b0e091c8ba585b14b966cda998f95f1936d /src/devices/nm-device-logging.h | |
| parent | 02d99ffd62ede29cffcb45fcbe33d044b7406d3a (diff) | |
| parent | f54032b30e1ddd84f10a339e0caf493772e049a7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'src/devices/nm-device-logging.h')
| -rw-r--r-- | src/devices/nm-device-logging.h | 58 |
1 files changed, 31 insertions, 27 deletions
diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h index 2c56e526..d1291020 100644 --- a/src/devices/nm-device-logging.h +++ b/src/devices/nm-device-logging.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Red Hat, Inc. */ @@ -8,32 +8,36 @@ #include "nm-device.h" -#define _LOG_DECLARE_SELF(t) \ -_nm_unused \ -static inline NMDevice * \ -_nm_device_log_self_to_device (t *self) \ -{ \ - return (NMDevice *) self; \ -} +#define _LOG_DECLARE_SELF(t) \ + _nm_unused static inline NMDevice *_nm_device_log_self_to_device(t *self) \ + { \ + return (NMDevice *) self; \ + } -#undef _NMLOG_ENABLED -#define _NMLOG_ENABLED(level, domain) ( nm_logging_enabled ((level), (domain)) ) -#define _NMLOG(level, domain, ...) \ - G_STMT_START { \ - const NMLogLevel _level = (level); \ - const NMLogDomain _domain = (domain); \ - \ - if (nm_logging_enabled (_level, _domain)) { \ - typeof (*self) *const _self = (self); \ - const char *const _ifname = _nm_device_get_iface (_nm_device_log_self_to_device (_self)); \ - \ - nm_log_obj (_level, _domain, \ - _ifname, NULL, \ - _self, "device", \ - "%s%s%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ - NM_PRINT_FMT_QUOTED (_ifname, "(", _ifname, ")", "[null]") \ - _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ - } \ - } G_STMT_END +#undef _NMLOG_ENABLED +#define _NMLOG_ENABLED(level, domain) (nm_logging_enabled((level), (domain))) +#define _NMLOG(level, domain, ...) \ + G_STMT_START \ + { \ + const NMLogLevel _level = (level); \ + const NMLogDomain _domain = (domain); \ + \ + if (nm_logging_enabled(_level, _domain)) { \ + typeof(*self) *const _self = (self); \ + const char *const _ifname = \ + _nm_device_get_iface(_nm_device_log_self_to_device(_self)); \ + \ + nm_log_obj(_level, \ + _domain, \ + _ifname, \ + NULL, \ + _self, \ + "device", \ + "%s%s%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ + NM_PRINT_FMT_QUOTED(_ifname, "(", _ifname, ")", "[null]") \ + _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ + } \ + } \ + G_STMT_END #endif /* __NETWORKMANAGER_DEVICE_LOGGING_H__ */ |