mirror of
https://github.com/postgres/postgres.git
synced 2025-07-20 05:03:10 +03:00
Message editing: remove gratuitous variations in message wording, standardize
terms, add some clarifications, fix some untranslatable attempts at dynamic message building.
This commit is contained in:
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.51 2003/08/04 02:40:05 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.52 2003/09/25 06:58:04 petere 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 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 OID: \"%s\"",
|
||||
errmsg("invalid input syntax for type \"oid\": \"%s\"",
|
||||
s)));
|
||||
|
||||
if (errno == ERANGE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
|
||||
errmsg("%s is out of range for 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 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("%s is out of range for OID", s)));
|
||||
errmsg("value \"%s\" is out of range for type \"oid\"", s)));
|
||||
#endif
|
||||
|
||||
return result;
|
||||
|
Reference in New Issue
Block a user