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/mac.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/mac.c')
| -rw-r--r-- | src/backend/utils/adt/mac.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c index 01111e3c2fb..36ae41f9c71 100644 --- a/src/backend/utils/adt/mac.c +++ b/src/backend/utils/adt/mac.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.28 2003/05/13 18:03:07 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.29 2003/07/27 04:53:06 tgl Exp $ */ #include "postgres.h" @@ -60,12 +60,16 @@ macaddr_in(PG_FUNCTION_ARGS) count = sscanf(str, "%2x%2x%2x%2x%2x%2x%1s", &a, &b, &c, &d, &e, &f, junk); if (count != 6) - elog(ERROR, "macaddr_in: error in parsing \"%s\"", str); + ereport(ERROR, + (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), + errmsg("invalid input syntax for macaddr: \"%s\"", str))); if ((a < 0) || (a > 255) || (b < 0) || (b > 255) || (c < 0) || (c > 255) || (d < 0) || (d > 255) || (e < 0) || (e > 255) || (f < 0) || (f > 255)) - elog(ERROR, "macaddr_in: illegal address \"%s\"", str); + ereport(ERROR, + (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), + errmsg("invalid octet value in macaddr: \"%s\"", str))); result = (macaddr *) palloc(sizeof(macaddr)); @@ -181,7 +185,9 @@ text_macaddr(PG_FUNCTION_ARGS) len = (VARSIZE(addr) - VARHDRSZ); if (len >= sizeof(str)) - elog(ERROR, "Text is too long to convert to MAC address"); + ereport(ERROR, + (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), + errmsg("text too long to convert to MAC address"))); memcpy(str, VARDATA(addr), len); *(str + len) = '\0'; |