diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-27 04:53:12 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-27 04:53:12 +0000 |
| commit | b6a1d25b0aa179c86e0607d4c0c3b647dc5bbb87 (patch) | |
| tree | 7881c788c3f659b45eb371c0e40fbaf188051cb0 /src/backend/utils/adt/regexp.c | |
| parent | 524cfad23f31db70a23fc1fe748c050838d5fad0 (diff) | |
| download | postgresql-b6a1d25b0aa179c86e0607d4c0c3b647dc5bbb87.tar.gz postgresql-b6a1d25b0aa179c86e0607d4c0c3b647dc5bbb87.zip | |
Error message editing in utils/adt. Again thanks to Joe Conway for doing
the bulk of the heavy lifting ...
Diffstat (limited to 'src/backend/utils/adt/regexp.c')
| -rw-r--r-- | src/backend/utils/adt/regexp.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 56f78422bcc..88533086632 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.45 2003/02/06 20:25:33 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.46 2003/07/27 04:53:08 tgl Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -171,7 +171,9 @@ RE_compile_and_execute(text *text_re, unsigned char *dat, int dat_len, pg_regerror(regcomp_result, &re_temp.cre_re, errMsg, sizeof(errMsg)); /* XXX should we pg_regfree here? */ - elog(ERROR, "Invalid regular expression: %s", errMsg); + ereport(ERROR, + (errcode(ERRCODE_INVALID_REGULAR_EXPRESSION), + errmsg("invalid regular expression: %s", errMsg))); } /* @@ -182,7 +184,9 @@ RE_compile_and_execute(text *text_re, unsigned char *dat, int dat_len, if (re_temp.cre_pat == NULL) { pg_regfree(&re_temp.cre_re); - elog(ERROR, "Out of memory"); + ereport(ERROR, + (errcode(ERRCODE_OUT_OF_MEMORY), + errmsg("out of memory"))); } memcpy(re_temp.cre_pat, text_re, text_re_len); re_temp.cre_flags = cflags; @@ -450,7 +454,10 @@ similar_escape(PG_FUNCTION_ARGS) if (elen == 0) e = NULL; /* no escape character */ else if (elen != 1) - elog(ERROR, "ESCAPE string must be empty or one character"); + ereport(ERROR, + (errcode(ERRCODE_INVALID_ESCAPE_SEQUENCE), + errmsg("invalid escape string"), + errhint("Escape string must be empty or one character."))); } /* We need room for ^, $, and up to 2 output bytes per input byte */ |