fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 12:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: remove macro for logging in _set_unmanaged_flags()

Browse source 
The macro is used exactly once. It's simpler to just write the
logging statement down as is.
This commit is contained in:
Thomas Haller 2017-03-15 10:28:48 +01:00
parent 0d1c8bc9eb
commit c8934fbe0d
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/devices/nm-device.c
View file

@ -10722,19 +10722,16 @@ _set_unmanaged_flags (NMDevice *self,
|| ( !was_managed || ( !was_managed
&& nm_device_get_state (self) == NM_DEVICE_STATE_UNMANAGED)); && nm_device_get_state (self) == NM_DEVICE_STATE_UNMANAGED));
#define _FMTX "[%s%s0x%0x/0x%x/%s" _LOGD (LOGD_DEVICE, "unmanaged: flags set to [%s%s0x%0x/0x%x/%s%s], %s [%s=0x%0x]%s%s%s)",
#define _FMT(flags, mask, str) \ _unmanaged_flags2str (priv->unmanaged_flags, priv->unmanaged_mask, str1, sizeof (str1)), \
_unmanaged_flags2str ((flags), (mask), str, sizeof (str)), \ (priv->unmanaged_flags | priv->unmanaged_mask) ? "=" : "", \
((flags) | (mask)) ? "=" : "", \ (guint) priv->unmanaged_flags, \
(flags), \ (guint) priv->unmanaged_mask, \
(mask), \ (_get_managed_by_flags (priv->unmanaged_flags, priv->unmanaged_mask, FALSE) \
(_get_managed_by_flags (flags, mask, FALSE) \ ? "managed" \
? "managed" \ : (_get_managed_by_flags (priv->unmanaged_flags, priv->unmanaged_mask, TRUE) \
: (_get_managed_by_flags (flags, mask, TRUE) \ ? "manageable" \
? "manageable" \ : "unmanaged")),
: "unmanaged"))
_LOGD (LOGD_DEVICE, "unmanaged: flags set to "_FMTX"%s, %s [%s=0x%0x]%s%s%s)",
_FMT (priv->unmanaged_flags, priv->unmanaged_mask, str1),
priv->real ? "" : "/unrealized", priv->real ? "" : "/unrealized",
operation, operation,
nm_unmanaged_flags2str (flags, str2, sizeof (str2)), nm_unmanaged_flags2str (flags, str2, sizeof (str2)),
@ -10744,7 +10741,6 @@ _set_unmanaged_flags (NMDevice *self,
reason_to_string (reason), reason_to_string (reason),
transition_state ? ", transition-state" : "", transition_state ? ", transition-state" : "",
"")); ""));
#undef _FMT
if ( do_notify_has_pending_actions if ( do_notify_has_pending_actions
&& had_pending_actions != nm_device_has_pending_action (self)) && had_pending_actions != nm_device_has_pending_action (self))