From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 6 Feb 2022 10:42:58 +0000 (+0900)
Subject: sd-dhcp6-client: voidify client_reset()
X-Git-Tag: v251-rc1~291^2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16347c15d87ec4618f66b62b953c5097e2d7aff1;p=thirdparty%2Fsystemd.git

sd-dhcp6-client: voidify client_reset()
---

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 9bd38653144..457e8ca915e 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -584,7 +584,7 @@ static void client_notify(sd_dhcp6_client *client, int event) {
                 client->callback(client, event, client->userdata);
 }
 
-static int client_reset(sd_dhcp6_client *client) {
+static void client_reset(sd_dhcp6_client *client) {
         assert(client);
 
         client->lease = sd_dhcp6_lease_unref(client->lease);
@@ -604,8 +604,6 @@ static int client_reset(sd_dhcp6_client *client) {
         (void) event_source_disable(client->timeout_t2);
 
         client->state = DHCP6_STATE_STOPPED;
-
-        return 0;
 }
 
 static void client_stop(sd_dhcp6_client *client, int error) {
@@ -1407,9 +1405,7 @@ int sd_dhcp6_client_start(sd_dhcp6_client *client) {
         if (!client->information_request && client->request_ia == 0)
                 return -EINVAL;
 
-        r = client_reset(client);
-        if (r < 0)
-                return r;
+        client_reset(client);
 
         r = client_ensure_iaid(client);
         if (r < 0)