| Message ID | 20230808214258.975440-1-mathieu@schroetersa.ch (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3a463c152a9a5503f9c37362b63acd6f72ecba6c |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2-next,1/4] Add get_long utility and adapt get_integer accordingly | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This series was applied to iproute2/iproute2-next.git (main) by David Ahern <dsahern@kernel.org>: On Tue, 8 Aug 2023 23:42:55 +0200 you wrote: > Signed-off-by: Mathieu Schroeter <mathieu@schroetersa.ch> > --- > include/utils.h | 1 + > lib/utils.c | 13 ++++++++++++- > 2 files changed, 13 insertions(+), 1 deletion(-) Here is the summary with links: - [iproute2-next,1/4] Add get_long utility and adapt get_integer accordingly https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=3a463c152a9a - [iproute2-next,2/4] Add utility to convert an unsigned int to string https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=db7fb3f19657 - [iproute2-next,3/4] ss: change aafilter port from int to long (inode support) https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=012cb5152d05 - [iproute2-next,4/4] ss: print unix socket "ports" as unsigned int (inode) https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=e12d0c929cf5 You are awesome, thank you!
diff --git a/include/utils.h b/include/utils.h index 3159dbab..cf11174d 100644 --- a/include/utils.h +++ b/include/utils.h @@ -142,6 +142,7 @@ int get_addr_rta(inet_prefix *dst, const struct rtattr *rta, int family); int get_addr_ila(__u64 *val, const char *arg); int read_prop(const char *dev, char *prop, long *value); +int get_long(long *val, const char *arg, int base); int get_integer(int *val, const char *arg, int base); int get_unsigned(unsigned *val, const char *arg, int base); int get_time_rtt(unsigned *val, const char *arg, int *raw); diff --git a/lib/utils.c b/lib/utils.c index b1f27305..68f44303 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -108,7 +108,7 @@ static int get_hex(char c) return -1; } -int get_integer(int *val, const char *arg, int base) +int get_long(long *val, const char *arg, int base) { long res; char *ptr; @@ -133,6 +133,17 @@ int get_integer(int *val, const char *arg, int base) if ((res == LONG_MAX || res == LONG_MIN) && errno == ERANGE) return -1; + if (val) + *val = res; + return 0; +} + +int get_integer(int *val, const char *arg, int base) +{ + long res; + + res = get_long(NULL, arg, base); + /* Outside range of int */ if (res < INT_MIN || res > INT_MAX) return -1;
Signed-off-by: Mathieu Schroeter <mathieu@schroetersa.ch> --- include/utils.h | 1 + lib/utils.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)