Change [_Py_]re_compile_pattern() to return a char*.

Since it only returns an error message (or NULL) there's no reason
for it to be unsigned char *, and various compilers like this better.
This commit is contained in:
Guido van Rossum 1997-09-03 00:47:36 +00:00
parent 5ade084902
commit d19c04a88e
3 changed files with 12 additions and 12 deletions

View file

@ -1157,7 +1157,7 @@ else \
} \
}
unsigned char *re_compile_pattern(unsigned char *regex, int size, regexp_t bufp)
char *re_compile_pattern(unsigned char *regex, int size, regexp_t bufp)
{
int a;
int pos;
@ -1535,36 +1535,36 @@ unsigned char *re_compile_pattern(unsigned char *regex, int size, regexp_t bufp)
STORE(Cend);
SET_FIELDS;
if(!re_optimize(bufp))
return (unsigned char *)"Optimization error";
return "Optimization error";
return NULL;
op_error:
SET_FIELDS;
return (unsigned char *)"Badly placed special character";
return "Badly placed special character";
bad_match_register:
SET_FIELDS;
return (unsigned char *)"Bad match register number";
return "Bad match register number";
hex_error:
SET_FIELDS;
return (unsigned char *)"Bad hexadecimal number";
return "Bad hexadecimal number";
parenthesis_error:
SET_FIELDS;
return (unsigned char *)"Badly placed parenthesis";
return "Badly placed parenthesis";
out_of_memory:
SET_FIELDS;
return (unsigned char *)"Out of memory";
return "Out of memory";
ends_prematurely:
SET_FIELDS;
return (unsigned char *)"Regular expression ends prematurely";
return "Regular expression ends prematurely";
too_complex:
SET_FIELDS;
return (unsigned char *)"Regular expression too complex";
return "Regular expression too complex";
}
#undef CHARAT