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

cli: reuse property info in DEFINE_REMOVER_INDEX_OR_VALUE_VALIDATING_STATIC()

Browse Source 
The property-info already tracks the "values_static" list. No need to pass
it on redundantly.
This commit is contained in:
Thomas Haller
2019-03-18 14:46:18 +01:00
parent 10aa2fafab
commit 18c22443f3
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
clients/common/nm-meta-setting-desc.c
View File

@@ -1698,11 +1698,15 @@ vpn_data_item (const char *key, const char *value, gpointer user_data)
error); \ error); \
}) })
#define DEFINE_REMOVER_INDEX_OR_VALUE_VALIDATING_STATIC(def_func, s_macro, num_func, rem_func_idx, values_static, rem_func_val) \ #define DEFINE_REMOVER_INDEX_OR_VALUE_VALIDATING_STATIC(def_func, s_macro, num_func, rem_func_idx, rem_func_val) \
_DEFINE_REMOVER_INDEX_OR_VALUE (def_func, s_macro, num_func, rem_func_idx, { \ _DEFINE_REMOVER_INDEX_OR_VALUE (def_func, s_macro, num_func, rem_func_idx, { \
value = nmc_string_is_valid (value, values_static, error); \ if (property_info->property_typ_data->values_static) { \
value = nmc_string_is_valid (value, \
(const char **) property_info->property_typ_data->values_static, \
error); \
if (!value) \ if (!value) \
return FALSE; \ return FALSE; \
} \
\ \
rem_func_val (s_macro (setting), value); \ rem_func_val (s_macro (setting), value); \
return TRUE; \ return TRUE; \
@@ -4400,8 +4404,6 @@ _get_fcn_wireless_security_wep_key (ARGS_GET_FCN)
RETURN_STR_TO_FREE (key); RETURN_STR_TO_FREE (key);
} }
static const char *wifi_sec_valid_protos[] = { "wpa", "rsn", NULL };
DEFINE_SETTER_STR_LIST_MULTI (_set_fcn_wireless_security_proto, DEFINE_SETTER_STR_LIST_MULTI (_set_fcn_wireless_security_proto,
NM_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_add_proto); nm_setting_wireless_security_add_proto);
@@ -4410,11 +4412,8 @@ DEFINE_REMOVER_INDEX_OR_VALUE_VALIDATING_STATIC (_remove_fcn_wireless_security_p
NM_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_get_num_protos, nm_setting_wireless_security_get_num_protos,
nm_setting_wireless_security_remove_proto, nm_setting_wireless_security_remove_proto,
wifi_sec_valid_protos,
nm_setting_wireless_security_remove_proto_by_value) nm_setting_wireless_security_remove_proto_by_value)
static const char *wifi_sec_valid_pairwises[] = { "tkip", "ccmp", NULL };
DEFINE_SETTER_STR_LIST_MULTI (_set_fcn_wireless_security_pairwise, DEFINE_SETTER_STR_LIST_MULTI (_set_fcn_wireless_security_pairwise,
NM_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_add_pairwise); nm_setting_wireless_security_add_pairwise);
@@ -4423,11 +4422,8 @@ DEFINE_REMOVER_INDEX_OR_VALUE_VALIDATING_STATIC (_remove_fcn_wireless_security_p
NM_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_get_num_pairwise, nm_setting_wireless_security_get_num_pairwise,
nm_setting_wireless_security_remove_pairwise, nm_setting_wireless_security_remove_pairwise,
wifi_sec_valid_pairwises,
nm_setting_wireless_security_remove_pairwise_by_value) nm_setting_wireless_security_remove_pairwise_by_value)
static const char *wifi_sec_valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL };
DEFINE_SETTER_STR_LIST_MULTI (_set_fcn_wireless_security_group, DEFINE_SETTER_STR_LIST_MULTI (_set_fcn_wireless_security_group,
NM_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_add_group); nm_setting_wireless_security_add_group);
@@ -4436,7 +4432,6 @@ DEFINE_REMOVER_INDEX_OR_VALUE_VALIDATING_STATIC (_remove_fcn_wireless_security_g
NM_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_get_num_groups, nm_setting_wireless_security_get_num_groups,
nm_setting_wireless_security_remove_group, nm_setting_wireless_security_remove_group,
wifi_sec_valid_groups,
nm_setting_wireless_security_remove_group_by_value) nm_setting_wireless_security_remove_group_by_value)
static gboolean static gboolean
@@ -7381,7 +7376,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
.remove_fcn = _remove_fcn_wireless_security_proto, .remove_fcn = _remove_fcn_wireless_security_proto,
), ),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA ( .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = wifi_sec_valid_protos, .values_static = NM_MAKE_STRV ("wpa", "rsn"),
), ),
), ),
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PAIRWISE,
@@ -7391,7 +7386,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
.remove_fcn = _remove_fcn_wireless_security_pairwise, .remove_fcn = _remove_fcn_wireless_security_pairwise,
), ),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA ( .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = wifi_sec_valid_pairwises, .values_static = NM_MAKE_STRV ("tkip", "ccmp"),
), ),
), ),
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_GROUP, PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_GROUP,
@@ -7401,7 +7396,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
.remove_fcn = _remove_fcn_wireless_security_group, .remove_fcn = _remove_fcn_wireless_security_group,
), ),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA ( .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = wifi_sec_valid_groups, .values_static = NM_MAKE_STRV ("wep40", "wep104", "tkip", "ccmp"),
), ),
), ),
PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PMF, PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PMF,