From ca00c146d448ec6565f062af73390aa4fbaf9459 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 23 Sep 2015 16:02:35 +0200 Subject: [PATCH] systemd/adapt: update logging prefix for systemd log_internal() We used to prefix messages from systemd with "sd-dhcp". Since we no longer use the systemd code only for DHCP, change the prefix to "libsystemd". --- src/systemd/nm-sd-adapt.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h index c392879c03..03fda64136 100644 --- a/src/systemd/nm-sd-adapt.h +++ b/src/systemd/nm-sd-adapt.h @@ -47,12 +47,13 @@ _slog_level_to_nm (int slevel) #define log_internal(level, error, file, line, func, format, ...) \ ({ \ - int _nm_e = (error); \ - NMLogLevel _nm_l = _slog_level_to_nm ((level)); \ + const int _nm_e = (error); \ + const NMLogLevel _nm_l = _slog_level_to_nm ((level)); \ + \ if (nm_logging_enabled (_nm_l, LOGD_DHCP)) { \ const char *_nm_location = strrchr ((""file), '/'); \ \ - _nm_log_impl (_nm_location ? _nm_location + 1 : (""file), (line), (func), _nm_l, LOGD_DHCP, _nm_e, ("%s"format), "sd-dhcp: ", ## __VA_ARGS__); \ + _nm_log_impl (_nm_location ? _nm_location + 1 : (""file), (line), (func), _nm_l, LOGD_DHCP, _nm_e, ("%s"format), "libsystemd: ", ## __VA_ARGS__); \ } \ (_nm_e > 0 ? -_nm_e : _nm_e); \ })