Date: Mon, 13 Feb 2023 18:06:57 GMT From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ec6b2822188a - main - ipfilter: ansify Message-ID: <202302131806.31DI6vqF097603@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ec6b2822188a8103807b5eb5d70128c1ae2e9c6d commit ec6b2822188a8103807b5eb5d70128c1ae2e9c6d Author: Mateusz Guzik <mjg@FreeBSD.org> AuthorDate: 2023-02-13 18:05:57 +0000 Commit: Mateusz Guzik <mjg@FreeBSD.org> CommitDate: 2023-02-13 18:05:57 +0000 ipfilter: ansify Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 6 ++---- sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c | 4 +--- sys/netpfil/ipfilter/netinet/ip_htable.c | 4 +--- sys/netpfil/ipfilter/netinet/ip_state.c | 4 +--- sys/netpfil/ipfilter/netinet/mlfk_ipl.c | 16 ++++++++-------- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index 0dfc23d3dd1f..95c8b73e6388 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -924,8 +924,7 @@ bad: int -ipf_verifysrc(fin) - fr_info_t *fin; +ipf_verifysrc(fr_info_t *fin) { struct nhop_object *nh; @@ -1010,8 +1009,7 @@ ipf_ifpaddr(ipf_main_softc_t *softc, int v, int atype, void *ifptr, u_32_t -ipf_newisn(fin) - fr_info_t *fin; +ipf_newisn(fr_info_t *fin) { u_32_t newiss; newiss = arc4random(); diff --git a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c index b305094e9704..fff99c8c5b33 100644 --- a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c +++ b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c @@ -266,9 +266,7 @@ ipf_p_ftp_setpending(ipf_main_softc_t *softc, ftpinfo_t *ftp) void -ipf_p_ftp_del(softc, aps) - ipf_main_softc_t *softc; - ap_session_t *aps; +ipf_p_ftp_del(ipf_main_softc_t *softc, ap_session_t *aps) { ftpinfo_t *ftp; diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index acdd441e0476..3e67242f3624 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -177,9 +177,7 @@ ipf_htable_soft_destroy(ipf_main_softc_t *softc, void *arg) /* Initialise the hash table ready for use. */ /* ------------------------------------------------------------------------ */ static int -ipf_htable_soft_init(softc, arg) - ipf_main_softc_t *softc; - void *arg; +ipf_htable_soft_init(ipf_main_softc_t *softc, void *arg) { ipf_htable_softc_t *softh = arg; diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c index 463416f454a9..2e6913db8f88 100644 --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -4551,9 +4551,7 @@ ipf_checkicmp6matchingstate(fr_info_t *fin) /* Initialise the array of timeout queues for TCP. */ /* ------------------------------------------------------------------------ */ void -ipf_sttab_init(softc, tqp) - ipf_main_softc_t *softc; - ipftq_t *tqp; +ipf_sttab_init(ipf_main_softc_t *softc, ipftq_t *tqp) { int i; diff --git a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c index aa55ef2d8aec..6d4ec5e5a408 100644 --- a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c +++ b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c @@ -542,14 +542,14 @@ ipfclose(dev_t dev, int flags) * called during packet processing and cause an inconsistancy to appear in * the filter lists. */ -static int ipfread(dev, uio, ioflag) - int ioflag; #ifdef __FreeBSD__ - struct cdev *dev; +static int ipfread(struct cdev *dev, struct uio *uio, int ioflag) #else +static int ipfread(dev, uio, ioflag) + int ioflag; dev_t dev; -#endif struct uio *uio; +#endif { int error; int unit = GET_MINOR(dev); @@ -585,14 +585,14 @@ static int ipfread(dev, uio, ioflag) * called during packet processing and cause an inconsistancy to appear in * the filter lists. */ -static int ipfwrite(dev, uio, ioflag) - int ioflag; #ifdef __FreeBSD__ - struct cdev *dev; +static int ipfwrite(struct cdev *dev, struct uio *uio, int ioflag) #else +static int ipfwrite(dev, uio, ioflag) + int ioflag; dev_t dev; -#endif struct uio *uio; +#endif { int error;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302131806.31DI6vqF097603>