From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 9 Apr 2026 23:02:41 +0000 (+0900)
Subject: network/json: drop unnecessary return value assignment
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F41693%2Fhead;p=thirdparty%2Fsystemd.git

network/json: drop unnecessary return value assignment
---

diff --git a/src/network/networkd-json.c b/src/network/networkd-json.c
index 0c3bb5b8fb4..04ad5cfaedd 100644
--- a/src/network/networkd-json.c
+++ b/src/network/networkd-json.c
@@ -1431,23 +1431,19 @@ static int dhcp_client_private_options_append_json(Link *link, sd_json_variant *
 }
 
 static int dhcp_client_id_append_json(Link *link, sd_json_variant **v) {
-        const sd_dhcp_client_id *client_id;
-        const void *data;
-        size_t l;
-        int r;
-
         assert(link);
         assert(v);
 
         if (!link->dhcp_client)
                 return 0;
 
-        r = sd_dhcp_client_get_client_id(link->dhcp_client, &client_id);
-        if (r < 0)
+        const sd_dhcp_client_id *client_id;
+        if (sd_dhcp_client_get_client_id(link->dhcp_client, &client_id) < 0)
                 return 0;
 
-        r = sd_dhcp_client_id_get_raw(client_id, &data, &l);
-        if (r < 0)
+        const void *data;
+        size_t l;
+        if (sd_dhcp_client_id_get_raw(client_id, &data, &l) < 0)
                 return 0;
 
         return sd_json_variant_merge_objectbo(v, SD_JSON_BUILD_PAIR_BYTE_ARRAY("ClientIdentifier", data, l));