diff options
| author | Neil Conway <neilc@samurai.com> | 2004-02-18 00:01:34 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2004-02-18 00:01:34 +0000 |
| commit | 4553e1d80f824291932cfde30aa24a76dd8f1941 (patch) | |
| tree | 7d2a16c2d7e11cd2fbb305b5b02b2c6d160e6dbc /src/backend/utils/adt/oid.c | |
| parent | afcc6fbb6034cd37aa518b29e5684df35c179ffa (diff) | |
| download | postgresql-4553e1d80f824291932cfde30aa24a76dd8f1941.tar.gz postgresql-4553e1d80f824291932cfde30aa24a76dd8f1941.zip | |
Improve the consistency of the error message emitted when rejecting
invalid input to the oid type. Also, remove some long-unused code
from adt/numutils.c
Diffstat (limited to 'src/backend/utils/adt/oid.c')
| -rw-r--r-- | src/backend/utils/adt/oid.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index a60f1f4cde6..c6a47d1bfd4 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/oid.c,v 1.53 2003/11/29 19:51:59 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/oid.c,v 1.54 2004/02/18 00:01:34 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -46,18 +46,18 @@ oidin_subr(const char *funcname, const char *s, char **endloc) if (errno && errno != ERANGE && errno != EINVAL) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type \"oid\": \"%s\"", + errmsg("invalid input syntax for type oid: \"%s\"", s))); if (endptr == s && *endptr) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type \"oid\": \"%s\"", + errmsg("invalid input syntax for type oid: \"%s\"", s))); if (errno == ERANGE) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("value \"%s\" is out of range for type \"oid\"", s))); + errmsg("value \"%s\" is out of range for type oid", s))); if (endloc) { @@ -72,7 +72,7 @@ oidin_subr(const char *funcname, const char *s, char **endloc) if (*endptr) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type \"oid\": \"%s\"", + errmsg("invalid input syntax for type oid: \"%s\"", s))); } @@ -95,7 +95,7 @@ oidin_subr(const char *funcname, const char *s, char **endloc) cvt != (unsigned long) ((int) result)) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("value \"%s\" is out of range for type \"oid\"", s))); + errmsg("value \"%s\" is out of range for type oid", s))); #endif return result; |