The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=be5a2c70b1c8c243a9c22e16d60335b56c9983ee
commit be5a2c70b1c8c243a9c22e16d60335b56c9983ee Author: Elyes Haouas <[email protected]> AuthorDate: 2023-11-03 17:44:50 +0000 Commit: Mitchell Horne <[email protected]> CommitDate: 2023-11-06 19:07:10 +0000 rtadvd: Remove return statement at the end of void functions Signed-off-by: Elyes Haouas <[email protected]> --- 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; }
