diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2017-01-18 16:08:20 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2017-01-18 16:08:20 -0300 |
| commit | 9a34123bc315e55b33038464422ef1cd2b67dab2 (patch) | |
| tree | 9b1e2e9189e7b60e7eb2876e365c5a950a6aa228 /src/backend/utils/adt/oid.c | |
| parent | 716c7d4b242f0a64ad8ac4dc48c6fed6557ba12c (diff) | |
Make messages mentioning type names more uniform
This avoids additional translatable strings for each distinct type, as
well as making our quoting style around type names more consistent
(namely, that we don't quote type names). This continues what started
as f402b9950120.
Discussion: https://postgr.es/m/20160401170642.GA57509@alvherre.pgsql
Diffstat (limited to 'src/backend/utils/adt/oid.c')
| -rw-r--r-- | src/backend/utils/adt/oid.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index b0478f78bd4..12ef783b3fc 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -41,8 +41,8 @@ oidin_subr(const char *s, char **endloc) if (*s == '\0') ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type oid: \"%s\"", - s))); + errmsg("invalid input syntax for type %s: \"%s\"", + "oid", s))); errno = 0; cvt = strtoul(s, &endptr, 10); @@ -55,19 +55,20 @@ oidin_subr(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\"", - s))); + errmsg("invalid input syntax for type %s: \"%s\"", + "oid", s))); if (endptr == s && *s != '\0') ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type oid: \"%s\"", - s))); + errmsg("invalid input syntax for type %s: \"%s\"", + "oid", 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 %s", + s, "oid"))); if (endloc) { @@ -82,8 +83,8 @@ oidin_subr(const char *s, char **endloc) if (*endptr) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for type oid: \"%s\"", - s))); + errmsg("invalid input syntax for type %s: \"%s\"", + "oid", s))); } result = (Oid) cvt; @@ -105,7 +106,8 @@ oidin_subr(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 %s", + s, "oid"))); #endif return result; |