summaryrefslogtreecommitdiffstats
path: root/lib/libc/regex/regex2.h
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2020-12-31 17:20:19 +0000
committermillert <millert@openbsd.org>2020-12-31 17:20:19 +0000
commita2944cb5a4ff13fc12aa4ee37f0a8f9375025a65 (patch)
tree9b8d56ebcb179fa4c2865b99c02bc1466dc68fb8 /lib/libc/regex/regex2.h
parentoops, this was installing the smaller bsd.rd, which would be replaced (diff)
downloadwireguard-openbsd-a2944cb5a4ff13fc12aa4ee37f0a8f9375025a65.tar.xz
wireguard-openbsd-a2944cb5a4ff13fc12aa4ee37f0a8f9375025a65.zip
Remove unused categories in re_guts; they are written to but never read.
From miod@, OK tb@
Diffstat (limited to 'lib/libc/regex/regex2.h')
-rw-r--r--lib/libc/regex/regex2.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index 4098c94a41b..7f8f73ad842 100644
--- a/lib/libc/regex/regex2.h
+++ b/lib/libc/regex/regex2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: regex2.h,v 1.9 2020/12/30 08:54:42 tb Exp $ */
+/* $OpenBSD: regex2.h,v 1.10 2020/12/31 17:20:19 millert Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -112,9 +112,6 @@ typedef struct {
#define CHsub(cs, c) ((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (c))
#define CHIN(cs, c) ((cs)->ptr[(uch)(c)] & (cs)->mask)
-/* stuff for character categories */
-typedef unsigned char cat_t;
-
/*
* main compiled-expression structure
*/
@@ -136,15 +133,11 @@ struct re_guts {
# define BAD 04 /* something wrong */
int nbol; /* number of ^ used */
int neol; /* number of $ used */
- int ncategories; /* how many character categories */
- cat_t *categories; /* ->catspace[-CHAR_MIN] */
char *must; /* match must contain this string */
int mlen; /* length of must */
size_t nsub; /* copy of re_nsub */
int backrefs; /* does it use back references? */
sopno nplus; /* how deep does it nest +s? */
- /* catspace must be last */
- cat_t catspace[NC]; /* actually [NC] */
};
/* misc utilities */