From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 19 Jan 2024 01:27:14 +0000 (+0900)
Subject: network: use strdup_or_null() where appropriate
X-Git-Tag: v256-rc1~1106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6504d41c630e85ca16af3f7e17cbb66ee5494076;p=thirdparty%2Fsystemd.git

network: use strdup_or_null() where appropriate
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index fc6a708f87d..631c64ec06e 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -615,12 +615,12 @@ int address_dup(const Address *src, Address **ret) {
         dest->nft_set_context.n_sets = 0;
 
         if (src->family == AF_INET) {
-                r = free_and_strdup(&dest->label, src->label);
+                r = strdup_or_null(src->label, &dest->label);
                 if (r < 0)
                         return r;
         }
 
-        r = free_and_strdup(&dest->netlabel, src->netlabel);
+        r = strdup_or_null(src->netlabel, &dest->netlabel);
         if (r < 0)
                 return r;
 
diff --git a/src/network/networkd-route-metric.c b/src/network/networkd-route-metric.c
index 67841cb67ea..b27b3c12948 100644
--- a/src/network/networkd-route-metric.c
+++ b/src/network/networkd-route-metric.c
@@ -39,7 +39,7 @@ int route_metric_copy(const RouteMetric *src, RouteMetric *dest) {
         } else
                 dest->metrics_set = NULL;
 
-        return free_and_strdup(&dest->tcp_congestion_control_algo, src->tcp_congestion_control_algo);
+        return strdup_or_null(src->tcp_congestion_control_algo, &dest->tcp_congestion_control_algo);
 }
 
 void route_metric_hash_func(const RouteMetric *metric, struct siphash *state) {