diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-03-19 22:27:46 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-03-19 22:27:46 +0000 |
| commit | 184fb14b90cca9e65702f8776de6cfc256b80e15 (patch) | |
| tree | 23170d6a8e3fdcd1a40accd5bfd6deed97a80e70 /src/backend/regex/regerror.c | |
| parent | c41536ea5677a7bddb7534e009036d4b1de29306 (diff) | |
| download | postgresql-184fb14b90cca9e65702f8776de6cfc256b80e15.tar.gz postgresql-184fb14b90cca9e65702f8776de6cfc256b80e15.zip | |
Make regular-expression error messages a tad less obscure,
per gripe from Josh Berkus.
Diffstat (limited to 'src/backend/regex/regerror.c')
| -rw-r--r-- | src/backend/regex/regerror.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index b9b7ada2508..5ed1f9f9752 100644 --- a/src/backend/regex/regerror.c +++ b/src/backend/regex/regerror.c @@ -59,10 +59,11 @@ static struct rerr { { - REG_NOMATCH, "REG_NOMATCH", "regexec() failed to match" + /* NOMATCH is not really an error condition, it just says no match */ + REG_NOMATCH, "REG_NOMATCH", "no pattern match found" }, { - REG_BADPAT, "REG_BADPAT", "invalid regular expression" + REG_BADPAT, "REG_BADPAT", "invalid regex struct" }, { REG_ECOLLATE, "REG_ECOLLATE", "invalid collating element" @@ -77,28 +78,28 @@ static struct rerr REG_ESUBREG, "REG_ESUBREG", "invalid backreference number" }, { - REG_EBRACK, "REG_EBRACK", "brackets ([ ]) not balanced" + REG_EBRACK, "REG_EBRACK", "brackets [ ] not balanced" }, { - REG_EPAREN, "REG_EPAREN", "parentheses not balanced" + REG_EPAREN, "REG_EPAREN", "parentheses ( ) not balanced" }, { - REG_EBRACE, "REG_EBRACE", "braces not balanced" + REG_EBRACE, "REG_EBRACE", "braces { } not balanced" }, { - REG_BADBR, "REG_BADBR", "invalid repetition count(s)" + REG_BADBR, "REG_BADBR", "invalid repetition count(s) in { }" }, { - REG_ERANGE, "REG_ERANGE", "invalid character range" + REG_ERANGE, "REG_ERANGE", "invalid character range in [ ]" }, { - REG_ESPACE, "REG_ESPACE", "out of memory" + REG_ESPACE, "REG_ESPACE", "ran out of memory" }, { - REG_BADRPT, "REG_BADRPT", "repetition-operator operand invalid" + REG_BADRPT, "REG_BADRPT", "?, *, or + operand invalid" }, { - REG_EMPTY, "REG_EMPTY", "empty (sub)expression" + REG_EMPTY, "REG_EMPTY", "empty expression or subexpression" }, { REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug" |