]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-dhcp6-lease: use free_and_replace_full()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 15 Sep 2024 19:12:02 +0000 (04:12 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 15 Oct 2024 09:23:59 +0000 (18:23 +0900)
src/libsystemd-network/sd-dhcp6-lease.c

index c2eb0db87def52b3d0956c68ae5452552a561e7a..30c0e514f86fe411246d3e76efa22054a229651e 100644 (file)
@@ -763,8 +763,7 @@ static int dhcp6_lease_parse_message(
                                 continue;
                         }
 
-                        dhcp6_ia_free(lease->ia_na);
-                        lease->ia_na = TAKE_PTR(ia);
+                        free_and_replace_full(lease->ia_na, ia, dhcp6_ia_free);
                         break;
                 }
                 case SD_DHCP6_OPTION_IA_PD: {
@@ -788,8 +787,7 @@ static int dhcp6_lease_parse_message(
                                 continue;
                         }
 
-                        dhcp6_ia_free(lease->ia_pd);
-                        lease->ia_pd = TAKE_PTR(ia);
+                        free_and_replace_full(lease->ia_pd, ia, dhcp6_ia_free);
                         break;
                 }
                 case SD_DHCP6_OPTION_RAPID_COMMIT: