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

cli: use proper GError codes in "nm-client-utils.c"

Browse Source 
g_set_error(error, 1, 0, ...) is not right. "1" is not a valid GQuark,
we should initialize proper error instances.

Use nm_utils_error_set() for that.

Also, the code previously hacked the numeric value "1" to indicate
ambiguous text. Add and use a new error code NM_UTILS_ERROR_AMBIGUOUS
for that.
This commit is contained in:
Thomas Haller
2021-04-27 09:23:54 +02:00
parent a4d3c7a900
commit f62ecc97c8
3 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libnm-glib-aux/nm-shared-utils.h
View File

@@ -1205,6 +1205,8 @@ typedef enum {
NM_UTILS_ERROR_INVALID_ARGUMENT, /*< nick=InvalidArgument >*/
NM_UTILS_ERROR_NOT_READY, /*< nick=NotReady >*/
NM_UTILS_ERROR_AMBIGUOUS, /*< nick=Ambiguous >*/
/* the following codes have a special meaning and are exactly used for
* nm_device_check_connection_compatible() and nm_device_check_connection_available().
*

79
src/libnmc-base/nm-client-utils.c
View File

@@ -97,15 +97,14 @@ nmc_string_to_bool(const char *str, gboolean *val_bool, GError **error)
g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
if (g_strcmp0(str, "o") == 0) {
g_set_error(error,
1,
0,
/* TRANSLATORS: the first %s is the partial value entered by
* the user, the second %s a list of compatible values.
*/
_("'%s' is ambiguous (%s)"),
str,
"on x off");
nm_utils_error_set(error,
NM_UTILS_ERROR_UNKNOWN,
/* TRANSLATORS: the first %s is the partial value entered by
* the user, the second %s a list of compatible values.
*/
_("'%s' is ambiguous (%s)"),
str,
"on x off");
return FALSE;
}
@@ -114,13 +113,12 @@ nmc_string_to_bool(const char *str, gboolean *val_bool, GError **error)
else if (nmc_string_is_valid(str, s_false, NULL))
*val_bool = FALSE;
else {
g_set_error(error,
1,
0,
_("'%s' is not valid; use [%s] or [%s]"),
str,
"true, yes, on",
"false, no, off");
nm_utils_error_set(error,
NM_UTILS_ERROR_UNKNOWN,
_("'%s' is not valid; use [%s] or [%s]"),
str,
"true, yes, on",
"false, no, off");
return FALSE;
}
return TRUE;
@@ -136,15 +134,14 @@ nmc_string_to_ternary(const char *str, NMTernary *val, GError **error)
g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
if (g_strcmp0(str, "o") == 0) {
g_set_error(error,
1,
0,
/* TRANSLATORS: the first %s is the partial value entered by
* the user, the second %s a list of compatible values.
*/
_("'%s' is ambiguous (%s)"),
str,
"on x off");
nm_utils_error_set(error,
NM_UTILS_ERROR_UNKNOWN,
/* TRANSLATORS: the first %s is the partial value entered by
* the user, the second %s a list of compatible values.
*/
_("'%s' is ambiguous (%s)"),
str,
"on x off");
return FALSE;
}
@@ -155,14 +152,13 @@ nmc_string_to_ternary(const char *str, NMTernary *val, GError **error)
else if (nmc_string_is_valid(str, s_unknown, NULL))
*val = NM_TERNARY_DEFAULT;
else {
g_set_error(error,
1,
0,
_("'%s' is not valid; use [%s], [%s] or [%s]"),
str,
"true, yes, on",
"false, no, off",
"unknown");
nm_utils_error_set(error,
NM_UTILS_ERROR_UNKNOWN,
_("'%s' is not valid; use [%s], [%s] or [%s]"),
str,
"true, yes, on",
"false, no, off",
"unknown");
return FALSE;
}
return TRUE;
@@ -210,7 +206,11 @@ _nmc_string_is_valid(const char *input, const char *const *allowed, GError **err
g_string_append(candidates, *p);
}
}
g_set_error(error, 1, 1, _("'%s' is ambiguous: %s"), input, candidates->str);
nm_utils_error_set(error,
NM_UTILS_ERROR_AMBIGUOUS,
_("'%s' is ambiguous: %s"),
input,
candidates->str);
g_string_free(candidates, TRUE);
return NULL;
}
@@ -219,9 +219,16 @@ finish:
char *valid_vals = g_strjoinv(", ", (char **) allowed);
if (!input || !*input)
g_set_error(error, 1, 0, _("missing name, try one of [%s]"), valid_vals);
nm_utils_error_set(error,
NM_UTILS_ERROR_UNKNOWN,
_("missing name, try one of [%s]"),
valid_vals);
else
g_set_error(error, 1, 0, _("'%s' not among [%s]"), input, valid_vals);
nm_utils_error_set(error,
NM_UTILS_ERROR_UNKNOWN,
_("'%s' not among [%s]"),
input,
valid_vals);
g_free(valid_vals);
}

4
src/nmcli/connections.c
View File

@@ -3532,7 +3532,7 @@ check_valid_name(const char * val,
/* Check string validity */
str = nmc_string_is_valid(val, (const char **) tmp_arr->pdata, &tmp_err);
if (!str) {
if (tmp_err->code == 1)
if (nm_g_error_matches(tmp_err, NM_UTILS_ERROR, NM_UTILS_ERROR_AMBIGUOUS))
g_propagate_error(error, tmp_err);
else {
/* We want to handle aliases, so construct own error message */
@@ -3590,7 +3590,7 @@ check_valid_name_toplevel(const char *val, const char **slave_type, GError **err
/* Check string validity */
str = nmc_string_is_valid(val, (const char **) tmp_arr->pdata, &tmp_err);
if (!str) {
if (tmp_err->code == 1)
if (nm_g_error_matches(tmp_err, NM_UTILS_ERROR, NM_UTILS_ERROR_AMBIGUOUS))
g_propagate_error(error, g_steal_pointer(&tmp_err));
else {
/* We want to handle aliases, so construct own error message */