[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230831132229.471693-5-jiri@resnulli.us>
Date: Thu, 31 Aug 2023 15:22:27 +0200
From: Jiri Pirko <jiri@...nulli.us>
To: netdev@...r.kernel.org
Cc: stephen@...workplumber.org,
dsahern@...il.com
Subject: [patch iproute2-next 4/6] devlink: return -ENOENT if argument is missing
From: Jiri Pirko <jiri@...dia.com>
In preparation to the follow-up dump selector patch, make sure that the
command line arguments parsing function returns -ENOENT in case the
option is missing so the caller can distinguish.
Signed-off-by: Jiri Pirko <jiri@...dia.com>
---
devlink/devlink.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 8d2424f58cc2..6a46a4ecf648 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -1048,7 +1048,7 @@ static int strtobool(const char *str, bool *p_val)
static int ident_str_validate(char *str, unsigned int expected)
{
if (!str)
- return -EINVAL;
+ return -ENOENT;
if (get_str_char_count(str, '/') != expected) {
pr_err("Wrong identification string format.\n");
@@ -1131,7 +1131,7 @@ static int dl_argv_handle_port(struct dl *dl, char *str, char **p_bus_name,
if (!str) {
pr_err("Port identification (\"bus_name/dev_name/port_index\" or \"netdev ifname\") expected.\n");
- return -EINVAL;
+ return -ENOENT;
}
slash_count = get_str_char_count(str, '/');
switch (slash_count) {
@@ -1159,7 +1159,7 @@ static int dl_argv_handle_both(struct dl *dl, char *str, char **p_bus_name,
pr_err("One of following identifications expected:\n"
"Devlink identification (\"bus_name/dev_name\")\n"
"Port identification (\"bus_name/dev_name/port_index\" or \"netdev ifname\")\n");
- return -EINVAL;
+ return -ENOENT;
}
slash_count = get_str_char_count(str, '/');
if (slash_count == 1) {
@@ -1681,7 +1681,7 @@ static int dl_args_finding_required_validate(uint64_t o_required,
o_flag = dl_args_required[i].o_flag;
if ((o_required & o_flag) && !(o_found & o_flag)) {
pr_err("%s\n", dl_args_required[i].err_msg);
- return -EINVAL;
+ return -ENOENT;
}
}
if (o_required & ~o_found) {
--
2.41.0
Powered by blists - more mailing lists