diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2016-03-01 12:52:44 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2016-03-01 12:52:44 +0000 |
| commit | 6589f728e9f24424818058c30de23a1aec5efd13 (patch) | |
| tree | 78dbf93886f8c37a653f7b3256441e6d560ef711 /usr.sbin | |
| parent | b6e0f05cb913e0653881e18d250a1a54fc139546 (diff) | |
Pointless 'return;' in void functions
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/rtadvd/config.c | 4 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/if.c | 4 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.c | 11 |
3 files changed, 3 insertions, 16 deletions
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index b8cb4ae398f..dd635cc5c24 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.54 2016/02/29 20:25:46 jca Exp $ */ +/* $OpenBSD: config.c,v 1.55 2016/03/01 12:52:43 jca Exp $ */ /* $KAME: config.c,v 1.62 2002/05/29 10:13:10 itojun Exp $ */ /* @@ -892,8 +892,6 @@ make_packet(struct rainfo *rainfo) while (((uintptr_t)buf) % 8 != 0) *buf++ = '\0'; } - - return; } static int diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index 2f768a615d4..b6d46d489dd 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.37 2016/02/08 23:19:00 jca Exp $ */ +/* $OpenBSD: if.c,v 1.38 2016/03/01 12:52:43 jca Exp $ */ /* $KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $ */ /* @@ -210,8 +210,6 @@ lladdropt_fill(struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt) log_warn("unsupported link type(%d)", sdl->sdl_type); exit(1); } - - return; } #define SIN6(s) ((struct sockaddr_in6 *)(s)) diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index 60cc104380f..c7ba15af363 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.c,v 1.71 2016/02/26 12:50:03 jca Exp $ */ +/* $OpenBSD: rtadvd.c,v 1.72 2016/03/01 12:52:43 jca Exp $ */ /* $KAME: rtadvd.c,v 1.66 2002/05/29 14:18:36 itojun Exp $ */ /* @@ -482,8 +482,6 @@ rtmsg_input(void) rtadvd_set_timer(&rai->timer->tm, rai->timer); } } - - return; } void @@ -625,10 +623,7 @@ rtadvd_input(void) * before setting ICMP6 type filter(see sock_open()). */ log_warnx("invalid icmp type(%d)", icp->icmp6_type); - return; } - - return; } static void @@ -735,7 +730,6 @@ rs_input(int len, struct nd_router_solicit *rs, done: free_ndopts(&ndopts); - return; } static void @@ -865,7 +859,6 @@ ra_input(int len, struct nd_router_advert *ra, done: free_ndopts(&ndopts); - return; } /* return a non-zero value if the received prefix is inconsistent with ours */ @@ -1199,8 +1192,6 @@ sock_open(void) sndmhdr.msg_iovlen = 1; sndmhdr.msg_control = (caddr_t)sndcmsgbuf; sndmhdr.msg_controllen = sndcmsgbuflen; - - return; } /* open a routing socket to watch the routing table */ |