diff options
| author | Sebastian Benoit <benno@cvs.openbsd.org> | 2019-01-30 12:17:03 +0000 |
|---|---|---|
| committer | Sebastian Benoit <benno@cvs.openbsd.org> | 2019-01-30 12:17:03 +0000 |
| commit | 59fadfb12396bd0849fadc7a316825905a1e0df7 (patch) | |
| tree | bcda4e225650ffdf36e326e8f931d8ac118fea81 /sbin | |
| parent | 5f2ba40db37067bae572b2cb8f35f9f8ebd38d76 (diff) | |
remove not needed includes in uw_parse.y
add some to unwind.h
clean up some whitespace.
ok florian@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/unwind/unwind.h | 7 | ||||
| -rw-r--r-- | sbin/unwind/uw_parse.y | 21 |
2 files changed, 10 insertions, 18 deletions
diff --git a/sbin/unwind/unwind.h b/sbin/unwind/unwind.h index 887db4b46ab..2ee967fde81 100644 --- a/sbin/unwind/unwind.h +++ b/sbin/unwind/unwind.h @@ -1,4 +1,4 @@ -/* $OpenBSD: unwind.h,v 1.4 2019/01/29 15:37:29 florian Exp $ */ +/* $OpenBSD: unwind.h,v 1.5 2019/01/30 12:17:02 benno Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -18,6 +18,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include <event.h> +#include <imsg.h> +#include <stdint.h> + #ifndef nitems #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0])) #endif diff --git a/sbin/unwind/uw_parse.y b/sbin/unwind/uw_parse.y index 7bc40580581..a6e8b3c01d0 100644 --- a/sbin/unwind/uw_parse.y +++ b/sbin/unwind/uw_parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: uw_parse.y,v 1.6 2019/01/29 21:34:37 benno Exp $ */ +/* $OpenBSD: uw_parse.y,v 1.7 2019/01/30 12:17:02 benno Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -23,32 +23,22 @@ */ %{ -#include <sys/types.h> #include <sys/queue.h> -#include <sys/socket.h> #include <sys/stat.h> - -#include <netinet/in.h> -#include <net/if.h> - -#include <arpa/inet.h> +#include <sys/types.h> #include <ctype.h> #include <err.h> #include <errno.h> -#include <event.h> -#include <ifaddrs.h> -#include <imsg.h> #include <limits.h> #include <stdarg.h> +#include <stdint.h> #include <stdio.h> -#include <string.h> #include <syslog.h> #include <unistd.h> #include "uw_log.h" #include "unwind.h" -#include "frontend.h" TAILQ_HEAD(files, file) files = TAILQ_HEAD_INITIALIZER(files); static struct file { @@ -88,10 +78,9 @@ struct sym { int symset(const char *, const char *, int); char *symget(const char *); - void clear_config(struct unwind_conf *xconf); -static struct unwind_conf *conf; +static struct unwind_conf *conf; static int errors; static struct unwind_forwarder *unwind_forwarder; @@ -217,7 +206,6 @@ forwarderoptsl : STRING { } | STRING PORT NUMBER { int ret; - if ($3 <= 0 || $3 > (int)USHRT_MAX) { yyerror("invalid port: %lld", $3); free($1); @@ -263,7 +251,6 @@ forwarderoptsl : STRING { } | STRING PORT NUMBER DOT { int ret; - if ($3 <= 0 || $3 > (int)USHRT_MAX) { yyerror("invalid port: %lld", $3); free($1); |