From 9c957736447868d64837681f9aa713c2ae59af22 Mon Sep 17 00:00:00 2001 From: guenther Date: Fri, 26 Aug 2016 06:06:58 +0000 Subject: [PATCH] Add for time(); sort <*.h> includes ok deraadt@ --- sbin/pfctl/parse.y | 4 ++-- sbin/pfctl/pfctl_parser.c | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 9c0827c4747..e2eae6c4926 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.654 2016/07/18 15:21:33 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.655 2016/08/26 06:06:58 guenther Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -655,7 +655,7 @@ option : SET REASSEMBLE yesno optnodf { } | SET DEBUG DEBUG { if (pfctl_set_debug(pf, "debug") != 0) { - yyerror("error setting debuglevel debug"); + yyerror("error setting debuglevel %s", "debug"); YYERROR; } } diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 1deaa839dfa..31e82ef5a51 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.306 2015/09/03 12:46:47 mikeb Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.307 2016/08/26 06:06:58 guenther Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -44,17 +44,18 @@ #include #include -#include -#include -#include #include -#include -#include -#include #include +#include #include -#include #include +#include +#include +#include +#include +#include +#include +#include #define SYSLOG_NAMES #include -- 2.20.1