summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:09:27 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-23 17:09:27 -0300
commit97c3182312568d856e040f8d788f1ee0291717c1 (patch)
tree541cfc3d5f16c89cdcacdc7babd0c0fdf9de16a0 /regex
parentf31c0483217ba1de24c1e0bfb1c0c8009006cf4d (diff)
downloadmariadb-git-97c3182312568d856e040f8d788f1ee0291717c1.tar.gz
WL#5498: Remove dead and unused source code
Remove code that has been disabled for a long time.
Diffstat (limited to 'regex')
-rw-r--r--regex/regcomp.c60
-rw-r--r--regex/regcomp.ih5
2 files changed, 0 insertions, 65 deletions
diff --git a/regex/regcomp.c b/regex/regcomp.c
index 81c435ed552..812cdd115d1 100644
--- a/regex/regcomp.c
+++ b/regex/regcomp.c
@@ -1228,66 +1228,6 @@ register char *cp;
}
#endif
-#ifdef NOT_USED
-/*
- - mcsub - subtract a collating element from a cset
- == static void mcsub(register cset *cs, register char *cp);
- */
-static void
-mcsub(cs, cp)
-register cset *cs;
-register char *cp;
-{
- register char *fp = mcfind(cs, cp);
- register size_t len = strlen(fp);
-
- assert(fp != NULL);
- (void) memmove(fp, fp + len + 1,
- cs->smultis - (fp + len + 1 - cs->multis));
- cs->smultis -= len;
-
- if (cs->smultis == 0) {
- free(cs->multis);
- cs->multis = NULL;
- return;
- }
-
- cs->multis = realloc(cs->multis, cs->smultis);
- assert(cs->multis != NULL);
-}
-
-/*
- - mcin - is a collating element in a cset?
- == static int mcin(register cset *cs, register char *cp);
- */
-static int
-mcin(cs, cp)
-register cset *cs;
-register char *cp;
-{
- return(mcfind(cs, cp) != NULL);
-}
-
-/*
- - 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);
-}
-#endif
-
/*
- mcinvert - invert the list of collating elements in a cset
== static void mcinvert(register struct parse *p, register cset *cs);
diff --git a/regex/regcomp.ih b/regex/regcomp.ih
index 5deba89217a..cb93286e32f 100644
--- a/regex/regcomp.ih
+++ b/regex/regcomp.ih
@@ -30,11 +30,6 @@ static int nch(register struct parse *p, register cset *cs);
#ifdef USE_ORIG_REGEX_CODE
static void mcadd(register struct parse *p, register cset *cs, register char *cp);
#endif
-#ifdef NOT_USED
-static void mcsub(register cset *cs, register char *cp);
-static int mcin(register cset *cs, register char *cp);
-static char *mcfind(register cset *cs, register char *cp);
-#endif
static void mcinvert(register struct parse *p, register cset *cs);
static void mccase(register struct parse *p, register cset *cs);
static int isinsets(register struct re_guts *g, int c);