From 7ebb14313f50e51887d9440fb35ce74472565b20 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 27 Sep 2021 21:05:07 +0900 Subject: [PATCH] sd-radv: rename sd_radv_prefix_set_route_prefix() -> sd_radv_route_prefix_set_prefix() --- src/libsystemd-network/sd-radv.c | 2 +- src/network/networkd-radv.c | 2 +- src/systemd/sd-radv.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index ae33894302..2d91a406f8 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -936,7 +936,7 @@ _public_ int sd_radv_route_prefix_new(sd_radv_route_prefix **ret) { DEFINE_PUBLIC_TRIVIAL_REF_UNREF_FUNC(sd_radv_route_prefix, sd_radv_route_prefix, mfree); -_public_ int sd_radv_prefix_set_route_prefix(sd_radv_route_prefix *p, const struct in6_addr *in6_addr, +_public_ int sd_radv_route_prefix_set_prefix(sd_radv_route_prefix *p, const struct in6_addr *in6_addr, unsigned char prefixlen) { assert_return(p, -EINVAL); assert_return(in6_addr, -EINVAL); diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index 34e6a41c34..471f6d78e8 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -952,7 +952,7 @@ int config_parse_route_prefix( return 0; } - r = sd_radv_prefix_set_route_prefix(p->radv_route_prefix, &in6addr.in6, prefixlen); + r = sd_radv_route_prefix_set_prefix(p->radv_route_prefix, &in6addr.in6, prefixlen); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to set route prefix, ignoring assignment: %m"); return 0; diff --git a/src/systemd/sd-radv.h b/src/systemd/sd-radv.h index 6bf56def40..f597c2c33d 100644 --- a/src/systemd/sd-radv.h +++ b/src/systemd/sd-radv.h @@ -91,7 +91,7 @@ int sd_radv_route_prefix_new(sd_radv_route_prefix **ret); sd_radv_route_prefix *sd_radv_route_prefix_ref(sd_radv_route_prefix *ra); sd_radv_route_prefix *sd_radv_route_prefix_unref(sd_radv_route_prefix *ra); -int sd_radv_prefix_set_route_prefix(sd_radv_route_prefix *p, const struct in6_addr *in6_addr, unsigned char prefixlen); +int sd_radv_route_prefix_set_prefix(sd_radv_route_prefix *p, const struct in6_addr *in6_addr, unsigned char prefixlen); int sd_radv_route_prefix_set_lifetime(sd_radv_route_prefix *p, uint32_t valid_lifetime); _SD_DEFINE_POINTER_CLEANUP_FUNC(sd_radv, sd_radv_unref);