colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: use NM_FLAGS_HAS() in nm_setting_compare()

Browse Source
This commit is contained in:
Thomas Haller
2015-09-18 15:10:25 +02:00
parent d5716eed59
commit b1ebbf4c80
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libnm-core/nm-setting.c
View File

@@ -31,6 +31,7 @@
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-utils-private.h" #include "nm-utils-private.h"
#include "nm-property-compare.h" #include "nm-property-compare.h"
#include "nm-macros-internal.h"
#include "nm-setting-connection.h" #include "nm-setting-connection.h"
#include "nm-setting-bond.h" #include "nm-setting-bond.h"
@@ -1098,15 +1099,16 @@ nm_setting_compare (NMSetting *a,
GParamSpec *prop_spec = property_specs[i]; GParamSpec *prop_spec = property_specs[i];
/* Fuzzy compare ignores secrets and properties defined with the FUZZY_IGNORE flag */ /* Fuzzy compare ignores secrets and properties defined with the FUZZY_IGNORE flag */
if ( (flags & NM_SETTING_COMPARE_FLAG_FUZZY) if ( NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_FUZZY)
&& (prop_spec->flags & (NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_SECRET))) && !NM_FLAGS_ANY (prop_spec->flags, NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_SECRET))
continue; continue;
if ((flags & NM_SETTING_COMPARE_FLAG_INFERRABLE) && !(prop_spec->flags & NM_SETTING_PARAM_INFERRABLE)) if ( NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)
&& !NM_FLAGS_HAS (prop_spec->flags, NM_SETTING_PARAM_INFERRABLE))
continue; continue;
if ( (flags & NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS) if ( NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS)
&& (prop_spec->flags & NM_SETTING_PARAM_SECRET)) && NM_FLAGS_HAS (prop_spec->flags, NM_SETTING_PARAM_SECRET))
continue; continue;
same = NM_SETTING_GET_CLASS (a)->compare_property (a, b, prop_spec, flags); same = NM_SETTING_GET_CLASS (a)->compare_property (a, b, prop_spec, flags);