From: David Ahern <dsahern@kernel.org>
To: netdev@vger.kernel.org
Cc: stephen@networkplumber.org, parav@nvidia.com, jiri@nvidia.com,
David Ahern <dsahern@kernel.org>
Subject: [PATCH iproute2-next 2/4] devlink: Remove strtouint32_t in favor of get_u32
Date: Wed, 16 Feb 2022 19:57:09 -0700 [thread overview]
Message-ID: <20220217025711.9369-3-dsahern@kernel.org> (raw)
In-Reply-To: <20220217025711.9369-1-dsahern@kernel.org>
strtouint32_t duplicates get_u32; remove it.
Signed-off-by: David Ahern <dsahern@kernel.org>
---
devlink/devlink.c | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index 4e2dc6e09682..4a5f7f7a0ba1 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -857,20 +857,6 @@ static int ifname_map_rev_lookup(struct dl *dl, const char *bus_name,
return -ENOENT;
}
-static int strtouint32_t(const char *str, uint32_t *p_val)
-{
- char *endptr;
- unsigned long int val;
-
- val = strtoul(str, &endptr, 10);
- if (endptr == str || *endptr != '\0')
- return -EINVAL;
- if (val > UINT_MAX)
- return -ERANGE;
- *p_val = val;
- return 0;
-}
-
static int strtouint16_t(const char *str, uint16_t *p_val)
{
char *endptr;
@@ -966,7 +952,7 @@ static int __dl_argv_handle_port(char *str,
pr_err("Port identification \"%s\" is invalid\n", str);
return err;
}
- err = strtouint32_t(portstr, p_port_index);
+ err = get_u32(p_port_index, portstr, 10);
if (err) {
pr_err("Port index \"%s\" is not a number or not within range\n",
portstr);
@@ -1145,7 +1131,7 @@ static int dl_argv_handle_rate(struct dl *dl, char **p_bus_name,
}
if (strspn(identifier, "0123456789") == strlen(identifier)) {
- err = strtouint32_t(identifier, p_port_index);
+ err = get_u32(p_port_index, identifier, 10);
if (err) {
pr_err("Port index \"%s\" is not a number"
" or not within range\n", identifier);
@@ -1187,7 +1173,7 @@ static int dl_argv_uint32_t(struct dl *dl, uint32_t *p_val)
return -EINVAL;
}
- err = strtouint32_t(str, p_val);
+ err = get_u32(p_val, str, 10);
if (err) {
pr_err("\"%s\" is not a number or not within range\n", str);
return err;
@@ -3184,7 +3170,7 @@ static int cmd_dev_param_set(struct dl *dl)
dl->opts.param_value,
&val_u32);
else
- err = strtouint32_t(dl->opts.param_value, &val_u32);
+ err = get_u32(&val_u32, dl->opts.param_value, 10);
if (err)
goto err_param_value_parse;
if (val_u32 == ctx.value.vu32)
@@ -4446,7 +4432,7 @@ static int cmd_port_param_set(struct dl *dl)
dl->opts.param_value,
&val_u32);
else
- err = strtouint32_t(dl->opts.param_value, &val_u32);
+ err = get_u32(&val_u32, dl->opts.param_value, 10);
if (err)
goto err_param_value_parse;
if (val_u32 == ctx.value.vu32)
--
2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2022-02-17 2:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 2:57 [PATCH iproute2-next 0/4] devlink: Remove custom string conversions David Ahern
2022-02-17 2:57 ` [PATCH iproute2-next 1/4] devlink: Remove strtouint64_t in favor of get_u64 David Ahern
2022-02-17 2:57 ` David Ahern [this message]
2022-02-17 2:57 ` [PATCH iproute2-next 3/4] devlink: Remove strtouint16_t in favor of get_u16 David Ahern
2022-02-17 2:57 ` [PATCH iproute2-next 4/4] devlink: Remove strtouint8_t in favor of get_u8 David Ahern
2022-02-21 16:40 ` [PATCH iproute2-next 0/4] devlink: Remove custom string conversions patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220217025711.9369-3-dsahern@kernel.org \
--to=dsahern@kernel.org \
--cc=jiri@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=parav@nvidia.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).