mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
Regex library is switched to use new ctype tools
to allow usage of many character sets at a time.
This commit is contained in:
parent
576c9b8167
commit
2eed406550
13 changed files with 126 additions and 100 deletions
|
|
@ -74,7 +74,7 @@ char *argv[];
|
|||
exit(status);
|
||||
}
|
||||
|
||||
err = regcomp(&re, argv[optind++], copts);
|
||||
err = regcomp(&re, argv[optind++], copts, default_charset_info);
|
||||
if (err) {
|
||||
len = regerror(err, &re, erbuf, sizeof(erbuf));
|
||||
fprintf(stderr, "error %s, %d/%d `%s'\n",
|
||||
|
|
@ -226,7 +226,7 @@ int opts; /* may not match f1 */
|
|||
strcpy(f0copy, f0);
|
||||
re.re_endp = (opts®_PEND) ? f0copy + strlen(f0copy) : NULL;
|
||||
fixstr(f0copy);
|
||||
err = regcomp(&re, f0copy, opts);
|
||||
err = regcomp(&re, f0copy, opts, default_charset_info);
|
||||
if (err != 0 && (!opt('C', f1) || err != efind(f2))) {
|
||||
/* unexpected error or wrong error */
|
||||
len = regerror(err, &re, erbuf, sizeof(erbuf));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue