From 828b5dbf2ff7a31816da66b6b1196b41e04c3fa1 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 19 Feb 2024 10:00:33 +0900 Subject: [PATCH] sd-ndisc: allow to call sd_ndisc_router_get_lifetime() with NULL for 'ret' --- src/libsystemd-network/sd-ndisc-router.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libsystemd-network/sd-ndisc-router.c b/src/libsystemd-network/sd-ndisc-router.c index fa22368c8f0..536ee8cdf22 100644 --- a/src/libsystemd-network/sd-ndisc-router.c +++ b/src/libsystemd-network/sd-ndisc-router.c @@ -303,10 +303,11 @@ int sd_ndisc_router_get_flags(sd_ndisc_router *rt, uint64_t *ret) { int sd_ndisc_router_get_lifetime(sd_ndisc_router *rt, uint64_t *ret) { assert_return(rt, -EINVAL); - assert_return(ret, -EINVAL); - *ret = rt->lifetime_usec; - return 0; + if (ret) + *ret = rt->lifetime_usec; + + return rt->lifetime_usec > 0; /* Indicate if the router is still valid or not. */ } int sd_ndisc_router_get_preference(sd_ndisc_router *rt, unsigned *ret) {