From nobody Mon Nov 06 19:07:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLSz1d8cz4yjDx; Mon, 6 Nov 2023 19:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPLSz16zNz4f9b; Mon, 6 Nov 2023 19:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sEH9EHHyNyyhBjn+5YE+izumZvHDH67qcRy17z8+kE8=; b=Z0nIXA4QSevQapqTTuCKMpgeGD55V+q9utC7v+bVHd6lJR7+PifR2pabX4rgBTSVpgOtG3 Y6UQHUmwP85lKpS2ONsosPt1S+aU31lqaQsXWfeGXZGP6gCF0UWEqH0qXmZ3Pxbuleg2bv rXXqmhrE3YBiVZ2Do1c/U9cJt6J+Ag1FVrR55J9vLPoH7VbQva7kQVtf5EjR5qpQSHdpMF xrHbVyjgXdng9OjK8wwED+VokI8e4rvHMrZK9uVOASIg0U12a7sFwYXNZPb+NrFFc+S+v5 XU/a7KLYGDdkaps4dq3ijGyCfLSEFzUYbnxhtfu7f1H/Z2EK66KosEXGVdKVng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699297651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sEH9EHHyNyyhBjn+5YE+izumZvHDH67qcRy17z8+kE8=; b=CH1gjPK1P4nWQydVBkY7ugbkSuHEomYET2wFMJsahUOAeEmRJD0PhZ410hzpEtSLlcfeMh USwwp2vi5eYJYFca8FFoGXoAm/Xa70pEDJPLwjqi5euVUdWenCjkaRydJd//kkyMCtlOua dxfUASfnp7WYSwtdhDMKRkafmkEb8buoDr/kNY/Z5FBMURnnO1Xa3amDpWAeaPHDIstWwW DVx05E85DSz7K2081ZleQxH9/rvLKhwOV4POIOeiv73xNKj7NumtYg1ItEEmOvBPq9nxs1 8b1rLE58o6jqTFpI72ny3c7wgwFC2vCUIBu7kNxPtJLJB6ZSIJxQfUi9lD6LEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699297651; a=rsa-sha256; cv=none; b=XD6KstA9RPbnBMhYmxumr8U+VQksSQQXO6FUmeRCm5yN0kNARF4a4QErpoaf/2SLdth77p JY2fd94RZZoI2BKkWapGnM7j9WEHCydTXiIU9COUyov1H7VNAx/x8O1z9uYWMr3Q7+eeVR j5W3bVfdfLyC7M4WhTzcSdtnS2ueooOYYKwSLd0L13EMJ/O7xCtwozdyVv+VXiDoVPYKy7 RkAZtXuW5NktO5WcqSacwlVjnpWAxRyVEK684Jfiv41FW7FhEzkKSpyzzk+UI0orl3WaXE +AEqPx1zjLl9bCgjMm16k2/Cw1ZO9I4FAe2ctzF/57JdxqPOnQ1EA/CiKSv4Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPLSz0BYdz4RJ; Mon, 6 Nov 2023 19:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6J7U5t094213; Mon, 6 Nov 2023 19:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6J7U5g094210; Mon, 6 Nov 2023 19:07:30 GMT (envelope-from git) Date: Mon, 6 Nov 2023 19:07:30 GMT Message-Id: <202311061907.3A6J7U5g094210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: be5a2c70b1c8 - main - rtadvd: Remove return statement at the end of void functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be5a2c70b1c8c243a9c22e16d60335b56c9983ee Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=be5a2c70b1c8c243a9c22e16d60335b56c9983ee commit be5a2c70b1c8c243a9c22e16d60335b56c9983ee Author: Elyes Haouas AuthorDate: 2023-11-03 17:44:50 +0000 Commit: Mitchell Horne CommitDate: 2023-11-06 19:07:10 +0000 rtadvd: Remove return statement at the end of void functions Signed-off-by: Elyes Haouas --- usr.sbin/rtadvd/config.c | 1 - usr.sbin/rtadvd/if.c | 2 -- usr.sbin/rtadvd/rrenum.c | 3 --- usr.sbin/rtadvd/rtadvd.c | 10 ---------- usr.sbin/rtadvd/timer.c | 4 ---- 5 files changed, 20 deletions(-) diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index a264858edaf7..bd990c58b36a 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1548,5 +1548,4 @@ make_packet(struct rainfo *rai) syslog(LOG_DEBUG, "<%s>: nd_opt_dnssl_len = %d", __func__, ndopt_dnssl->nd_opt_dnssl_len); } - return; } diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index ead273bbcdd2..6212639ba028 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -143,8 +143,6 @@ lladdropt_fill(struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt) __func__, sdl->sdl_type); exit(1); } - - return; } int diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c index 0d0d7d5bf708..d148d5d20885 100644 --- a/usr.sbin/rtadvd/rrenum.c +++ b/usr.sbin/rtadvd/rrenum.c @@ -431,7 +431,6 @@ rr_command_input(int len, struct icmp6_router_renum *rr, failed: syslog(LOG_ERR, "<%s> received RR was invalid", __func__); - return; } void @@ -499,6 +498,4 @@ rr_input(int len, struct icmp6_router_renum *rr, struct in6_pktinfo *pi, break; } - - return; } diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index 181b1211d7af..aa9038b65e63 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -704,8 +704,6 @@ rtmsg_input(struct sockinfo *s) set_short_delay(ifi); } } - - return; } void @@ -897,8 +895,6 @@ rtadvd_input(struct sockinfo *s) syslog(LOG_ERR, "invalid icmp type(%d)", icp->icmp6_type); return; } - - return; } static void @@ -990,7 +986,6 @@ rs_input(int len, struct nd_router_solicit *rs, done: free_ndopts(&ndopts); - return; } static void @@ -1220,7 +1215,6 @@ ra_input(int len, struct nd_router_advert *nra, done: free_ndopts(&ndopts); - return; } static uint32_t @@ -1612,8 +1606,6 @@ sock_open(struct sockinfo *s) sndmhdr.msg_iovlen = 1; sndmhdr.msg_control = (caddr_t)sndcmsgbuf; sndmhdr.msg_controllen = sndcmsgbuflen; - - return; } /* open a routing socket to watch the routing table */ @@ -1915,6 +1907,4 @@ ra_timer_update(void *arg, struct timespec *tm) "<%s> RA timer on %s is set to %ld:%ld", __func__, ifi->ifi_ifname, (long int)tm->tv_sec, (long int)tm->tv_nsec / 1000); - - return; } diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c index 0e0cdd277071..a73bf6f94d29 100644 --- a/usr.sbin/rtadvd/timer.c +++ b/usr.sbin/rtadvd/timer.c @@ -99,8 +99,6 @@ rtadvd_update_timeout_handler(void) break; } } - - return; } struct rtadvd_timer * @@ -195,6 +193,4 @@ rtadvd_set_timer(struct timespec *tm, struct rtadvd_timer *rat) /* update the next expiration time */ if (TS_CMP(&rat->rat_tm, &tm_max, <)) tm_max = rat->rat_tm; - - return; }