From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Oct 2018 16:49:18 +0000 (+0200)
Subject: sd-ndisc: change return value of ndisc_reset() to void
X-Git-Tag: v240~556^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=165ad41b7fb97fb61e5436896dbaeb1b3e62f2e2;p=thirdparty%2Fsystemd.git

sd-ndisc: change return value of ndisc_reset() to void

We never generate anything other than 0 anyway, and we never check it,
hence let's just simplify things.
---

diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c
index 6f0e2ca0df8..d679fc82229 100644
--- a/src/libsystemd-network/sd-ndisc.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -100,7 +100,7 @@ _public_ sd_event *sd_ndisc_get_event(sd_ndisc *nd) {
         return nd->event;
 }
 
-static int ndisc_reset(sd_ndisc *nd) {
+static void ndisc_reset(sd_ndisc *nd) {
         assert(nd);
 
         nd->timeout_event_source = sd_event_source_unref(nd->timeout_event_source);
@@ -108,8 +108,6 @@ static int ndisc_reset(sd_ndisc *nd) {
         nd->retransmit_time = 0;
         nd->recv_event_source = sd_event_source_unref(nd->recv_event_source);
         nd->fd = safe_close(nd->fd);
-
-        return 0;
 }
 
 static sd_ndisc *ndisc_free(sd_ndisc *nd) {