]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
devlink: Remove strtouint8_t in favor of get_u8
authorDavid Ahern <dsahern@kernel.org>
Thu, 17 Feb 2022 02:08:10 +0000 (19:08 -0700)
committerDavid Ahern <dsahern@kernel.org>
Mon, 21 Feb 2022 16:33:34 +0000 (09:33 -0700)
strtouint8_t duplicates get_u8; remove it.

Signed-off-by: David Ahern <dsahern@kernel.org>
devlink/devlink.c

index 54570df94b7fc06558c2c177ff2e9a5c8a1cd455..da9f97788bcf33e7d316d76997f0e6176254d310 100644 (file)
@@ -857,20 +857,6 @@ static int ifname_map_rev_lookup(struct dl *dl, const char *bus_name,
        return -ENOENT;
 }
 
-static int strtouint8_t(const char *str, uint8_t *p_val)
-{
-       char *endptr;
-       unsigned long int val;
-
-       val = strtoul(str, &endptr, 10);
-       if (endptr == str || *endptr != '\0')
-               return -EINVAL;
-       if (val > UCHAR_MAX)
-               return -ERANGE;
-       *p_val = val;
-       return 0;
-}
-
 static int strtobool(const char *str, bool *p_val)
 {
        bool val;
@@ -3123,7 +3109,7 @@ static int cmd_dev_param_set(struct dl *dl)
                                                      &val_u32);
                        val_u8 = val_u32;
                } else {
-                       err = strtouint8_t(dl->opts.param_value, &val_u8);
+                       err = get_u8(&val_u8, dl->opts.param_value, 10);
                }
                if (err)
                        goto err_param_value_parse;
@@ -4385,7 +4371,7 @@ static int cmd_port_param_set(struct dl *dl)
                                                      &val_u32);
                        val_u8 = val_u32;
                } else {
-                       err = strtouint8_t(dl->opts.param_value, &val_u8);
+                       err = get_u8(&val_u8, dl->opts.param_value, 10);
                }
                if (err)
                        goto err_param_value_parse;