diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 20:51:34 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 20:51:34 -0200 |
| commit | 7af5094208edac1dd3af9ba2883f3c91264fbf6a (patch) | |
| tree | 89c69aad253aa731dde00030a149eadbd82193ad /regex | |
| parent | 9be9ad7b05590c3dc1ec432256f41924efa5ada0 (diff) | |
| parent | 1040f98ccffccbed8d1e95fe8252e402b8ee4e3f (diff) | |
| download | mariadb-git-7af5094208edac1dd3af9ba2883f3c91264fbf6a.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'regex')
| -rw-r--r-- | regex/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regex/main.c b/regex/main.c index fa97ca89047..f5b591907cf 100644 --- a/regex/main.c +++ b/regex/main.c @@ -17,8 +17,8 @@ regoff_t startoff = 0; regoff_t endoff = 0; -extern int split(); -extern void regprint(); +extern int split(char *string, char *fields[], int nfields, char *sep); +extern void regprint(my_regex_t *r, FILE *d); /* - main - do the simple case, hand off to regress() for regression @@ -145,7 +145,7 @@ FILE *in; inbuf[strlen(inbuf)-1] = '\0'; /* get rid of stupid \n */ if (debug) fprintf(stdout, "%d:\n", line); - nf = split(inbuf, f, MAXF, "\t\t"); + nf = split(inbuf, f, MAXF, (char*) "\t\t"); if (nf < 3) { fprintf(stderr, "bad input, line %d\n", line); exit(1); @@ -288,7 +288,7 @@ int opts; /* may not match f1 */ for (i = 1; i < NSHOULD; i++) should[i] = NULL; - nshould = split(f4, should+1, NSHOULD-1, ","); + nshould = split(f4, should+1, NSHOULD-1, (char*) ","); if (nshould == 0) { nshould = 1; should[1] = (char*) ""; |