summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThorsten Lockert <tholo@cvs.openbsd.org>1997-04-30 05:51:11 +0000
committerThorsten Lockert <tholo@cvs.openbsd.org>1997-04-30 05:51:11 +0000
commitbc01de93f5674fd4eb6da04488dc317065ebd1c2 (patch)
tree89654d9f6d88c24c72dcc96071fa8d1990f92bb4 /lib
parentbc4562b97b0c5137d380b53bb53d3df521bd2557 (diff)
Remove dead code and variables
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/regex/regcomp.c22
-rw-r--r--lib/libc/regex/regexec.c4
2 files changed, 2 insertions, 24 deletions
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index e1aad4f4b57..8e8cc319f62 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94";
#else
-static char rcsid[] = "$OpenBSD: regcomp.c,v 1.4 1997/04/28 20:44:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: regcomp.c,v 1.5 1997/04/30 05:51:09 tholo Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -107,7 +107,6 @@ static int freezeset __P((struct parse *p, cset *cs));
static int firstch __P((struct parse *p, cset *cs));
static int nch __P((struct parse *p, cset *cs));
static void mcadd __P((struct parse *p, cset *cs, char *cp));
-static char *mcfind __P((cset *cs, char *cp));
static void mcinvert __P((struct parse *p, cset *cs));
static void mccase __P((struct parse *p, cset *cs));
static int isinsets __P((struct re_guts *g, int c));
@@ -1265,25 +1264,6 @@ register char *cp;
}
/*
- - mcfind - find a collating element in a cset
- == static char *mcfind(register cset *cs, register char *cp);
- */
-static char *
-mcfind(cs, cp)
-register cset *cs;
-register char *cp;
-{
- register char *p;
-
- if (cs->multis == NULL)
- return(NULL);
- for (p = cs->multis; *p != '\0'; p += strlen(p) + 1)
- if (strcmp(cp, p) == 0)
- return(p);
- return(NULL);
-}
-
-/*
- mcinvert - invert the list of collating elements in a cset
== static void mcinvert(register struct parse *p, register cset *cs);
*
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
index 2175e7c64b3..8b04cef5c78 100644
--- a/lib/libc/regex/regexec.c
+++ b/lib/libc/regex/regexec.c
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)regexec.c 8.3 (Berkeley) 3/20/94";
#else
-static char rcsid[] = "$OpenBSD: regexec.c,v 1.6 1997/04/28 20:45:01 millert Exp $";
+static char rcsid[] = "$OpenBSD: regexec.c,v 1.7 1997/04/30 05:51:10 tholo Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,8 +63,6 @@ static char rcsid[] = "$OpenBSD: regexec.c,v 1.6 1997/04/28 20:45:01 millert Exp
#include "utils.h"
#include "regex2.h"
-static int nope = 0; /* for use in asserts; shuts lint up */
-
/* macros for manipulating states, small version */
#define states long
#define states1 states /* for later use in regexec() decision */