← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mysql-5.1/maverick-proposed

« back to all changes in this revision

Viewing changes to regex/regexec.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 14:16:05 UTC
  • mto: This revision was merged to the branch mainline in revision 20.
  • Revision ID: package-import@ubuntu.com-20120222141605-nxlu9yzc6attylc2
Tags: upstream-5.1.61
Import upstream version 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
regex/regexec.c
117
117
my_regmatch_t pmatch[];
118
118
int eflags;
119
119
{
 
120
        char *pstr = (char *) str;
120
121
        register struct re_guts *g = preg->re_g;
121
122
#ifdef REDEBUG
122
123
#       define  GOODFLAGS(f)    (f)
133
134
 
134
135
        if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) &&
135
136
            !(eflags&REG_LARGE))
136
 
                return(smatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags));
 
137
                return(smatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
137
138
        else
138
 
                return(lmatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags));
 
139
                return(lmatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
139
140
}