]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network/json: drop unnecessary return value assignment 41693/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 9 Apr 2026 23:02:41 +0000 (08:02 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 17 Apr 2026 16:35:17 +0000 (01:35 +0900)
src/network/networkd-json.c

index 0c3bb5b8fb4bb95167189e2fc0c23d2c6831a001..04ad5cfaedd2992c883d0b698789d437c1892eb6 100644 (file)
@@ -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));