The branch main has been updated by mhorne:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b5ebd8bb4e90b810c834aabb78c87054ab84db8e

commit b5ebd8bb4e90b810c834aabb78c87054ab84db8e
Author:     Elyes Haouas <[email protected]>
AuthorDate: 2023-11-03 17:46:16 +0000
Commit:     Mitchell Horne <[email protected]>
CommitDate: 2023-11-06 19:07:10 +0000

    ypserv: Remove return statement at the end of void functions
    
    Signed-off-by: Elyes Haouas <[email protected]>
---
 usr.sbin/ypserv/yp_dblookup.c  | 6 ------
 usr.sbin/ypserv/yp_dnslookup.c | 6 ------
 usr.sbin/ypserv/yp_main.c      | 1 -
 usr.sbin/ypserv/yp_server.c    | 2 --
 4 files changed, 15 deletions(-)

diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index ee3a4c2e9d98..c0aefb048cb9 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -91,7 +91,6 @@ void
 yp_init_dbs(void)
 {
        TAILQ_INIT(&qhead);
-       return;
 }
 
 /*
@@ -153,8 +152,6 @@ yp_free_qent(struct circleq_entry *q)
         */
        free(q);
        q = NULL;
-
-       return;
 }
 
 /*
@@ -171,8 +168,6 @@ yp_flush(void)
        TAILQ_REMOVE(&qhead, qptr, links);
        yp_free_qent(qptr);
        numdbs--;
-
-       return;
 }
 
 /*
@@ -190,7 +185,6 @@ yp_flush_all(void)
        }
        numdbs = 0;
 
-       return;
 }
 
 static char *inter_string = "YP_INTERDOMAIN";
diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c
index b1dc712c35ff..699c4d7e8018 100644
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@@ -306,8 +306,6 @@ yp_send_dns_reply(struct circleq_dnsentry *q, char *buf)
        if (q->prot_type == SOCK_DGRAM)
                svcudp_set_xid(q->xprt, xid);
        q->xprt->xp_raddr = client_addr;
-
-       return;
 }
 
 /*
@@ -334,8 +332,6 @@ yp_prune_dnsq(void)
 
        if (pending < 0)
                pending = 0;
-
-       return;
 }
 
 /*
@@ -403,8 +399,6 @@ yp_run_dnsq(void)
 
        /* Decrement TTLs on other entries while we're here. */
        yp_prune_dnsq();
-
-       return;
 }
 
 /*
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c
index dac006d4bc28..d326603a9229 100644
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@@ -209,7 +209,6 @@ reaper(int sig)
                exit(0);
        }
        errno = saved_errno;
-       return;
 }
 
 static void
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 8bfff7355a16..62e45e35cbe1 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -305,7 +305,6 @@ ypxfr_callback(ypxfrstat rval, struct sockaddr_in *addr, 
unsigned int transid,
        }
 
        clnt_destroy(clnt);
-       return;
 }
 
 #define YPXFR_RETURN(CODE)                                             \
@@ -673,7 +672,6 @@ static void yp_maplist_free(struct ypmaplist *yp_maplist)
                free(yp_maplist);
                yp_maplist = next;
        }
-       return;
 }
 
 static struct ypmaplist *

Reply via email to