git: c492eb60b303 - main - altq: ansify

The branch main has been updated by mjg:

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

commit c492eb60b30328035129a11c222aaded4d499b44
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2023-02-13 18:32:45 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2023-02-13 18:32:45 +0000

    altq: ansify
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/net/altq/altq_priq.c |  3 +--
 sys/net/altq/altq_red.c  |  4 +---
 sys/net/altq/altq_subr.c | 43 +++++++++++++------------------------------
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/sys/net/altq/altq_priq.c b/sys/net/altq/altq_priq.c
index bb679baa236d..6d26116a601b 100644
--- a/sys/net/altq/altq_priq.c
+++ b/sys/net/altq/altq_priq.c
@@ -575,8 +575,7 @@ priq_getq(struct priq_class *cl)
 }
 
 static struct mbuf *
-priq_pollq(cl)
-	struct priq_class *cl;
+priq_pollq(struct priq_class *cl)
 {
 	return qhead(cl->cl_q);
 }
diff --git a/sys/net/altq/altq_red.c b/sys/net/altq/altq_red.c
index cd180f4fca2f..e6fc423f48b9 100644
--- a/sys/net/altq/altq_red.c
+++ b/sys/net/altq/altq_red.c
@@ -523,9 +523,7 @@ mark_ecn(struct mbuf *m, struct altq_pktattr *pktattr, int flags)
 }
 
 struct mbuf *
-red_getq(rp, q)
-	red_t *rp;
-	class_queue_t *q;
+red_getq(red_t *rp, class_queue_t *q)
 {
 	struct mbuf *m;
 
diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c
index d569aa3f3ab3..c8b98beaba07 100644
--- a/sys/net/altq/altq_subr.c
+++ b/sys/net/altq/altq_subr.c
@@ -148,9 +148,7 @@ ALTQ_FEATURE(fairq, "ALTQ Fair Queuing discipline");
 
 /* look up the queue state by the interface name and the queueing type. */
 void *
-altq_lookup(name, type)
-	char *name;
-	int type;
+altq_lookup(char *name, int type)
 {
 	struct ifnet *ifp;
 
@@ -164,13 +162,10 @@ altq_lookup(name, type)
 }
 
 int
-altq_attach(ifq, type, discipline, enqueue, dequeue, request)
-	struct ifaltq *ifq;
-	int type;
-	void *discipline;
-	int (*enqueue)(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
-	struct mbuf *(*dequeue)(struct ifaltq *, int);
-	int (*request)(struct ifaltq *, int, void *);
+altq_attach(struct ifaltq *ifq, int type, void *discipline,
+	int (*enqueue)(struct ifaltq *, struct mbuf *, struct altq_pktattr *),
+	struct mbuf *(*dequeue)(struct ifaltq *, int),
+	int (*request)(struct ifaltq *, int, void *))
 {
 	IFQ_LOCK(ifq);
 	if (!ALTQ_IS_READY(ifq)) {
@@ -189,8 +184,7 @@ altq_attach(ifq, type, discipline, enqueue, dequeue, request)
 }
 
 int
-altq_detach(ifq)
-	struct ifaltq *ifq;
+altq_detach(struct ifaltq *ifq)
 {
 	IFQ_LOCK(ifq);
 
@@ -219,8 +213,7 @@ altq_detach(ifq)
 }
 
 int
-altq_enable(ifq)
-	struct ifaltq *ifq;
+altq_enable(struct ifaltq *ifq)
 {
 	int s;
 
@@ -247,8 +240,7 @@ altq_enable(ifq)
 }
 
 int
-altq_disable(ifq)
-	struct ifaltq *ifq;
+altq_disable(struct ifaltq *ifq)
 {
 	int s;
 
@@ -270,9 +262,7 @@ altq_disable(ifq)
 
 #ifdef ALTQ_DEBUG
 void
-altq_assert(file, line, failedexpr)
-	const char *file, *failedexpr;
-	int line;
+altq_assert(const char *file, int line, const char *failedexpr)
 {
 	(void)printf("altq assertion \"%s\" failed: file \"%s\", line %d\n",
 		     failedexpr, file, line);
@@ -293,9 +283,7 @@ altq_assert(file, line, failedexpr)
 #define	TBR_UNSCALE(x)	((x) >> TBR_SHIFT)
 
 static struct mbuf *
-tbr_dequeue(ifq, op)
-	struct ifaltq *ifq;
-	int op;
+tbr_dequeue(struct ifaltq *ifq, int op)
 {
 	struct tb_regulator *tbr;
 	struct mbuf *m;
@@ -345,9 +333,7 @@ tbr_dequeue(ifq, op)
  * if the specified rate is zero, the token bucket regulator is deleted.
  */
 int
-tbr_set(ifq, profile)
-	struct ifaltq *ifq;
-	struct tb_profile *profile;
+tbr_set(struct ifaltq *ifq, struct tb_profile *profile)
 {
 	struct tb_regulator *tbr, *otbr;
 
@@ -425,8 +411,7 @@ tbr_set(ifq, profile)
  * MPSAFE
  */
 static void
-tbr_timeout(arg)
-	void *arg;
+tbr_timeout(void *arg)
 {
 	VNET_ITERATOR_DECL(vnet_iter);
 	struct ifnet *ifp;
@@ -754,9 +739,7 @@ altq_getqstats(struct pf_altq *a, void *ubuf, int *nbytes, int version)
  * read and write diffserv field in IPv4 or IPv6 header
  */
 u_int8_t
-read_dsfield(m, pktattr)
-	struct mbuf *m;
-	struct altq_pktattr *pktattr;
+read_dsfield(struct mbuf *m, struct altq_pktattr *pktattr)
 {
 	struct mbuf *m0;
 	u_int8_t ds_field = 0;