summaryrefslogtreecommitdiffstats
path: root/lib/libc/regex/regex2.h
diff options
context:
space:
mode:
authortb <tb@openbsd.org>2020-12-30 08:54:42 +0000
committertb <tb@openbsd.org>2020-12-30 08:54:42 +0000
commit226353c69d0469beecbdb0d6dfdf1391930fe196 (patch)
tree794dede227081df8831498aa94f684b777d34177 /lib/libc/regex/regex2.h
parentConstify the strings in cnames[]. No functional change. (diff)
downloadwireguard-openbsd-226353c69d0469beecbdb0d6dfdf1391930fe196.tar.xz
wireguard-openbsd-226353c69d0469beecbdb0d6dfdf1391930fe196.zip
cclasses[] multis field is always an empty string. Remove it and code
dealing with it. This code was incomplete anyway. from miod, ok millert
Diffstat (limited to 'lib/libc/regex/regex2.h')
-rw-r--r--lib/libc/regex/regex2.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index 7484ba26b5a..4098c94a41b 100644
--- a/lib/libc/regex/regex2.h
+++ b/lib/libc/regex/regex2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: regex2.h,v 1.8 2013/04/17 17:39:29 tedu Exp $ */
+/* $OpenBSD: regex2.h,v 1.9 2020/12/30 08:54:42 tb Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -106,16 +106,11 @@ typedef struct {
uch *ptr; /* -> uch [csetsize] */
uch mask; /* bit within array */
uch hash; /* hash code */
- size_t smultis;
- char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */
} cset;
/* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
#define CHadd(cs, c) ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c))
#define CHsub(cs, c) ((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (c))
#define CHIN(cs, c) ((cs)->ptr[(uch)(c)] & (cs)->mask)
-#define MCadd(p, cs, cp) mcadd(p, cs, cp) /* regcomp() internal fns */
-#define MCsub(p, cs, cp) mcsub(p, cs, cp)
-#define MCin(p, cs, cp) mcin(p, cs, cp)
/* stuff for character categories */
typedef unsigned char cat_t;