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

cli: use nmc_string_to_ternary() to parse ternary in _set_fcn_ethtool()

Browse Source 
nmc_string_to_ternary() is much more flexible, in that it case
insensitive and accepts any unambiguous abbreviation.

Also, nmc_string_to_ternary() accepts "unknown" as alias for "default".

Also, nmc_string_to_ternary() accepts numeric values -1, 0, 1.

By using nmc_string_to_ternary(), we treat ethtool boolean options like
other ternary properties and accept the same keywords.
This commit is contained in:
Thomas Haller
2021-05-11 13:27:55 +02:00
parent d15eb7dd6e
commit e5b46aa38a
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libnmc-setting/nm-meta-setting-desc.c
View File

@@ -4284,10 +4284,9 @@ static gconstpointer _get_fcn_ethtool(ARGS_GET_FCN)
static gboolean _set_fcn_ethtool(ARGS_SET_FCN) static gboolean _set_fcn_ethtool(ARGS_SET_FCN)
{ {
NMEthtoolID ethtool_id = property_info->property_typ_data->subtype.ethtool.ethtool_id; NMEthtoolID ethtool_id = property_info->property_typ_data->subtype.ethtool.ethtool_id;
gs_free char *value_to_free = NULL; gint64 i64;
gint64 i64; NMTernary t;
gboolean b;
if (_SET_FCN_DO_RESET_DEFAULT(property_info, modifier, value)) if (_SET_FCN_DO_RESET_DEFAULT(property_info, modifier, value))
goto do_unset; goto do_unset;
@@ -4311,14 +4310,10 @@ static gboolean _set_fcn_ethtool(ARGS_SET_FCN)
nm_assert(nm_ethtool_id_is_feature(ethtool_id) || nm_ethtool_id_is_pause(ethtool_id)); nm_assert(nm_ethtool_id_is_feature(ethtool_id) || nm_ethtool_id_is_pause(ethtool_id));
value = nm_strstrip_avoid_copy_a(300, value, &value_to_free); if (!nmc_string_to_ternary_full(value,
if (NM_IN_STRSET(value, "1", "yes", "true", "on")) NMC_STRING_TO_TERNARY_FLAGS_IGNORE_FOR_DEFAULT,
b = TRUE; &t,
else if (NM_IN_STRSET(value, "0", "no", "false", "off")) error)) {
b = FALSE;
else if (NM_IN_STRSET(value, "", "ignore", "default"))
goto do_unset;
else {
g_set_error(error, g_set_error(error,
NM_UTILS_ERROR, NM_UTILS_ERROR,
NM_UTILS_ERROR_INVALID_ARGUMENT, NM_UTILS_ERROR_INVALID_ARGUMENT,
@@ -4326,8 +4321,10 @@ static gboolean _set_fcn_ethtool(ARGS_SET_FCN)
value); value);
return FALSE; return FALSE;
} }
if (t == NM_TERNARY_DEFAULT)
goto do_unset;
nm_setting_option_set_boolean(setting, nm_ethtool_data[ethtool_id]->optname, b); nm_setting_option_set_boolean(setting, nm_ethtool_data[ethtool_id]->optname, !!t);
return TRUE; return TRUE;
do_unset: do_unset: