From 28c53ea37ee7e83cbb16c4e15959b6b177f733cf Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 9 Feb 2019 11:18:17 +0100 Subject: [PATCH] libnm/trivial: rename NM_SETTING_SECRET_FLAG_ALL flag (formerly NM_SETTING_SECRET_FLAGS_ALL) It should mirror the naming pattern of the flags. --- libnm-core/nm-core-internal.h | 4 ++-- libnm-core/nm-setting-vpn.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 2d66eb83f..891ec0a7a 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -129,7 +129,7 @@ /*****************************************************************************/ -#define NM_SETTING_SECRET_FLAGS_ALL \ +#define NM_SETTING_SECRET_FLAG_ALL \ ((NMSettingSecretFlags) ( NM_SETTING_SECRET_FLAG_NONE \ | NM_SETTING_SECRET_FLAG_AGENT_OWNED \ | NM_SETTING_SECRET_FLAG_NOT_SAVED \ @@ -138,7 +138,7 @@ static inline gboolean _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); } /*****************************************************************************/ diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index e9501ab1f..a9a9c0df4 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -763,7 +763,7 @@ get_secret_flags (NMSetting *setting, 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 || !_nm_setting_secret_flags_valid (i64)) { /* The flags keys is set to an unexpected value. That is a configuration