d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipfilter: Retire pre-standard C support.

Browse Source 
All C compilers in 2021 support standard C and architectures that did
not were retired long ago. Simplify by removing now redundant
pre-standard C code.

MFC after:	1 week
This commit is contained in:
Cy Schubert 2021-01-14 20:32:16 -08:00
parent e7cf562a40
commit 83edbc3cb5
22 changed files with 4 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/ipfilter/bpf-ipf.h
View File

@ -420,25 +420,13 @@ struct bpf_insn {
* Systems based on non-BSD kernels don't have ifnet's (or they don't mean
* anything if it is in <net/if.h>) and won't work like this.
*/
# if __STDC__
extern void bpf_tap(struct ifnet *, u_char *, u_int);
extern void bpf_mtap(struct ifnet *, struct mbuf *);
extern void bpfattach(struct ifnet *, u_int, u_int);
extern void bpfilterattach(int);
# else
extern void bpf_tap();
extern void bpf_mtap();
extern void bpfattach();
extern void bpfilterattach();
# endif /* __STDC__ */
#endif /* BSD && (_KERNEL || KERNEL) */
#if __STDC__ || defined(__cplusplus)
extern int bpf_validate(struct bpf_insn *, int);
extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
#else
extern int bpf_validate();
extern u_int bpf_filter();
#endif
/*
* Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).

8
contrib/ipfilter/ipf.h
View File

@ -73,15 +73,7 @@
#include "opts.h"
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
#ifndef __STDC__
# undef const
# define const
#endif
#ifndef U_32_T

4
contrib/ipfilter/iplang/iplang_l.l
View File

@ -21,11 +21,7 @@
#include "ipf.h"
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
extern int opts;

4
contrib/ipfilter/ipsend/ipsend.h
View File

@ -16,11 +16,7 @@
*
*/
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
#include <net/if.h>

4
contrib/ipfilter/ipsend/ipsopt.c
View File

@ -27,11 +27,7 @@ static const char rcsid[] = "@(#)$Id$";
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif

4
contrib/ipfilter/kmem.h
View File

@ -11,11 +11,7 @@
#define __KMEM_H__
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
extern int openkmem __P((char *, char *));
extern int kmemcpy __P((char *, long, int));

23
contrib/ipfilter/lib/debug.c
View File

@ -8,11 +8,7 @@
* $Id$
*/
#if defined(__STDC__)
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#include <stdio.h>
#include "ipf.h"
@ -21,14 +17,8 @@
int debuglevel = 0;
#ifdef __STDC__
void debug(int level, char *fmt, ...)
#else
void debug(level, fmt, va_alist)
int level;
char *fmt;
va_dcl
#endif
void
debug(int level, char *fmt, ...)
{
va_list pvar;
@ -40,13 +30,8 @@ void debug(level, fmt, va_alist)
}
#ifdef __STDC__
void ipfkdebug(char *fmt, ...)
#else
void ipfkdebug(fmt, va_alist)
char *fmt;
va_dcl
#endif
void
ipfkdebug(char *fmt, ...)
{
va_list pvar;

4
contrib/ipfilter/lib/facpri.h
View File

@ -13,11 +13,7 @@
#ifndef __P
# define P_DEF
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
extern char *fac_toname __P((int));

4
contrib/ipfilter/lib/inet_addr.c
View File

@ -66,11 +66,7 @@ static const char rcsid[] = "@(#)$Id: inet_addr.c,v 1.8.2.3 2004/12/09 19:41:20
#include <ctype.h>
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
int inet_aton __P((const char *, struct in_addr *));

4
contrib/ipfilter/lib/kmem.c
View File

@ -30,10 +30,6 @@
#include "kmem.h"
#ifndef __STDC__
# define const
#endif
#if !defined(lint)
static const char sccsid[] = "@(#)kmem.c 1.4 1/12/96 (C) 1992 Darren Reed";
static const char rcsid[] = "@(#)$Id$";

4
contrib/ipfilter/lib/kmem.h
View File

@ -11,11 +11,7 @@
#define __KMEM_H__
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
extern int openkmem __P((char *, char *));
extern int kmemcpy __P((char *, long, int));

16
contrib/ipfilter/lib/verbose.c
View File

@ -8,24 +8,14 @@
* $Id$
*/
#if defined(__STDC__)
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#include <stdio.h>
#include "ipf.h"
#include "opts.h"
#if defined(__STDC__)
void verbose(int level, char *fmt, ...)
#else
void verbose(level, fmt, va_alist)
char *fmt;
va_dcl
#endif
{
va_list pvar;
@ -37,13 +27,7 @@ void verbose(level, fmt, va_alist)
}
#if defined(__STDC__)
void ipfkverbose(char *fmt, ...)
#else
void ipfkverbose(fmt, va_alist)
char *fmt;
va_dcl
#endif
{
va_list pvar;

4
contrib/ipfilter/md5.c
View File

@ -100,11 +100,7 @@ static unsigned char PADDING[64] = {
(a) += (b); \
}
#ifdef __STDC__
#define UL(x) x##U
#else
#define UL(x) x
#endif
/* The routine MD5Init initializes the message-digest context
mdContext. All fields are set to zero.

8
contrib/ipfilter/md5.h
View File

@ -42,15 +42,7 @@
#if !defined(__MD5_INCLUDE__) && !defined(_SYS_MD5_H)
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
#ifndef __STDC__
# undef const
# define const
#endif
/* typedef a 32-bit type */

4
contrib/ipfilter/opts.h
View File

@ -54,11 +54,7 @@
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
#if defined(sun) && !SOLARIS

12
sys/contrib/ipfilter/netinet/ip_compat.h
View File

@ -12,15 +12,7 @@
#define __IP_COMPAT_H__
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
#ifndef __STDC__
# undef const
# define const
#endif
#if defined(_KERNEL) || defined(KERNEL) || defined(__KERNEL__)
@ -63,11 +55,7 @@
#endif
# ifdef __STDC__
# define IPL_EXTERN(ep) ipl##ep
# else
# define IPL_EXTERN(ep) ipl/**/ep
# endif
/*
* This is a workaround for <sys/uio.h> troubles on FreeBSD and OpenBSD.

46
sys/contrib/ipfilter/netinet/ip_fil.h
View File

@ -31,14 +31,9 @@
#endif
#ifndef __P
# ifdef __STDC__
# define __P(x) x
# else
# define __P(x) ()
# endif
#endif
#if defined(__STDC__) || defined(__GNUC__)
# define SIOCADAFR _IOW('r', 60, struct ipfobj)
# define SIOCRMAFR _IOW('r', 61, struct ipfobj)
# define SIOCSETFF _IOW('r', 62, u_int)
@ -78,47 +73,6 @@
# define SIOCGTQTAB _IOWR('r', 96, struct ipfobj)
# define SIOCMATCHFLUSH _IOWR('r', 97, struct ipfobj)
# define SIOCIPFINTERROR _IOR('r', 98, int)
#else
# define SIOCADAFR _IOW(r, 60, struct ipfobj)
# define SIOCRMAFR _IOW(r, 61, struct ipfobj)
# define SIOCSETFF _IOW(r, 62, u_int)
# define SIOCGETFF _IOR(r, 63, u_int)
# define SIOCGETFS _IOWR(r, 64, struct ipfobj)
# define SIOCIPFFL _IOWR(r, 65, int)
# define SIOCIPFFB _IOR(r, 66, int)
# define SIOCADIFR _IOW(r, 67, struct ipfobj)
# define SIOCRMIFR _IOW(r, 68, struct ipfobj)
# define SIOCSWAPA _IOR(r, 69, u_int)
# define SIOCINAFR _IOW(r, 70, struct ipfobj)
# define SIOCINIFR _IOW(r, 71, struct ipfobj)
# define SIOCFRENB _IOW(r, 72, u_int)
# define SIOCFRSYN _IOW(r, 73, u_int)
# define SIOCFRZST _IOWR(r, 74, struct ipfobj)
# define SIOCZRLST _IOWR(r, 75, struct ipfobj)
# define SIOCAUTHW _IOWR(r, 76, struct ipfobj)
# define SIOCAUTHR _IOWR(r, 77, struct ipfobj)
# define SIOCSTAT1 _IOWR(r, 78, struct ipfobj)
# define SIOCSTLCK _IOWR(r, 79, u_int)
# define SIOCSTPUT _IOWR(r, 80, struct ipfobj)
# define SIOCSTGET _IOWR(r, 81, struct ipfobj)
# define SIOCSTGSZ _IOWR(r, 82, struct ipfobj)
# define SIOCSTAT2 _IOWR(r, 83, struct ipfobj)
# define SIOCSETLG _IOWR(r, 84, int)
# define SIOCGETLG _IOWR(r, 85, int)
# define SIOCFUNCL _IOWR(r, 86, struct ipfunc_resolve)
# define SIOCIPFGETNEXT _IOWR(r, 87, struct ipfobj)
# define SIOCIPFGET _IOWR(r, 88, struct ipfobj)
# define SIOCIPFSET _IOWR(r, 89, struct ipfobj)
# define SIOCIPFL6 _IOWR(r, 90, int)
# define SIOCIPFITER _IOWR(r, 91, struct ipfobj)
# define SIOCGENITER _IOWR(r, 92, struct ipfobj)
# define SIOCGTABL _IOWR(r, 93, struct ipfobj)
# define SIOCIPFDELTOK _IOWR(r, 94, int)
# define SIOCLOOKUPITER _IOWR(r, 95, struct ipfobj)
# define SIOCGTQTAB _IOWR(r, 96, struct ipfobj)
# define SIOCMATCHFLUSH _IOWR(r, 97, struct ipfobj)
# define SIOCIPFINTERROR _IOR(r, 98, int)
#endif
#define SIOCADDFR SIOCADAFR
#define SIOCDELFR SIOCRMAFR
#define SIOCINSFR SIOCINAFR

12
sys/contrib/ipfilter/netinet/ip_lookup.h
View File

@ -8,7 +8,6 @@
#ifndef __IP_LOOKUP_H__
#define __IP_LOOKUP_H__
#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
# define SIOCLOOKUPADDTABLE _IOWR('r', 60, struct iplookupop)
# define SIOCLOOKUPDELTABLE _IOWR('r', 61, struct iplookupop)
# define SIOCLOOKUPSTAT _IOWR('r', 64, struct iplookupop)
@ -18,17 +17,6 @@
# define SIOCLOOKUPADDNODEW _IOW('r', 67, struct iplookupop)
# define SIOCLOOKUPDELNODE _IOWR('r', 68, struct iplookupop)
# define SIOCLOOKUPDELNODEW _IOW('r', 68, struct iplookupop)
#else
# define SIOCLOOKUPADDTABLE _IOWR(r, 60, struct iplookupop)
# define SIOCLOOKUPDELTABLE _IOWR(r, 61, struct iplookupop)
# define SIOCLOOKUPSTAT _IOWR(r, 64, struct iplookupop)
# define SIOCLOOKUPSTATW _IOW(r, 64, struct iplookupop)
# define SIOCLOOKUPFLUSH _IOWR(r, 65, struct iplookupflush)
# define SIOCLOOKUPADDNODE _IOWR(r, 67, struct iplookupop)
# define SIOCLOOKUPADDNODEW _IOW(r, 67, struct iplookupop)
# define SIOCLOOKUPDELNODE _IOWR(r, 68, struct iplookupop)
# define SIOCLOOKUPDELNODEW _IOW(r, 68, struct iplookupop)
#endif
#define LOOKUP_POOL_MAX (IPL_LOGSIZE)
#define LOOKUP_POOL_SZ (IPL_LOGSIZE + 1)

8
sys/contrib/ipfilter/netinet/ip_nat.h
View File

@ -21,19 +21,11 @@
# endif
#endif
#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
#define SIOCADNAT _IOW('r', 60, struct ipfobj)
#define SIOCRMNAT _IOW('r', 61, struct ipfobj)
#define SIOCGNATS _IOWR('r', 62, struct ipfobj)
#define SIOCGNATL _IOWR('r', 63, struct ipfobj)
#define SIOCPURGENAT _IOWR('r', 100, struct ipfobj)
#else
#define SIOCADNAT _IOW(r, 60, struct ipfobj)
#define SIOCRMNAT _IOW(r, 61, struct ipfobj)
#define SIOCGNATS _IOWR(r, 62, struct ipfobj)
#define SIOCGNATL _IOWR(r, 63, struct ipfobj)
#define SIOCPURGENAT _IOWR(r, 100, struct ipfobj)
#endif
#undef LARGE_NAT /* define this if you're setting up a system to NAT
* LARGE numbers of networks/hosts - i.e. in the

4
sys/contrib/ipfilter/netinet/ip_proxy.h
View File

@ -20,11 +20,7 @@
# endif
#endif
#if defined(__STDC__) || defined(__GNUC__)
#define SIOCPROXY _IOWR('r', 64, struct ap_control)
#else
#define SIOCPROXY _IOWR(r, 64, struct ap_control)
#endif
#ifndef APR_LABELLEN
#define APR_LABELLEN 16

6
sys/contrib/ipfilter/netinet/ip_scan.h
View File

@ -25,15 +25,9 @@ struct ip;
struct ipstate;
#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
# define SIOCADSCA _IOWR('r', 60, struct ipscan *)
# define SIOCRMSCA _IOWR('r', 61, struct ipscan *)
# define SIOCGSCST _IOWR('r', 62, struct ipscan *)
#else
# define SIOCADSCA _IOWR(r, 60, struct ipscan *)
# define SIOCRMSCA _IOWR(r, 61, struct ipscan *)
# define SIOCGSCST _IOWR(r, 62, struct ipscan *)
#endif
struct action {
int act_val; /* what to do */

4
sys/contrib/ipfilter/netinet/ip_state.h
View File

@ -12,11 +12,7 @@
#ifndef __IP_STATE_H__
#define __IP_STATE_H__
#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
# define SIOCDELST _IOW('r', 61, struct ipfobj)
#else
# define SIOCDELST _IOW(r, 61, struct ipfobj)
#endif
struct ipscan;