From c333f062ddcba9b35330647bf6cbd0a07f2d786e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 May 2017 14:55:55 +0200 Subject: New upstream version 1.8.0 --- src/devices/nm-device-logging.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/devices/nm-device-logging.h') 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__)) -- cgit 1.3.0-6-gf8a5