aboutsummaryrefslogtreecommitdiff
path: root/httpd/patterns.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@esdenera.com>2015-07-16 21:06:14 +0200
committerReyk Floeter <reyk@esdenera.com>2015-07-16 21:06:14 +0200
commitc690aa7c2b56f7fb30f72222928b0f7563a1e7e1 (patch)
tree78a4b306da3389048c0948eb6155b50d0cfbc87e /httpd/patterns.c
parent5534dbfa66d3e3bf884fc09cd4e0ff296b6f7bdc (diff)
downloadhttpd-c690aa7c2b56f7fb30f72222928b0f7563a1e7e1.tar.gz
httpd-c690aa7c2b56f7fb30f72222928b0f7563a1e7e1.zip
sync with -current during c2k15
Diffstat (limited to 'httpd/patterns.c')
-rw-r--r--httpd/patterns.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/httpd/patterns.c b/httpd/patterns.c
index 3b2cbcc..27a813f 100644
--- a/httpd/patterns.c
+++ b/httpd/patterns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: patterns.c,v 1.2 2015/06/23 15:35:20 semarie Exp $ */
+/* $OpenBSD: patterns.c,v 1.3 2015/06/26 10:07:48 semarie Exp $ */
/*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -26,16 +26,16 @@
/*
* Derived from Lua 5.3.1:
- * $Id: patterns.c,v 1.2 2015/06/23 15:35:20 semarie Exp $
+ * $Id: patterns.c,v 1.3 2015/06/26 10:07:48 semarie Exp $
* Standard library for string operations and pattern-matching
*/
+#include <sys/types.h>
+#include <ctype.h>
+#include <errno.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <assert.h>
#include "patterns.h"
@@ -98,7 +98,7 @@ classend(struct match_state *ms, const char *p)
case L_ESC:
if (p == ms->p_end)
match_error(ms,
- "malformed pattern (ends with '%%')");
+ "malformed pattern (ends with '%')");
return p + 1;
case '[':
if (*p == '^')