diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-07 12:18:21 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-08 21:50:23 +0200 |
| commit | f10b95880666fe611fb2d0c27d49bfe3988ec9ec (patch) | |
| tree | d1f0495c78be0c6fed352e385b01bce330e52383 | |
| parent | 729de7d7f09c3ad813477b7a822155b4b95dc682 (diff) | |
| download | NetworkManager-f10b95880666fe611fb2d0c27d49bfe3988ec9ec.tar.gz | |
device: rework device's _NMLOG() logging macro
- if the interface-name is NULL, print [null], to distinguish
it from (ifname).
- evaluate the ifname only once.
| -rw-r--r-- | src/devices/nm-device-logging.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h index 419a4a5161..5f95a91390 100644 --- a/src/devices/nm-device-logging.h +++ b/src/devices/nm-device-logging.h @@ -34,11 +34,21 @@ _nm_device_log_self_to_device (t *self) \ #undef _NMLOG_ENABLED #define _NMLOG_ENABLED(level, domain) ( nm_logging_enabled ((level), (domain)) ) #define _NMLOG(level, domain, ...) \ - nm_log_obj ((level), (domain), \ - (self) ? nm_device_get_iface (_nm_device_log_self_to_device (self)) : NULL, \ - NULL, (self), "device", \ - "(%s): " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ - (self) ? (nm_device_get_iface (_nm_device_log_self_to_device (self)) ?: "(null)") : "(none)" \ - _NM_UTILS_MACRO_REST(__VA_ARGS__)) + 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 = _self ? nm_device_get_iface (_nm_device_log_self_to_device (_self)) : NULL; \ + \ + 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__ */ |