diff options
| author | Petr Machata <petrm@nvidia.com> | 2023-11-22 16:23:28 +0100 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2023-11-22 19:31:55 +0000 |
| commit | 60254925ccab10cfd24dc43c91cb95e50f65c7cf (patch) | |
| tree | 44a5672be67be9295ae3b9cc79a1cffa2654d6c6 | |
| parent | e4956e7f1fd9bb8d8bf74947c32ac381e19b96ec (diff) | |
| download | iproute2-60254925ccab10cfd24dc43c91cb95e50f65c7cf.tar.gz | |
lib: utils: Switch matches() to returning int again
Since commit 1f420318bda3 ("utils: don't match empty strings as prefixes")
the function has pretended to return a boolean. But every user expects it
to return zero on success and a non-zero value on failure, like strcmp().
Even the function itself actually returns "true" to mean "no match". This
only makes sense if one considers a boolean to be a one-bit unsigned
integer with no inherent meaning, which I do not think is reasonable.
Switch the prototype back to int, and return 1 instead of true.
Cc: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
| -rw-r--r-- | include/utils.h | 2 | ||||
| -rw-r--r-- | lib/utils.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/utils.h b/include/utils.h index f26ed822f..add55bfa3 100644 --- a/include/utils.h +++ b/include/utils.h @@ -198,7 +198,7 @@ int check_ifname(const char *); int check_altifname(const char *name); int get_ifname(char *, const char *); const char *get_ifname_rta(int ifindex, const struct rtattr *rta); -bool matches(const char *prefix, const char *string); +int matches(const char *prefix, const char *string); int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits); int inet_addr_match_rta(const inet_prefix *m, const struct rtattr *rta); diff --git a/lib/utils.c b/lib/utils.c index 99ba7a233..1fc42a9a8 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -873,18 +873,18 @@ const char *get_ifname_rta(int ifindex, const struct rtattr *rta) return name; } -/* Returns false if 'prefix' is a not empty prefix of 'string'. +/* Returns 0 if 'prefix' is a not empty prefix of 'string', != 0 otherwise. */ -bool matches(const char *prefix, const char *string) +int matches(const char *prefix, const char *string) { if (!*prefix) - return true; + return 1; while (*string && *prefix == *string) { prefix++; string++; } - return !!*prefix; + return *prefix; } int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits) |