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

libnm/trivial: rename NM_SETTING_SECRET_FLAG_ALL flag (formerly NM_SETTING_SECRET_FLAGS_ALL)

Browse Source 
It should mirror the naming pattern of the flags.
This commit is contained in:
Thomas Haller
2019-02-09 11:18:17 +01:00
parent 99ae5322c9
commit 28c53ea37e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm-core/nm-core-internal.h
View File

@@ -129,7 +129,7 @@
/*****************************************************************************/ /*****************************************************************************/
#define NM_SETTING_SECRET_FLAGS_ALL \ #define NM_SETTING_SECRET_FLAG_ALL \
((NMSettingSecretFlags) ( NM_SETTING_SECRET_FLAG_NONE \ ((NMSettingSecretFlags) ( NM_SETTING_SECRET_FLAG_NONE \
| NM_SETTING_SECRET_FLAG_AGENT_OWNED \ | NM_SETTING_SECRET_FLAG_AGENT_OWNED \
| NM_SETTING_SECRET_FLAG_NOT_SAVED \ | NM_SETTING_SECRET_FLAG_NOT_SAVED \
@@ -138,7 +138,7 @@
static inline gboolean static inline gboolean
_nm_setting_secret_flags_valid (NMSettingSecretFlags flags) _nm_setting_secret_flags_valid (NMSettingSecretFlags flags)
{ {
return !NM_FLAGS_ANY (flags, ~NM_SETTING_SECRET_FLAGS_ALL); return !NM_FLAGS_ANY (flags, ~NM_SETTING_SECRET_FLAG_ALL);
} }
/*****************************************************************************/ /*****************************************************************************/

2
libnm-core/nm-setting-vpn.c
View File

@@ -763,7 +763,7 @@ get_secret_flags (NMSetting *setting,
return TRUE; return TRUE;
} }
i64 = _nm_utils_ascii_str_to_int64 (flags_val, 10, 0, NM_SETTING_SECRET_FLAGS_ALL, -1); i64 = _nm_utils_ascii_str_to_int64 (flags_val, 10, 0, NM_SETTING_SECRET_FLAG_ALL, -1);
if ( i64 == -1 if ( i64 == -1
|| !_nm_setting_secret_flags_valid (i64)) { || !_nm_setting_secret_flags_valid (i64)) {
/* The flags keys is set to an unexpected value. That is a configuration /* The flags keys is set to an unexpected value. That is a configuration