diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
| commit | 04996460fa839109b6318838d1f41e5f3ef8139a (patch) | |
| tree | cb35e54363b8ea8e78e6978a92fb68ae9409e116 /src/devices/nm-device-logging.h | |
| parent | 1ae6f6dc1b3c266401a4709995991b967320139a (diff) | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'src/devices/nm-device-logging.h')
| -rw-r--r-- | src/devices/nm-device-logging.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h index b7ec58fd..419a4a51 100644 --- a/src/devices/nm-device-logging.h +++ b/src/devices/nm-device-logging.h @@ -24,7 +24,8 @@ #include "nm-device.h" #define _LOG_DECLARE_SELF(t) \ -_nm_unused inline static NMDevice * \ +_nm_unused \ +static inline NMDevice * \ _nm_device_log_self_to_device (t *self) \ { \ return (NMDevice *) self; \ @@ -33,7 +34,9 @@ _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), "device", \ + 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__)) |