From 2d472657bd6563347d06c6926d1433775d92814f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 23 Mar 2016 09:39:22 +0100 Subject: [PATCH] device: add nm_device_get_unmanaged_mask() --- src/devices/nm-device.c | 22 ++++++++++++++++++++-- src/devices/nm-device.h | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index cae4e6888..3816a1ae8 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -9124,6 +9124,24 @@ nm_device_get_managed (NMDevice *self, gboolean for_user_request) return _get_managed_by_flags (priv->unmanaged_flags, priv->unmanaged_mask, for_user_request); } +/** + * nm_device_get_unmanaged_mask: + * @self: the #NMDevice + * @flag: the unmanaged flags to check. + * + * Return the unmanaged flags mask set on this device. + * + * Returns: the flags of the device ( & @flag) + */ +NMUnmanagedFlags +nm_device_get_unmanaged_mask (NMDevice *self, NMUnmanagedFlags flag) +{ + g_return_val_if_fail (NM_IS_DEVICE (self), NM_UNMANAGED_NONE); + g_return_val_if_fail (flag != NM_UNMANAGED_NONE, NM_UNMANAGED_NONE); + + return NM_DEVICE_GET_PRIVATE (self)->unmanaged_mask & flag; +} + /** * nm_device_get_unmanaged_flags: * @self: the #NMDevice @@ -9136,8 +9154,8 @@ nm_device_get_managed (NMDevice *self, gboolean for_user_request) NMUnmanagedFlags nm_device_get_unmanaged_flags (NMDevice *self, NMUnmanagedFlags flag) { - g_return_val_if_fail (NM_IS_DEVICE (self), FALSE); - g_return_val_if_fail (flag != NM_UNMANAGED_NONE, FALSE); + g_return_val_if_fail (NM_IS_DEVICE (self), NM_UNMANAGED_NONE); + g_return_val_if_fail (flag != NM_UNMANAGED_NONE, NM_UNMANAGED_NONE); return NM_DEVICE_GET_PRIVATE (self)->unmanaged_flags & flag; } diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index bd657e68c..ce715e68d 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -472,6 +472,7 @@ typedef enum { const char *nm_unmanaged_flags2str (NMUnmanagedFlags flags, char *buf, gsize len); gboolean nm_device_get_managed (NMDevice *device, gboolean for_user_request); +NMUnmanagedFlags nm_device_get_unmanaged_mask (NMDevice *device, NMUnmanagedFlags flag); NMUnmanagedFlags nm_device_get_unmanaged_flags (NMDevice *device, NMUnmanagedFlags flag); void nm_device_set_unmanaged_flags (NMDevice *device, NMUnmanagedFlags flags, -- 2.17.1