diff options
| author |   henning <henning@openbsd.org> | 2016-07-19 13:34:12 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2016-07-19 13:34:12 +0000 |
| commit | bd2877f05a828bb9f12c0f6af0d721a03d473ef7 (patch) | |
| tree | 581cb0d87e958d42d3f6d6f998482dd4eea85493 | |
| parent | don't hide globals between function prototypes; ok phessler benno (diff) | |
| download | wireguard-openbsd-bd2877f05a828bb9f12c0f6af0d721a03d473ef7.tar.xz wireguard-openbsd-bd2877f05a828bb9f12c0f6af0d721a03d473ef7.zip | |
style: no spaces after # for define/include, ok phessler benno
| -rw-r--r-- | sys/net/pf_osfp.c | 33 | ||||
| -rw-r--r-- | sys/net/pf_ruleset.c | 26 |
2 files changed, 29 insertions, 30 deletions
diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c index 8df485c3ce4..84b7edb28c6 100644 --- a/sys/net/pf_osfp.c +++ b/sys/net/pf_osfp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_osfp.c,v 1.33 2016/04/04 16:26:00 sthen Exp $ */ +/* $OpenBSD: pf_osfp.c,v 1.34 2016/07/19 13:34:12 henning Exp $ */ /* * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org> @@ -20,7 +20,7 @@ #include <sys/param.h> #include <sys/socket.h> #ifdef _KERNEL -# include <sys/systm.h> +#include <sys/systm.h> #include <sys/pool.h> #endif /* _KERNEL */ #include <sys/queue.h> @@ -43,23 +43,22 @@ typedef struct pool pool_t; #else /* !_KERNEL */ /* Userland equivalents so we can lend code to tcpdump et al. */ -# include <arpa/inet.h> -# include <errno.h> -# include <stdio.h> -# include <stdlib.h> -# include <string.h> -# include <netdb.h> -# define pool_t int -# define pool_get(pool, flags) malloc(*(pool)) -# define pool_put(pool, item) free(item) -# define pool_init(pool, size, a, ao, f, m, p) (*(pool)) = (size) - -# ifdef PFDEBUG -# include <sys/stdarg.h> /* for DPFPRINTF() */ -# endif /* PFDEBUG */ +#include <arpa/inet.h> +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <netdb.h> +#define pool_t int +#define pool_get(pool, flags) malloc(*(pool)) +#define pool_put(pool, item) free(item) +#define pool_init(pool, size, a, ao, f, m, p) (*(pool)) = (size) -#endif /* _KERNEL */ +#ifdef PFDEBUG +#include <sys/stdarg.h> /* for DPFPRINTF() */ +#endif /* PFDEBUG */ +#endif /* _KERNEL */ SLIST_HEAD(pf_osfp_list, pf_os_fingerprint) pf_osfp_list; pool_t pf_osfp_entry_pl; diff --git a/sys/net/pf_ruleset.c b/sys/net/pf_ruleset.c index 9c13bb97860..31c2c89fb2c 100644 --- a/sys/net/pf_ruleset.c +++ b/sys/net/pf_ruleset.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ruleset.c,v 1.11 2016/01/15 02:37:12 mmcc Exp $ */ +/* $OpenBSD: pf_ruleset.c,v 1.12 2016/07/19 13:34:12 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -38,8 +38,8 @@ #include <sys/param.h> #include <sys/socket.h> #ifdef _KERNEL -# include <sys/systm.h> -# include <sys/mbuf.h> +#include <sys/systm.h> +#include <sys/mbuf.h> #endif /* _KERNEL */ #include <sys/syslog.h> @@ -62,17 +62,17 @@ #else /* !_KERNEL */ /* Userland equivalents so we can lend code to pfctl et al. */ -# include <arpa/inet.h> -# include <errno.h> -# include <stdio.h> -# include <stdlib.h> -# include <string.h> -# define rs_malloc(x) calloc(1, x) -# define rs_free(x) free(x) +#include <arpa/inet.h> +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#define rs_malloc(x) calloc(1, x) +#define rs_free(x) free(x) -# ifdef PFDEBUG -# include <sys/stdarg.h> /* for DPFPRINTF() */ -# endif /* PFDEBUG */ +#ifdef PFDEBUG +#include <sys/stdarg.h> /* for DPFPRINTF() */ +#endif /* PFDEBUG */ #endif /* _KERNEL */ |