]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-radv: use assert_return()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 24 Oct 2021 19:37:11 +0000 (04:37 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 27 Oct 2021 07:41:04 +0000 (16:41 +0900)
src/libsystemd-network/sd-radv.c

index 2d91a406f836f8367f9b6ce842effd32cffec362..9030150aeefea8a51561fc2476d8c155e65abb22 100644 (file)
@@ -550,9 +550,7 @@ _public_ int sd_radv_add_prefix(sd_radv *ra, sd_radv_prefix *p, int dynamic) {
         usec_t time_now, valid, preferred, valid_until, preferred_until;
 
         assert_return(ra, -EINVAL);
-
-        if (!p)
-                return -EINVAL;
+        assert_return(p, -EINVAL);
 
         /* Refuse prefixes that don't have a prefix set */
         if (in6_addr_is_null(&p->opt.in6_addr))
@@ -666,9 +664,7 @@ _public_ int sd_radv_add_route_prefix(sd_radv *ra, sd_radv_route_prefix *p, int
         int r;
 
         assert_return(ra, -EINVAL);
-
-        if (!p)
-                return -EINVAL;
+        assert_return(p, -EINVAL);
 
         (void) in_addr_prefix_to_string(AF_INET6,
                                         (const union in_addr_union*) &p->opt.in6_addr,