diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-30 00:57:20 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-30 00:57:20 +0200 |
| commit | db70f92a77334e84ca9a04379afd49ea55c53098 (patch) | |
| tree | d91e6ec27d66ec3c5a20c9195a0eb1d834189618 /src/devices/nm-device-logging.h | |
| parent | 4a76b5857faa586add8d7ce28f7804ffb65f3c68 (diff) | |
| parent | d9c99a29a0d3384c9c3d2adce430f5cb1134ab6a (diff) | |
Merge tag 'upstream/1.1.92'
Upstream version 1.1.92
Diffstat (limited to 'src/devices/nm-device-logging.h')
| -rw-r--r-- | src/devices/nm-device-logging.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h index 6255d6f3..1be17073 100644 --- a/src/devices/nm-device-logging.h +++ b/src/devices/nm-device-logging.h @@ -34,9 +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), \ + nm_log_obj ((level), (domain), (self), "device", \ "(%s): " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ - (self) ? str_if_set (nm_device_get_iface (_nm_device_log_self_to_device (self)), "(null)") : "(none)" \ + (self) ? (nm_device_get_iface (_nm_device_log_self_to_device (self)) ?: "(null)") : "(none)" \ _NM_UTILS_MACRO_REST(__VA_ARGS__)) #endif /* __NETWORKMANAGER_DEVICE_LOGGING_H__ */ |