aboutsummaryrefslogtreecommitdiff
path: root/lib/libc/regex
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-12-05 03:18:48 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-12-05 03:18:48 +0000
commit4afa7dd61a3a1454a5b3cf5e6de2029c7e2d9a84 (patch)
tree377fe6bf1ffb48dcc46ce29ba7f2aa98635eb96b /lib/libc/regex
parent6b986646d434baa21ae3d74d6a662ad206c7ddbd (diff)
downloadsrc-4afa7dd61a3a1454a5b3cf5e6de2029c7e2d9a84.tar.gz
src-4afa7dd61a3a1454a5b3cf5e6de2029c7e2d9a84.zip
libc: regex: retire internal EMPTBR ("Empty branch present")
It was realized just a little too late that this was a hack that belonged in individual regex(3)-using applications. It was surrounded in NOTYET and not implemented in the engine, so remove it.
Notes
Notes: svn path=/head/; revision=368359
Diffstat (limited to 'lib/libc/regex')
-rw-r--r--lib/libc/regex/regcomp.c6
-rw-r--r--lib/libc/regex/regex2.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index 0eb4b4430996..076b9c525a65 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -691,15 +691,9 @@ static bool
p_branch_empty(struct parse *p, struct branchc *bc)
{
-#if defined(LIBREGEX) && defined(NOTYET)
- if (bc->outer)
- p->g->iflags |= EMPTBR;
- return (true);
-#else
(void)bc;
SETERROR(REG_EMPTY);
return (false);
-#endif
}
/*
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
index 012823d3261a..38bbed90fd8f 100644
--- a/lib/libc/regex/regex2.h
+++ b/lib/libc/regex/regex2.h
@@ -186,7 +186,6 @@ struct re_guts {
# define USEBOL 01 /* used ^ */
# define USEEOL 02 /* used $ */
# define BAD 04 /* something wrong */
-# define EMPTBR 010 /* empty branch present */
int nbol; /* number of ^ used */
int neol; /* number of $ used */
char *must; /* match must contain this string */