diff options
Diffstat (limited to 'src/backend/utils')
36 files changed, 424 insertions, 428 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 05cc2ec8b6a..49bb877eaa2 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.98 2003/09/15 20:03:37 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.99 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -187,14 +187,14 @@ aclparse(const char *s, AclItem *aip) else if (strcmp(name, ACL_IDTYPE_UID_KEYWORD) != 0) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("unrecognized keyword: \"%s\"", name), - errhint("ACL keyword must be \"group\" or \"user\"."))); + errmsg("unrecognized key word: \"%s\"", name), + errhint("ACL key word must be \"group\" or \"user\"."))); s = getid(s, name); /* move s to the name beyond the keyword */ if (name[0] == '\0') ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), errmsg("missing name"), - errhint("A name must follow the [group|user] keyword."))); + errhint("A name must follow the \"group\" or \"user\" key word."))); } if (name[0] == '\0') idtype = ACL_IDTYPE_WORLD; @@ -288,7 +288,7 @@ aclparse(const char *s, AclItem *aip) aip->ai_grantor = BOOTSTRAP_USESYSID; ereport(WARNING, (errcode(ERRCODE_INVALID_GRANTOR), - errmsg("defaulting grantor to %u", BOOTSTRAP_USESYSID))); + errmsg("defaulting grantor to user ID %u", BOOTSTRAP_USESYSID))); } ACLITEM_SET_PRIVS_IDTYPE(*aip, privs, goption, idtype); diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c index 31e11aedb37..2397a2b2cfd 100644 --- a/src/backend/utils/adt/array_userfuncs.c +++ b/src/backend/utils/adt/array_userfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2003, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.10 2003/09/15 20:03:37 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.11 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -351,7 +351,7 @@ create_singleton_array(FunctionCallInfo fcinfo, if (element_type == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid array element type: %u", element_type))); + errmsg("invalid array element type OID: %u", element_type))); if (ndims < 1) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), @@ -359,8 +359,8 @@ create_singleton_array(FunctionCallInfo fcinfo, if (ndims > MAXDIM) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("number of array dimensions exceeds the maximum allowed, %d", - MAXDIM))); + errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)", + ndims, MAXDIM))); dvalues[0] = element; diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 46f7881d648..e55d1b76872 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.99 2003/08/17 19:58:05 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.100 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -209,8 +209,8 @@ array_in(PG_FUNCTION_ARGS) if (ndim >= MAXDIM) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("number of array dimensions exceeds the maximum allowed, %d", - MAXDIM))); + errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)", + ndim, MAXDIM))); for (q = p; isdigit((unsigned char) *q); q++); if (q == p) /* no digits? */ @@ -375,8 +375,8 @@ ArrayCount(char *str, int *dim, char typdelim) if (nest_level >= MAXDIM) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("number of array dimensions exceeds the maximum allowed, %d", - MAXDIM))); + errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)", + nest_level, MAXDIM))); temp[nest_level] = 0; nest_level++; if (ndim < nest_level) @@ -894,8 +894,8 @@ array_recv(PG_FUNCTION_ARGS) if (ndim > MAXDIM) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("number of array dimensions exceeds the maximum allowed, %d", - MAXDIM))); + errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)", + ndim, MAXDIM))); flags = pq_getmsgint(buf, 4); if (flags != 0) @@ -2132,7 +2132,7 @@ array_map(FunctionCallInfo fcinfo, Oid inpType, Oid retType) if (fcinfo->isnull) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("NULL array elements not supported"))); + errmsg("null array elements not supported"))); /* Ensure data is not toasted */ if (typlen == -1) @@ -2234,8 +2234,8 @@ construct_md_array(Datum *elems, if (ndims > MAXDIM) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("number of array dimensions exceeds the maximum allowed, %d", - MAXDIM))); + errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)", + ndims, MAXDIM))); /* fast track for empty array */ if (ndims == 0) @@ -3028,7 +3028,7 @@ accumArrayResult(ArrayBuildState *astate, if (disnull) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("NULL array elements not supported"))); + errmsg("null array elements not supported"))); /* Use datumCopy to ensure pass-by-ref stuff is copied into mcontext */ astate->dvalues[astate->nelems++] = diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c index a61e8d42331..8aed5b6f046 100644 --- a/src/backend/utils/adt/bool.c +++ b/src/backend/utils/adt/bool.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.29 2003/08/04 02:40:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.30 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -77,7 +77,7 @@ boolin(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for boolean: \"%s\"", b))); + errmsg("invalid input syntax for type boolean: \"%s\"", b))); /* not reached */ PG_RETURN_BOOL(false); diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index c4fc14134f0..e5691ad7628 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -9,7 +9,7 @@ * workings can be found in the book "Software Solutions in C" by * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.60 2003/08/17 19:58:05 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.61 2003/09/25 06:58:03 petere Exp $ */ #include "postgres.h" @@ -195,7 +195,7 @@ cash_in(PG_FUNCTION_ARGS) if (*s != '\0') ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for money: \"%s\"", str))); + errmsg("invalid input syntax for type money: \"%s\"", str))); result = (value * sgn); diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 60583fed7a6..49ef50d21c4 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.91 2003/08/27 23:29:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.92 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -84,7 +84,7 @@ date_in(PG_FUNCTION_ARGS) case DTK_CURRENT: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("\"current\" is no longer supported"))); + errmsg("date/time value \"current\" is no longer supported"))); GetCurrentDateTime(tm); break; @@ -524,7 +524,7 @@ text_date(PG_FUNCTION_ARGS) if (VARSIZE(str) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - errmsg("invalid input syntax for date: \"%s\"", + errmsg("invalid input syntax for type date: \"%s\"", VARDATA(str)))); sp = VARDATA(str); @@ -1252,7 +1252,7 @@ text_time(PG_FUNCTION_ARGS) if (VARSIZE(str) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - errmsg("invalid input syntax for time: \"%s\"", + errmsg("invalid input syntax for type time: \"%s\"", VARDATA(str)))); sp = VARDATA(str); @@ -1286,7 +1286,7 @@ time_part(PG_FUNCTION_ARGS) if (VARSIZE(units) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("TIME units \"%s\" not recognized", + errmsg("\"time\" units \"%s\" not recognized", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(units)))))); @@ -1356,7 +1356,7 @@ time_part(PG_FUNCTION_ARGS) default: ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("TIME units \"%s\" not recognized", + errmsg("\"time\" units \"%s\" not recognized", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(units)))))); @@ -1375,7 +1375,7 @@ time_part(PG_FUNCTION_ARGS) { ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("TIME units \"%s\" not recognized", + errmsg("\"time\" units \"%s\" not recognized", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(units)))))); result = 0; @@ -2015,7 +2015,7 @@ text_timetz(PG_FUNCTION_ARGS) if (VARSIZE(str) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - errmsg("invalid input syntax for time with time zone: \"%s\"", + errmsg("invalid input syntax for type time with time zone: \"%s\"", VARDATA(str)))); sp = VARDATA(str); @@ -2049,7 +2049,7 @@ timetz_part(PG_FUNCTION_ARGS) if (VARSIZE(units) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("TIMETZ units \"%s\" not recognized", + errmsg("\"time with time zone\" units \"%s\" not recognized", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(units)))))); @@ -2133,7 +2133,7 @@ timetz_part(PG_FUNCTION_ARGS) default: ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("TIMETZ units \"%s\" not recognized", + errmsg("\"time with time zone\" units \"%s\" not recognized", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(units)))))); @@ -2152,7 +2152,7 @@ timetz_part(PG_FUNCTION_ARGS) { ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("TIMETZ units \"%s\" not recognized", + errmsg("\"time with time zone\" units \"%s\" not recognized", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(units)))))); @@ -2241,7 +2241,7 @@ timetz_izone(PG_FUNCTION_ARGS) if (zone->month != 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("INTERVAL time zone \"%s\" not legal", + errmsg("\"interval\" time zone \"%s\" not legal", DatumGetCString(DirectFunctionCall1(interval_out, PointerGetDatum(zone)))))); diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index ac7f9dda54a..6471f648f30 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.117 2003/09/13 21:12:38 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.118 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1305,7 +1305,7 @@ DecodeDateTime(char **field, int *ftype, int nf, case DTK_CURRENT: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("\"current\" is no longer supported"))); + errmsg("date/time value \"current\" is no longer supported"))); return DTERR_BAD_FORMAT; break; @@ -2056,7 +2056,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf, case DTK_CURRENT: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("\"current\" is no longer supported"))); + errmsg("date/time value \"current\" is no longer supported"))); return DTERR_BAD_FORMAT; break; @@ -3248,7 +3248,7 @@ DateTimeParseError(int dterr, const char *str, const char *datatype) (errcode(ERRCODE_DATETIME_FIELD_OVERFLOW), errmsg("date/time field value out of range: \"%s\"", str), - errhint("Perhaps you need a different DateStyle setting."))); + errhint("Perhaps you need a different \"datestyle\" setting."))); break; case DTERR_INTERVAL_OVERFLOW: ereport(ERROR, @@ -3266,8 +3266,7 @@ DateTimeParseError(int dterr, const char *str, const char *datatype) default: ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - /* translator: first %s is datatype name */ - errmsg("invalid input syntax for %s: \"%s\"", + errmsg("invalid input syntax for type %s: \"%s\"", datatype, str))); break; } diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index 80291da6035..9363b83e645 100644 --- a/src/backend/utils/adt/encode.c +++ b/src/backend/utils/adt/encode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.8 2003/08/04 23:59:38 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/encode.c,v 1.9 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -147,7 +147,7 @@ get_hex(unsigned c) if (res < 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid hex digit: \"%c\"", c))); + errmsg("invalid hexadecimal digit: \"%c\"", c))); return (uint8) res; } @@ -175,7 +175,7 @@ hex_decode(const uint8 *src, unsigned len, uint8 *dst) if (s >= srcend) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid hex data: odd number of digits"))); + errmsg("invalid hexadecimal data: odd number of digits"))); v2 = get_hex(*s++); *p++ = v1 | v2; @@ -433,7 +433,7 @@ esc_decode(const uint8 *src, unsigned srclen, uint8 *dst) */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for bytea"))); + errmsg("invalid input syntax for type bytea"))); } len++; @@ -498,7 +498,7 @@ esc_dec_len(const uint8 *src, unsigned srclen) */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for bytea"))); + errmsg("invalid input syntax for type bytea"))); } len++; diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 82c257c8015..9f0fa0de32d 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.93 2003/08/04 02:40:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.94 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -132,11 +132,11 @@ CheckFloat4Val(double val) if (fabs(val) > FLOAT4_MAX) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("float4 value out of range: overflow"))); + errmsg("type \"real\" value out of range: overflow"))); if (val != 0.0 && fabs(val) < FLOAT4_MIN) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("float4 value out of range: underflow"))); + errmsg("type \"real\" value out of range: underflow"))); return; #endif /* UNSAFE_FLOATS */ @@ -161,11 +161,11 @@ CheckFloat8Val(double val) if (fabs(val) > FLOAT8_MAX) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("float8 value out of range: overflow"))); + errmsg("type \"double precision\" value out of range: overflow"))); if (val != 0.0 && fabs(val) < FLOAT8_MIN) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("float8 value out of range: underflow"))); + errmsg("type \"double precision\" value out of range: underflow"))); #endif /* UNSAFE_FLOATS */ } @@ -197,7 +197,7 @@ float4in(PG_FUNCTION_ARGS) else ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for float4: \"%s\"", + errmsg("invalid input syntax for type real: \"%s\"", num))); } else @@ -205,7 +205,7 @@ float4in(PG_FUNCTION_ARGS) if (errno == ERANGE) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("\"%s\" is out of range for float4", num))); + errmsg("\"%s\" is out of range for type real", num))); } /* @@ -298,7 +298,7 @@ float8in(PG_FUNCTION_ARGS) else ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for float8: \"%s\"", + errmsg("invalid input syntax for type double precision: \"%s\"", num))); } else @@ -306,7 +306,7 @@ float8in(PG_FUNCTION_ARGS) if (errno == ERANGE) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("\"%s\" is out of range for float8", num))); + errmsg("\"%s\" is out of range for type double precision", num))); } CheckFloat8Val(val); @@ -1301,12 +1301,12 @@ dlog1(PG_FUNCTION_ARGS) if (arg1 == 0.0) ereport(ERROR, (errcode(ERRCODE_FLOATING_POINT_EXCEPTION), - errmsg("cannot take log of zero"))); + errmsg("cannot take logarithm of zero"))); if (arg1 < 0) ereport(ERROR, (errcode(ERRCODE_FLOATING_POINT_EXCEPTION), - errmsg("cannot take log of a negative number"))); + errmsg("cannot take logarithm of a negative number"))); result = log(arg1); @@ -1327,12 +1327,12 @@ dlog10(PG_FUNCTION_ARGS) if (arg1 == 0.0) ereport(ERROR, (errcode(ERRCODE_FLOATING_POINT_EXCEPTION), - errmsg("cannot take log of zero"))); + errmsg("cannot take logarithm of zero"))); if (arg1 < 0) ereport(ERROR, (errcode(ERRCODE_FLOATING_POINT_EXCEPTION), - errmsg("cannot take log of a negative number"))); + errmsg("cannot take logarithm of a negative number"))); result = log10(arg1); diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index adc106882f8..d3fe88ad20c 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.80 2003/08/04 02:40:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.81 2003/09/25 06:58:03 petere Exp $ * *------------------------------------------------------------------------- */ @@ -387,7 +387,7 @@ box_in(PG_FUNCTION_ARGS) || (*s != '\0')) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for box: \"%s\"", str))); + errmsg("invalid input syntax for type box: \"%s\"", str))); /* reorder corners if necessary... */ if (box->high.x < box->low.x) @@ -900,14 +900,14 @@ line_in(PG_FUNCTION_ARGS) || (*s != '\0')) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for line: \"%s\"", str))); + errmsg("invalid input syntax for type line: \"%s\"", str))); line = (LINE *) palloc(sizeof(LINE)); line_construct_pts(line, &lseg.p[0], &lseg.p[1]); #else ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("line not yet implemented"))); + errmsg("type \"line\" not yet implemented"))); line = NULL; #endif @@ -974,7 +974,7 @@ line_out(PG_FUNCTION_ARGS) #else ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("line not yet implemented"))); + errmsg("type \"line\" not yet implemented"))); result = NULL; #endif @@ -989,7 +989,7 @@ line_recv(PG_FUNCTION_ARGS) { ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("line not yet implemented"))); + errmsg("type \"line\" not yet implemented"))); return 0; } @@ -1001,7 +1001,7 @@ line_send(PG_FUNCTION_ARGS) { ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("line not yet implemented"))); + errmsg("type \"line\" not yet implemented"))); return 0; } @@ -1326,7 +1326,7 @@ path_in(PG_FUNCTION_ARGS) if ((npts = pair_count(str, ',')) <= 0) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for path: \"%s\"", str))); + errmsg("invalid input syntax for type path: \"%s\"", str))); s = str; while (isspace((unsigned char) *s)) @@ -1349,7 +1349,7 @@ path_in(PG_FUNCTION_ARGS) && (!((depth == 0) && (*s == '\0'))) && !((depth >= 1) && (*s == RDELIM))) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for path: \"%s\"", str))); + errmsg("invalid input syntax for type path: \"%s\"", str))); path->closed = (!isopen); @@ -1727,7 +1727,7 @@ point_in(PG_FUNCTION_ARGS) if (!pair_decode(str, &x, &y, &s) || (*s != '\0')) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for point: \"%s\"", str))); + errmsg("invalid input syntax for type point: \"%s\"", str))); point = (Point *) palloc(sizeof(Point)); @@ -1955,7 +1955,7 @@ lseg_in(PG_FUNCTION_ARGS) || (*s != '\0')) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for lseg: \"%s\"", str))); + errmsg("invalid input syntax for type lseg: \"%s\"", str))); #ifdef NOT_USED lseg->m = point_sl(&lseg->p[0], &lseg->p[1]); @@ -2547,7 +2547,7 @@ dist_lb(PG_FUNCTION_ARGS) /* need to think about this one for a while */ ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("dist_lb not implemented"))); + errmsg("function \"dist_lb\" not implemented"))); PG_RETURN_NULL(); } @@ -3060,7 +3060,7 @@ close_lb(PG_FUNCTION_ARGS) /* think about this one for a while */ ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("close_lb not implemented"))); + errmsg("function \"close_lb\" not implemented"))); PG_RETURN_NULL(); } @@ -3363,7 +3363,7 @@ poly_in(PG_FUNCTION_ARGS) if ((npts = pair_count(str, ',')) <= 0) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for polygon: \"%s\"", str))); + errmsg("invalid input syntax for type polygon: \"%s\"", str))); size = offsetof(POLYGON, p[0]) +sizeof(poly->p[0]) * npts; poly = (POLYGON *) palloc0(size); /* zero any holes */ @@ -3375,7 +3375,7 @@ poly_in(PG_FUNCTION_ARGS) || (*s != '\0')) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for polygon: \"%s\"", str))); + errmsg("invalid input syntax for type polygon: \"%s\"", str))); make_bound_box(poly); @@ -3725,7 +3725,7 @@ poly_distance(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("poly_distance not implemented"))); + errmsg("function \"poly_distance\" not implemented"))); PG_RETURN_NULL(); } @@ -4037,7 +4037,7 @@ path_center(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("path_center not implemented"))); + errmsg("function \"path_center\" not implemented"))); PG_RETURN_NULL(); } @@ -4221,7 +4221,7 @@ circle_in(PG_FUNCTION_ARGS) if (!pair_decode(s, &circle->center.x, &circle->center.y, &s)) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for circle: \"%s\"", str))); + errmsg("invalid input syntax for type circle: \"%s\"", str))); if (*s == DELIM) s++; @@ -4231,7 +4231,7 @@ circle_in(PG_FUNCTION_ARGS) if ((!single_decode(s, &circle->radius, &s)) || (circle->radius < 0)) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for circle: \"%s\"", str))); + errmsg("invalid input syntax for type circle: \"%s\"", str))); while (depth > 0) { @@ -4246,13 +4246,13 @@ circle_in(PG_FUNCTION_ARGS) else ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for circle: \"%s\"", str))); + errmsg("invalid input syntax for type circle: \"%s\"", str))); } if (*s != '\0') ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for circle: \"%s\"", str))); + errmsg("invalid input syntax for type circle: \"%s\"", str))); PG_RETURN_CIRCLE_P(circle); } diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 547bd140aaa..7e1675227df 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.47 2003/08/04 02:40:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.48 2003/09/25 06:58:04 petere Exp $ * *------------------------------------------------------------------------- */ @@ -85,7 +85,7 @@ scanint8(const char *str, bool errorOK, int64 *result) else ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for int8: \"%s\"", str))); + errmsg("invalid input syntax for type bigint: \"%s\"", str))); } /* process digits */ @@ -113,7 +113,7 @@ scanint8(const char *str, bool errorOK, int64 *result) else ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for int8: \"%s\"", str))); + errmsg("invalid input syntax for type bigint: \"%s\"", str))); } *result = (sign < 0) ? -tmp : tmp; diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c index 4bef89a71b3..b1372c6a658 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.30 2003/08/04 00:43:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.31 2003/09/25 06:58:04 petere Exp $ */ #include "postgres.h" @@ -62,7 +62,7 @@ macaddr_in(PG_FUNCTION_ARGS) if (count != 6) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for macaddr: \"%s\"", str))); + errmsg("invalid input syntax for type macaddr: \"%s\"", str))); if ((a < 0) || (a > 255) || (b < 0) || (b > 255) || (c < 0) || (c > 255) || (d < 0) || (d > 255) || diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 8b758b51195..28c144fea5a 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.115 2003/08/27 23:29:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.116 2003/09/25 06:58:04 petere Exp $ * *------------------------------------------------------------------------- */ @@ -241,7 +241,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) if (strlen(tm->tm_zone) > MAXTZLEN) ereport(WARNING, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid timezone name: \"%s\"", + errmsg("invalid time zone name: \"%s\"", tm->tm_zone))); } } @@ -277,7 +277,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) if (strlen(tzname[tm->tm_isdst]) > MAXTZLEN) ereport(WARNING, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid timezone name: \"%s\"", + errmsg("invalid time zone name: \"%s\"", tzname[tm->tm_isdst]))); } } @@ -653,7 +653,7 @@ abstime_timestamp(PG_FUNCTION_ARGS) case INVALID_ABSTIME: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot convert \"invalid\" abstime to timestamp"))); + errmsg("cannot convert abstime \"invalid\" to timestamp"))); TIMESTAMP_NOBEGIN(result); break; @@ -726,7 +726,7 @@ abstime_timestamptz(PG_FUNCTION_ARGS) case INVALID_ABSTIME: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot convert \"invalid\" abstime to timestamp"))); + errmsg("cannot convert abstime \"invalid\" to timestamp"))); TIMESTAMP_NOBEGIN(result); break; @@ -879,7 +879,7 @@ tintervalin(PG_FUNCTION_ARGS) if (istinterval(intervalstr, &t1, &t2) == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - errmsg("invalid input syntax for tinterval: \"%s\"", + errmsg("invalid input syntax for type tinterval: \"%s\"", intervalstr))); if (t1 == INVALID_ABSTIME || t2 == INVALID_ABSTIME) @@ -1034,7 +1034,7 @@ reltime_interval(PG_FUNCTION_ARGS) case INVALID_RELTIME: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot convert \"invalid\" reltime to interval"))); + errmsg("cannot convert reltime \"invalid\" to interval"))); result->time = 0; result->month = 0; break; diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c index e3e7d185df6..b26931b77cc 100644 --- a/src/backend/utils/adt/network.c +++ b/src/backend/utils/adt/network.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for the INET and CIDR types. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.45 2003/08/04 00:43:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.46 2003/09/25 06:58:04 petere Exp $ * * Jon Postel RIP 16 Oct 1998 */ @@ -87,7 +87,7 @@ network_in(char *src, int type) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), /* translator: first %s is inet or cidr */ - errmsg("invalid input syntax for %s: \"%s\"", + errmsg("invalid input syntax for type %s: \"%s\"", type ? "cidr" : "inet", src))); /* @@ -225,7 +225,7 @@ inet_recv(PG_FUNCTION_ARGS) if (!addressOK(ip_addr(addr), bits, ip_family(addr))) ereport(ERROR, (errcode(ERRCODE_INVALID_BINARY_REPRESENTATION), - errmsg("invalid external CIDR value"), + errmsg("invalid external cidr value"), errdetail("Value has bits set to right of mask."))); } diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c index 42ce2d2fcbd..3b0d980b0c5 100644 --- a/src/backend/utils/adt/not_in.c +++ b/src/backend/utils/adt/not_in.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.36 2003/08/11 20:46:46 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.37 2003/09/25 06:58:04 petere Exp $ * *------------------------------------------------------------------------- */ @@ -62,7 +62,7 @@ int4notin(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_INVALID_NAME), errmsg("invalid name syntax"), - errhint("Must provide \"relationname.attributename\"."))); + errhint("Must provide \"relationname.columnname\"."))); attribute = strVal(llast(names)); names = ltruncate(nnames - 1, names); relrv = makeRangeVarFromNameList(names); diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 5b0fe291107..8178ed42fc4 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -14,7 +14,7 @@ * Copyright (c) 1998-2003, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.65 2003/08/04 00:43:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.66 2003/09/25 06:58:04 petere Exp $ * *------------------------------------------------------------------------- */ @@ -2536,7 +2536,7 @@ set_var_from_str(const char *str, NumericVar *dest) if (!isdigit((unsigned char) *cp)) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for numeric: \"%s\"", str))); + errmsg("invalid input syntax for type numeric: \"%s\"", str))); decdigits = (unsigned char *) palloc(strlen(cp) + DEC_DIGITS * 2); @@ -2559,7 +2559,7 @@ set_var_from_str(const char *str, NumericVar *dest) if (have_dp) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for numeric: \"%s\"", + errmsg("invalid input syntax for type numeric: \"%s\"", str))); have_dp = TRUE; cp++; @@ -2583,14 +2583,14 @@ set_var_from_str(const char *str, NumericVar *dest) if (endptr == cp) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for numeric: \"%s\"", + errmsg("invalid input syntax for type numeric: \"%s\"", str))); cp = endptr; if (exponent > NUMERIC_MAX_PRECISION || exponent < -NUMERIC_MAX_PRECISION) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for numeric: \"%s\"", + errmsg("invalid input syntax for type numeric: \"%s\"", str))); dweight += (int) exponent; dscale -= (int) exponent; @@ -2604,7 +2604,7 @@ set_var_from_str(const char *str, NumericVar *dest) if (!isspace((unsigned char) *cp)) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for numeric: \"%s\"", + errmsg("invalid input syntax for type numeric: \"%s\"", str))); cp++; } @@ -2973,7 +2973,7 @@ apply_typmod(NumericVar *var, int32 typmod) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), errmsg("numeric field overflow"), - errdetail("ABS(value) >= 10^%d for field with precision %d, scale %d.", + errdetail("The absolute value is greater than or equal to 10^%d for field with precision %d, scale %d.", ddigits - 1, precision, scale))); break; } @@ -3114,7 +3114,7 @@ numeric_to_double_no_overflow(Numeric num) /* shouldn't happen ... */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for float8: \"%s\"", + errmsg("invalid input syntax for type double precision: \"%s\"", tmp))); } @@ -3140,7 +3140,7 @@ numericvar_to_double_no_overflow(NumericVar *var) /* shouldn't happen ... */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for float8: \"%s\"", + errmsg("invalid input syntax for type double precision: \"%s\"", tmp))); } @@ -4122,7 +4122,7 @@ exp_var(NumericVar *arg, NumericVar *result, int rscale) if (xintval >= NUMERIC_MAX_RESULT_SCALE * 3) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("argument for EXP() too big"))); + errmsg("argument for function \"exp\" too big"))); } /* Select an appropriate scale for internal calculation */ @@ -4249,7 +4249,7 @@ ln_var(NumericVar *arg, NumericVar *result, int rscale) if (cmp_var(arg, &const_zero) <= 0) ereport(ERROR, (errcode(ERRCODE_FLOATING_POINT_EXCEPTION), - errmsg("cannot take log of a negative number"))); + errmsg("cannot take logarithm of a negative number"))); local_rscale = rscale + 8; diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index d0229207174..9f59f212218 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.57 2003/08/04 02:40:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.58 2003/09/25 06:58:04 petere Exp $ * *------------------------------------------------------------------------- */ @@ -102,19 +102,19 @@ pg_atoi(char *s, int size, int c) ) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("%s is out of range for int4", s))); + errmsg("value \"%s\" is out of range for type integer", s))); break; case sizeof(int16): if (errno == ERANGE || l < SHRT_MIN || l > SHRT_MAX) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("%s is out of range for int2", s))); + errmsg("value \"%s\" is out of range for type shortint", s))); break; case sizeof(int8): if (errno == ERANGE || l < SCHAR_MIN || l > SCHAR_MAX) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("%s is out of range for int1", s))); + errmsg("value \"%s\" is out of range for 8-bit integer", s))); break; default: elog(ERROR, "unsupported result size: %d", size); diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index 0086b52ba74..ec9d1fae50d 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -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; diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 6204bbde2f3..8efaa30fe59 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.81 2003/08/04 02:40:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.82 2003/09/25 06:58:04 petere Exp $ * *------------------------------------------------------------------------- */ @@ -114,12 +114,12 @@ regprocin(PG_FUNCTION_ARGS) if (matches == 0) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("no procedure with name %s", pro_name_or_oid))); + errmsg("function \"%s\" does not exist", pro_name_or_oid))); else if (matches > 1) ereport(ERROR, (errcode(ERRCODE_AMBIGUOUS_FUNCTION), - errmsg("more than one procedure named %s", + errmsg("more than one function named \"%s\"", pro_name_or_oid))); PG_RETURN_OID(result); @@ -135,11 +135,11 @@ regprocin(PG_FUNCTION_ARGS) if (clist == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("no procedure with name %s", pro_name_or_oid))); + errmsg("function \"%s\" does not exist", pro_name_or_oid))); else if (clist->next != NULL) ereport(ERROR, (errcode(ERRCODE_AMBIGUOUS_FUNCTION), - errmsg("more than one procedure named %s", + errmsg("more than one function named \"%s\"", pro_name_or_oid))); result = clist->oid; @@ -287,7 +287,7 @@ regprocedurein(PG_FUNCTION_ARGS) if (clist == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("no procedure with name %s", pro_name_or_oid))); + errmsg("function \"%s\" does not exist", pro_name_or_oid))); result = clist->oid; @@ -464,7 +464,7 @@ regoperin(PG_FUNCTION_ARGS) if (matches == 0) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("no operator with name %s", opr_name_or_oid))); + errmsg("operator does not exist: %s", opr_name_or_oid))); else if (matches > 1) ereport(ERROR, (errcode(ERRCODE_AMBIGUOUS_FUNCTION), @@ -484,7 +484,7 @@ regoperin(PG_FUNCTION_ARGS) if (clist == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("no operator with name %s", opr_name_or_oid))); + errmsg("operator does not exist: %s", opr_name_or_oid))); else if (clist->next != NULL) ereport(ERROR, (errcode(ERRCODE_AMBIGUOUS_FUNCTION), @@ -662,7 +662,7 @@ regoperatorin(PG_FUNCTION_ARGS) if (clist == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("no operator with name %s", opr_name_or_oid))); + errmsg("operator does not exist: %s", opr_name_or_oid))); result = clist->oid; @@ -834,7 +834,7 @@ regclassin(PG_FUNCTION_ARGS) else ereport(ERROR, (errcode(ERRCODE_UNDEFINED_TABLE), - errmsg("no class with name %s", class_name_or_oid))); + errmsg("relation \"%s\" does not exist", class_name_or_oid))); /* We assume there can be only one match */ @@ -1000,7 +1000,7 @@ regtypein(PG_FUNCTION_ARGS) else ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("no type with name %s", typ_name_or_oid))); + errmsg("type \"%s\" does not exist", typ_name_or_oid))); /* We assume there can be only one match */ diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index e66c42f99bd..877034519c1 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -17,7 +17,7 @@ * * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.56 2003/09/09 23:22:21 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.57 2003/09/25 06:58:04 petere Exp $ * * ---------- */ @@ -331,10 +331,10 @@ RI_FKey_check(PG_FUNCTION_ARGS) */ ereport(ERROR, (errcode(ERRCODE_FOREIGN_KEY_VIOLATION), - errmsg("insert or update on \"%s\" violates foreign key constraint \"%s\"", + errmsg("insert or update on table \"%s\" violates foreign key constraint \"%s\"", RelationGetRelationName(trigdata->tg_relation), tgargs[RI_CONSTRAINT_NAME_ARGNO]), - errdetail("MATCH FULL does not allow mixing of NULL and non-NULL key values."))); + errdetail("MATCH FULL does not allow mixing of null and nonnull key values."))); heap_close(pk_rel, RowShareLock); return PointerGetDatum(NULL); @@ -2542,7 +2542,7 @@ RI_FKey_keyequal_upd(TriggerData *trigdata) (tgnargs % 2) != 0) ereport(ERROR, (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), - errmsg("%s() called with wrong number of trigger arguments", + errmsg("function \"%s\" called with wrong number of trigger arguments", "RI_FKey_keyequal_upd"))); /* @@ -2560,10 +2560,10 @@ RI_FKey_keyequal_upd(TriggerData *trigdata) if (!OidIsValid(trigdata->tg_trigger->tgconstrrelid)) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("no target table given for trigger \"%s\" on \"%s\"", + errmsg("no target table given for trigger \"%s\" on table \"%s\"", trigdata->tg_trigger->tgname, RelationGetRelationName(trigdata->tg_relation)), - errhint("Remove this RI trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."))); + errhint("Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."))); fk_rel = heap_open(trigdata->tg_trigger->tgconstrrelid, AccessShareLock); pk_rel = trigdata->tg_relation; @@ -2720,7 +2720,7 @@ ri_BuildQueryKeyFull(RI_QueryKey *key, Oid constr_id, int32 constr_queryno, if (fno == SPI_ERROR_NOATTRIBUTE) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN), - errmsg("table \"%s\" does not have attribute \"%s\" referenced by constraint \"%s\"", + errmsg("table \"%s\" does not have column \"%s\" referenced by constraint \"%s\"", RelationGetRelationName(fk_rel), argv[j], argv[RI_CONSTRAINT_NAME_ARGNO]))); @@ -2730,7 +2730,7 @@ ri_BuildQueryKeyFull(RI_QueryKey *key, Oid constr_id, int32 constr_queryno, if (fno == SPI_ERROR_NOATTRIBUTE) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN), - errmsg("table \"%s\" does not have attribute \"%s\" referenced by constraint \"%s\"", + errmsg("table \"%s\" does not have column \"%s\" referenced by constraint \"%s\"", RelationGetRelationName(pk_rel), argv[j + 1], argv[RI_CONSTRAINT_NAME_ARGNO]))); @@ -2750,7 +2750,7 @@ ri_CheckTrigger(FunctionCallInfo fcinfo, const char *funcname, int tgkind) if (!CALLED_AS_TRIGGER(fcinfo)) ereport(ERROR, (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), - errmsg("%s() was not fired by trigger manager", funcname))); + errmsg("function \"%s\" was not called by trigger manager", funcname))); /* * Check proper event @@ -2759,7 +2759,7 @@ ri_CheckTrigger(FunctionCallInfo fcinfo, const char *funcname, int tgkind) !TRIGGER_FIRED_FOR_ROW(trigdata->tg_event)) ereport(ERROR, (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), - errmsg("%s() must be fired AFTER ROW", funcname))); + errmsg("function \"%s\" must be fired AFTER ROW", funcname))); switch (tgkind) { @@ -2767,27 +2767,27 @@ ri_CheckTrigger(FunctionCallInfo fcinfo, const char *funcname, int tgkind) if (!TRIGGER_FIRED_BY_INSERT(trigdata->tg_event)) ereport(ERROR, (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), - errmsg("%s() must be fired for INSERT", funcname))); + errmsg("function \"%s\" must be fired for INSERT", funcname))); break; case RI_TRIGTYPE_UPDATE: if (!TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event)) ereport(ERROR, (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), - errmsg("%s() must be fired for UPDATE", funcname))); + errmsg("function \"%s\" must be fired for UPDATE", funcname))); break; case RI_TRIGTYPE_INUP: if (!TRIGGER_FIRED_BY_INSERT(trigdata->tg_event) && !TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event)) ereport(ERROR, (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), - errmsg("%s() must be fired for INSERT or UPDATE", + errmsg("function \"%s\" must be fired for INSERT or UPDATE", funcname))); break; case RI_TRIGTYPE_DELETE: if (!TRIGGER_FIRED_BY_DELETE(trigdata->tg_event)) ereport(ERROR, (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), - errmsg("%s() must be fired for DELETE", funcname))); + errmsg("function \"%s\" must be fired for DELETE", funcname))); break; } @@ -2800,7 +2800,7 @@ ri_CheckTrigger(FunctionCallInfo fcinfo, const char *funcname, int tgkind) (tgnargs % 2) != 0) ereport(ERROR, (errcode(ERRCODE_E_R_I_E_TRIGGER_PROTOCOL_VIOLATED), - errmsg("%s() called with wrong number of trigger arguments", + errmsg("function \"%s\" called with wrong number of trigger arguments", funcname))); /* @@ -2810,7 +2810,7 @@ ri_CheckTrigger(FunctionCallInfo fcinfo, const char *funcname, int tgkind) if (!OidIsValid(trigdata->tg_trigger->tgconstrrelid)) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("no target table given for trigger \"%s\" on \"%s\"", + errmsg("no target table given for trigger \"%s\" on table \"%s\"", trigdata->tg_trigger->tgname, RelationGetRelationName(trigdata->tg_relation)), errhint("Remove this RI trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."))); @@ -3040,7 +3040,7 @@ ri_ReportViolation(RI_QueryKey *qkey, const char *constrname, { ereport(ERROR, (errcode(ERRCODE_FOREIGN_KEY_VIOLATION), - errmsg("insert or update on \"%s\" violates foreign key constraint \"%s\"", + errmsg("insert or update on table \"%s\" violates foreign key constraint \"%s\"", RelationGetRelationName(fk_rel), constrname), errdetail("No rows were found in \"%s\".", RelationGetRelationName(pk_rel)))); @@ -3077,9 +3077,9 @@ ri_ReportViolation(RI_QueryKey *qkey, const char *constrname, if (onfk) ereport(ERROR, (errcode(ERRCODE_FOREIGN_KEY_VIOLATION), - errmsg("insert or update on \"%s\" violates foreign key constraint \"%s\"", + errmsg("insert or update on table \"%s\" violates foreign key constraint \"%s\"", RelationGetRelationName(fk_rel), constrname), - errdetail("Key (%s)=(%s) is not present in \"%s\".", + errdetail("Key (%s)=(%s) is not present in table \"%s\".", key_names, key_values, RelationGetRelationName(pk_rel)))); else @@ -3088,7 +3088,7 @@ ri_ReportViolation(RI_QueryKey *qkey, const char *constrname, errmsg("update or delete on \"%s\" violates foreign key constraint \"%s\" on \"%s\"", RelationGetRelationName(pk_rel), constrname, RelationGetRelationName(fk_rel)), - errdetail("Key (%s)=(%s) is still referenced from \"%s\".", + errdetail("Key (%s)=(%s) is still referenced from table \"%s\".", key_names, key_values, RelationGetRelationName(fk_rel)))); } @@ -3139,7 +3139,7 @@ ri_BuildQueryKeyPkCheck(RI_QueryKey *key, Oid constr_id, int32 constr_queryno, if (fno == SPI_ERROR_NOATTRIBUTE) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN), - errmsg("table \"%s\" does not have attribute \"%s\" referenced by constraint \"%s\"", + errmsg("table \"%s\" does not have column \"%s\" referenced by constraint \"%s\"", RelationGetRelationName(pk_rel), argv[j], argv[RI_CONSTRAINT_NAME_ARGNO]))); diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 67996f23257..2ea4dc3454a 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.145 2003/08/08 21:42:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.146 2003/09/25 06:58:04 petere Exp $ * *------------------------------------------------------------------------- */ @@ -3204,7 +3204,7 @@ regex_fixed_prefix(Const *patt_const, bool case_insensitive, if (typeid == BYTEAOID) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("regex matching not supported on type bytea"))); + errmsg("regular-expression matching not supported on type bytea"))); /* the right-hand const is type text for all of these */ patt = DatumGetCString(DirectFunctionCall1(textout, patt_const->constvalue)); @@ -3630,7 +3630,7 @@ regex_selectivity(Const *patt_const, bool case_insensitive) if (typeid == BYTEAOID) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("regex matching not supported on type bytea"))); + errmsg("regular-expression matching not supported on type bytea"))); /* the right-hand const is type text for all of these */ patt = DatumGetCString(DirectFunctionCall1(textout, patt_const->constvalue)); diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index efc5f78a37b..64bbb2ce591 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.40 2003/08/11 20:46:46 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.41 2003/09/25 06:58:04 petere Exp $ * * NOTES * input routine largely stolen from boxin(). @@ -63,7 +63,7 @@ tidin(PG_FUNCTION_ARGS) if (i < NTIDARGS) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for tid: \"%s\"", + errmsg("invalid input syntax for type tid: \"%s\"", str))); errno = 0; @@ -71,7 +71,7 @@ tidin(PG_FUNCTION_ARGS) if (errno || *badp != DELIM) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for tid: \"%s\"", + errmsg("invalid input syntax for type tid: \"%s\"", str))); hold_offset = strtol(coord[1], &badp, 10); @@ -79,7 +79,7 @@ tidin(PG_FUNCTION_ARGS) hold_offset > USHRT_MAX || hold_offset < 0) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for tid: \"%s\"", + errmsg("invalid input syntax for type tid: \"%s\"", str))); offsetNumber = hold_offset; diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 961c70da81a..7ac3fc9d818 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.94 2003/08/27 23:29:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.95 2003/09/25 06:58:04 petere Exp $ * *------------------------------------------------------------------------- */ @@ -115,7 +115,7 @@ timestamp_in(PG_FUNCTION_ARGS) case DTK_INVALID: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("\"%s\" is no longer supported", str))); + errmsg("date/time value \"%s\" is no longer supported", str))); TIMESTAMP_NOEND(result); break; @@ -341,7 +341,7 @@ timestamptz_in(PG_FUNCTION_ARGS) case DTK_INVALID: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("\"%s\" is no longer supported", str))); + errmsg("date/time value \"%s\" is no longer supported", str))); TIMESTAMP_NOEND(result); break; @@ -503,7 +503,7 @@ interval_in(PG_FUNCTION_ARGS) case DTK_INVALID: ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("\"%s\" is no longer supported", str))); + errmsg("date/time value \"%s\" is no longer supported", str))); break; default: @@ -1686,7 +1686,7 @@ timestamp_mi(PG_FUNCTION_ARGS) { ereport(ERROR, (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE), - errmsg("cannot subtract non-finite timestamps"))); + errmsg("cannot subtract infinite timestamps"))); result->time = 0; } @@ -2381,7 +2381,7 @@ text_timestamp(PG_FUNCTION_ARGS) if (VARSIZE(str) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - errmsg("invalid input syntax for timestamp: \"%s\"", + errmsg("invalid input syntax for type timestamp: \"%s\"", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(str)))))); @@ -2441,7 +2441,7 @@ text_timestamptz(PG_FUNCTION_ARGS) if (VARSIZE(str) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - errmsg("invalid input syntax for timestamp with time zone: \"%s\"", + errmsg("invalid input syntax for type timestamp with time zone: \"%s\"", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(str)))))); @@ -2502,7 +2502,7 @@ text_interval(PG_FUNCTION_ARGS) if (VARSIZE(str) - VARHDRSZ > MAXDATELEN) ereport(ERROR, (errcode(ERRCODE_INVALID_DATETIME_FORMAT), - errmsg("invalid input syntax for interval: \"%s\"", + errmsg("invalid input syntax for type interval: \"%s\"", DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(str)))))); diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index f870fcc1ee6..00527c45f18 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.36 2003/09/15 20:03:37 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.37 2003/09/25 06:58:05 petere Exp $ * *------------------------------------------------------------------------- */ @@ -153,7 +153,7 @@ bit_in(PG_FUNCTION_ARGS) else ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("\"%c\" is not a valid hex digit", + errmsg("\"%c\" is not a valid hexadecimal digit", *sp))); if (bc) @@ -392,7 +392,7 @@ varbit_in(PG_FUNCTION_ARGS) else ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("\"%c\" is not a valid hex digit", + errmsg("\"%c\" is not a valid hexadecimal digit", *sp))); if (bc) @@ -1254,7 +1254,7 @@ bitfromint8(PG_FUNCTION_ARGS) #else ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("int64 is not supported on this platform"))); + errmsg("64-bit integers not supported on this platform"))); PG_RETURN_NULL(); #endif @@ -1287,7 +1287,7 @@ bittoint8(PG_FUNCTION_ARGS) #else ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("int64 is not supported on this platform"))); + errmsg("64-bit integers not supported on this platform"))); PG_RETURN_NULL(); #endif diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index a3dec23c575..31a139b9b96 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.105 2003/08/04 04:03:10 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.106 2003/09/25 06:58:05 petere Exp $ * *------------------------------------------------------------------------- */ @@ -114,7 +114,7 @@ byteain(PG_FUNCTION_ARGS) */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for bytea"))); + errmsg("invalid input syntax for type bytea"))); } } @@ -154,7 +154,7 @@ byteain(PG_FUNCTION_ARGS) */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), - errmsg("invalid input syntax for bytea"))); + errmsg("invalid input syntax for type bytea"))); } } diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 3c4cb46a74f..d28875b1da9 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.189 2003/09/24 18:54:01 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.190 2003/09/25 06:58:05 petere Exp $ * *------------------------------------------------------------------------- */ @@ -3303,7 +3303,7 @@ write_relcache_init_file(void) */ ereport(WARNING, (errcode_for_file_access(), - errmsg("could not create init file \"%s\": %m", + errmsg("could not create relation-cache initialization file \"%s\": %m", tempfilename), errdetail("Continuing anyway, but there's something wrong."))); return; @@ -3444,7 +3444,7 @@ write_relcache_init_file(void) { ereport(WARNING, (errcode_for_file_access(), - errmsg("could not rename init file \"%s\" to \"%s\": %m", + errmsg("could not rename relation-cache initialization file \"%s\" to \"%s\": %m", tempfilename, finalfilename), errdetail("Continuing anyway, but there's something wrong."))); diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 1d34e15667d..8fd5f41046d 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.122 2003/09/03 15:49:42 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.123 2003/09/25 06:58:05 petere Exp $ * *------------------------------------------------------------------------- */ @@ -873,7 +873,7 @@ DebugFileOpen(void) 0666)) < 0) ereport(FATAL, (errcode_for_file_access(), - errmsg("failed to open \"%s\": %m", OutputFileName))); + errmsg("could not open file \"%s\": %m", OutputFileName))); istty = isatty(fd); close(fd); @@ -883,7 +883,7 @@ DebugFileOpen(void) if (!freopen(OutputFileName, "a", stderr)) ereport(FATAL, (errcode_for_file_access(), - errmsg("failed to reopen \"%s\" as stderr: %m", + errmsg("could not reopen file \"%s\" as stderr: %m", OutputFileName))); /* @@ -896,7 +896,7 @@ DebugFileOpen(void) if (!freopen(OutputFileName, "a", stdout)) ereport(FATAL, (errcode_for_file_access(), - errmsg("failed to reopen \"%s\" as stdout: %m", + errmsg("could not reopen file \"%s\" as stdout: %m", OutputFileName))); } } diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 52e8273b777..6d73191d339 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.65 2003/09/07 02:18:01 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.66 2003/09/25 06:58:05 petere Exp $ * *------------------------------------------------------------------------- */ @@ -402,7 +402,7 @@ find_in_dynamic_libpath(const char *basename) if (len == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_NAME), - errmsg("zero-length component in DYNAMIC_LIBRARY_PATH"))); + errmsg("zero-length component in parameter \"dynamic_library_path\""))); piece = palloc(len + 1); strncpy(piece, p, len); @@ -415,7 +415,7 @@ find_in_dynamic_libpath(const char *basename) if (!is_absolute_path(mangled)) ereport(ERROR, (errcode(ERRCODE_INVALID_NAME), - errmsg("DYNAMIC_LIBRARY_PATH component is not absolute"))); + errmsg("component in parameter \"dynamic_library_path\" is not an absolute path"))); full = palloc(strlen(mangled) + 1 + baselen + 1); sprintf(full, "%s/%s", mangled, basename); diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 71cdd0cbf09..a22a0b27d55 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.75 2003/08/04 02:40:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.76 2003/09/25 06:58:05 petere Exp $ * *------------------------------------------------------------------------- */ @@ -220,7 +220,7 @@ fmgr_info_cxt_security(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt, if (fbp == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("internal function \"%s\" is not in table", + errmsg("internal function \"%s\" is not in internal lookup table", prosrc))); pfree(prosrc); /* Should we check that nargs, strict, retset match the table? */ @@ -619,7 +619,7 @@ fmgr_oldstyle(PG_FUNCTION_ARGS) */ ereport(ERROR, (errcode(ERRCODE_TOO_MANY_ARGUMENTS), - errmsg("function %u has too many arguments (%d > %d)", + errmsg("function %u has too many arguments (%d, maximum is %d)", fcinfo->flinfo->fn_oid, n_arguments, 16))); returnValue = NULL; /* keep compiler quiet */ break; @@ -1483,7 +1483,7 @@ fmgr(Oid procedureId,...) if (n_arguments > FUNC_MAX_ARGS) ereport(ERROR, (errcode(ERRCODE_TOO_MANY_ARGUMENTS), - errmsg("function %u has too many arguments (%d > %d)", + errmsg("function %u has too many arguments (%d, maximum is %d)", flinfo.fn_oid, n_arguments, FUNC_MAX_ARGS))); va_start(pvar, procedureId); for (i = 0; i < n_arguments; i++) diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 22baac3706f..a127296cd95 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.114 2003/09/24 18:54:01 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.115 2003/09/25 06:58:05 petere Exp $ * *------------------------------------------------------------------------- */ @@ -401,7 +401,7 @@ GetUserNameFromId(AclId userid) if (!HeapTupleIsValid(tuple)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("invalid user id: %d", userid))); + errmsg("invalid user ID: %d", userid))); result = pstrdup(NameStr(((Form_pg_shadow) GETSTRUCT(tuple))->usename)); @@ -545,10 +545,10 @@ CreateLockFile(const char *filename, bool amPostmaster, errmsg("lock file \"%s\" already exists", filename), isDDLock ? - errhint("Is another %s (pid %d) running in \"%s\"?", + errhint("Is another %s (PID %d) running in data directory \"%s\"?", (encoded_pid < 0 ? "postgres" : "postmaster"), (int) other_pid, refName) : - errhint("Is another %s (pid %d) using \"%s\"?", + errhint("Is another %s (PID %d) using socket file \"%s\"?", (encoded_pid < 0 ? "postgres" : "postmaster"), (int) other_pid, refName))); } @@ -578,12 +578,12 @@ CreateLockFile(const char *filename, bool amPostmaster, ereport(FATAL, (errcode(ERRCODE_LOCK_FILE_EXISTS), errmsg("pre-existing shared memory block " - "(key %lu, id %lu) is still in use", + "(key %lu, ID %lu) is still in use", id1, id2), errhint("If you're sure there are no old " - "backends still running, remove " + "server processes still running, remove " "the shared memory block with " - "ipcrm(1), or just delete \"%s\".", + "the command \"ipcrm\", or just delete the file \"%s\".", filename))); } } @@ -600,7 +600,7 @@ CreateLockFile(const char *filename, bool amPostmaster, errmsg("could not remove old lock file \"%s\": %m", filename), errhint("The file seems accidentally left over, but " - "I couldn't remove it. Please remove the file " + "it could not be removed. Please remove the file " "by hand and try again."))); } @@ -723,7 +723,7 @@ RecordSharedMemoryInLockFile(unsigned long id1, unsigned long id2) { ereport(LOG, (errcode_for_file_access(), - errmsg("could not rewrite \"%s\": %m", + errmsg("could not open file \"%s\": %m", directoryLockFile))); return; } @@ -732,7 +732,7 @@ RecordSharedMemoryInLockFile(unsigned long id1, unsigned long id2) { ereport(LOG, (errcode_for_file_access(), - errmsg("could not read \"%s\": %m", + errmsg("could not read from file \"%s\": %m", directoryLockFile))); close(fd); return; @@ -772,7 +772,7 @@ RecordSharedMemoryInLockFile(unsigned long id1, unsigned long id2) errno = ENOSPC; ereport(LOG, (errcode_for_file_access(), - errmsg("could not write \"%s\": %m", + errmsg("could not write to file \"%s\": %m", directoryLockFile))); close(fd); return; @@ -884,7 +884,7 @@ process_preload_libraries(char *preload_libraries_string) freeList(elemlist); ereport(LOG, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("invalid list syntax for preload_libraries configuration option"))); + errmsg("invalid list syntax for parameter \"preload_libraries\""))); return; } diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 982916d438e..85bfc93c8bc 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.126 2003/08/04 02:40:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.127 2003/09/25 06:58:05 petere Exp $ * * *------------------------------------------------------------------------- @@ -369,7 +369,7 @@ InitPostgres(const char *dbname, const char *username) ereport(WARNING, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("no users are defined in this database system"), - errhint("You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'.", + errhint("You should immediately run CREATE USER \"%s\" WITH SYSID %d CREATEUSER;.", username, BOOTSTRAP_USESYSID))); } else diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 495c492e2b3..bebbf80370a 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -4,7 +4,7 @@ * (currently mule internal code (mic) is used) * Tatsuo Ishii * - * $Header: /cvsroot/pgsql/src/backend/utils/mb/mbutils.c,v 1.43 2003/08/04 00:43:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mb/mbutils.c,v 1.44 2003/09/25 06:58:05 petere Exp $ */ #include "postgres.h" @@ -249,7 +249,7 @@ pg_do_encoding_conversion(unsigned char *src, int len, { ereport(LOG, (errcode(ERRCODE_UNDEFINED_FUNCTION), - errmsg("default conversion proc for %s to %s does not exist", + errmsg("default conversion function for encoding \"%s\" to \"%s\" does not exist", pg_encoding_to_char(src_encoding), pg_encoding_to_char(dest_encoding)))); return src; diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c index 566ff571b56..0e19a6075f6 100644 --- a/src/backend/utils/mb/wchar.c +++ b/src/backend/utils/mb/wchar.c @@ -1,7 +1,7 @@ /* * conversion functions between pg_wchar and multibyte streams. * Tatsuo Ishii - * $Id: wchar.c,v 1.33 2003/08/04 00:43:27 momjian Exp $ + * $Id: wchar.c,v 1.34 2003/09/25 06:58:05 petere Exp $ * * WIN1250 client encoding updated by Pavel Behal * @@ -637,7 +637,7 @@ pg_verifymbstr(const unsigned char *mbstr, int len, bool noError) return false; ereport(ERROR, (errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE), - errmsg("UNICODE characters >= 0x10000 are not supported"))); + errmsg("Unicode characters greater than or equal to 0x10000 are not supported"))); } l = pg_mblen(mbstr); @@ -666,7 +666,7 @@ pg_verifymbstr(const unsigned char *mbstr, int len, bool noError) ereport(ERROR, (errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE), - errmsg("invalid %s character sequence: 0x%s", + errmsg("invalid byte sequence for encoding \"%s\": 0x%s", GetDatabaseEncodingName(), buf))); } } @@ -688,3 +688,6 @@ pg_database_encoding_max_length(void) } #endif + + + diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index 80846707280..64ff7e14de8 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -4,7 +4,7 @@ * * Copyright (c) 2000-2003, PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.18 2003/08/04 23:59:39 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc-file.l,v 1.19 2003/09/25 06:58:05 petere Exp $ */ %{ @@ -161,7 +161,7 @@ ProcessConfigFile(GucContext context) if (errno != ENOENT) ereport(elevel, (errcode_for_file_access(), - errmsg("could not read configuration file \"" CONFIG_FILENAME "\": %m"))); + errmsg("could not open configuration file \"%s\": %m", CONFIG_FILENAME))); return; } @@ -264,8 +264,8 @@ ProcessConfigFile(GucContext context) free_name_value_list(head); ereport(elevel, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("syntax error in \"" CONFIG_FILENAME "\" line %u, near token \"%s\"", - ConfigFileLineno, yytext))); + errmsg("syntax error in file \"%s\" line %u, near token \"%s\"", + CONFIG_FILENAME, ConfigFileLineno, yytext))); return; out_of_memory: diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index d8a76114de0..9386013ac1b 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.158 2003/09/15 22:28:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.159 2003/09/25 06:58:05 petere Exp $ * *-------------------------------------------------------------------- */ @@ -238,11 +238,11 @@ const char *const config_group_names[] = /* UNGROUPED */ gettext_noop("Ungrouped"), /* CONN_AUTH */ - gettext_noop("Connections & Authentication"), + gettext_noop("Connections and Authentication"), /* CONN_AUTH_SETTINGS */ - gettext_noop("Connections & Authentication / Connection Settings"), + gettext_noop("Connections and Authentication / Connection Settings"), /* CONN_AUTH_SECURITY */ - gettext_noop("Connections & Authentication / Security & Authentication"), + gettext_noop("Connections and Authentication / Security and Authentication"), /* RESOURCES */ gettext_noop("Resource Usage"), /* RESOURCES_MEM */ @@ -252,11 +252,11 @@ const char *const config_group_names[] = /* RESOURCES_KERNEL */ gettext_noop("Resource Usage / Kernel Resources"), /* WAL */ - gettext_noop("Write Ahead Log"), + gettext_noop("Write-Ahead Log"), /* WAL_SETTINGS */ - gettext_noop("Write Ahead Log / Settings"), + gettext_noop("Write-Ahead Log / Settings"), /* WAL_CHECKPOINTS */ - gettext_noop("Write Ahead Log / Checkpoints"), + gettext_noop("Write-Ahead Log / Checkpoints"), /* QUERY_TUNING */ gettext_noop("Query Tuning"), /* QUERY_TUNING_METHOD */ @@ -268,19 +268,19 @@ const char *const config_group_names[] = /* QUERY_TUNING_OTHER */ gettext_noop("Query Tuning / Other Planner Options"), /* LOGGING */ - gettext_noop("Reporting & Logging"), + gettext_noop("Reporting and Logging"), /* LOGGING_SYSLOG */ - gettext_noop("Reporting & Logging / Syslog"), + gettext_noop("Reporting and Logging / Syslog"), /* LOGGING_WHEN */ - gettext_noop("Reporting & Logging / When To Log"), + gettext_noop("Reporting and Logging / When to Log"), /* LOGGING_WHAT */ - gettext_noop("Reporting & Logging / What To Log"), + gettext_noop("Reporting and Logging / What to Log"), /* STATS */ gettext_noop("Statistics"), /* STATS_MONITORING */ gettext_noop("Statistics / Monitoring"), /* STATS_COLLECTOR */ - gettext_noop("Statistics / Query & Index Statistics Collector"), + gettext_noop("Statistics / Query and Index Statistics Collector"), /* CLIENT_CONN */ gettext_noop("Client Connection Defaults"), /* CLIENT_CONN_STATEMENT */ @@ -292,11 +292,11 @@ const char *const config_group_names[] = /* LOCK_MANAGEMENT */ gettext_noop("Lock Management"), /* COMPAT_OPTIONS */ - gettext_noop("Version & Platform Compatibility"), + gettext_noop("Version and Platform Compatibility"), /* COMPAT_OPTIONS_PREVIOUS */ - gettext_noop("Version & Platform Compatibility / Previous Postgres Versions"), + gettext_noop("Version and Platform Compatibility / Previous PostgreSQL Versions"), /* COMPAT_OPTIONS_CLIENT */ - gettext_noop("Version & Platform Compatibility / Other Platforms & Clients"), + gettext_noop("Version and Platform Compatibility / Other Platforms and Clients"), /* DEVELOPER_OPTIONS */ gettext_noop("Developer Options"), /* help_config wants this array to be null-terminated */ @@ -349,7 +349,7 @@ static struct config_bool ConfigureNamesBool[] = { { {"enable_seqscan", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable planner's use of sequential-scan plans"), + gettext_noop("enable planner's use of sequential-scan plans"), NULL }, &enable_seqscan, @@ -357,7 +357,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"enable_indexscan", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable planner's use of index-scan plans"), + gettext_noop("enable planner's use of index-scan plans"), NULL }, &enable_indexscan, @@ -365,7 +365,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"enable_tidscan", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable planner's use of TID scan plans"), + gettext_noop("enable planner's use of TID scan plans"), NULL }, &enable_tidscan, @@ -373,7 +373,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"enable_sort", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable planner's use of explicit sort steps"), + gettext_noop("enable planner's use of explicit sort steps"), NULL }, &enable_sort, @@ -381,7 +381,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"enable_hashagg", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable planner's use of hashed aggregation plans"), + gettext_noop("enable planner's use of hashed aggregation plans"), NULL }, &enable_hashagg, @@ -389,7 +389,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"enable_nestloop", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable planner's use of nested-loop join plans"), + gettext_noop("enable planner's use of nested-loop join plans"), NULL }, &enable_nestloop, @@ -397,7 +397,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"enable_mergejoin", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable planner's use of merge join plans"), + gettext_noop("enable planner's use of merge join plans"), NULL }, &enable_mergejoin, @@ -405,7 +405,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"enable_hashjoin", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable planner's use of hash join plans"), + gettext_noop("enable planner's use of hash join plans"), NULL }, &enable_hashjoin, @@ -413,7 +413,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"geqo", PGC_USERSET, QUERY_TUNING_GEQO, - gettext_noop("Enable genetic query optimization"), + gettext_noop("enable genetic query optimization"), gettext_noop("This algorithm attempts to do planning without " "exhaustive searching") }, @@ -423,7 +423,7 @@ static struct config_bool ConfigureNamesBool[] = { /* Not for general use --- used by SET SESSION AUTHORIZATION */ {"is_superuser", PGC_INTERNAL, UNGROUPED, - gettext_noop("Set to indicate current user's privilege status"), + gettext_noop("set to indicate current user's privilege status"), NULL, GUC_REPORT | GUC_NO_SHOW_ALL | GUC_NO_RESET_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -432,7 +432,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"tcpip_socket", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("Accept TCP/IP connections"), + gettext_noop("accept TCP/IP connections"), NULL }, &NetServer, @@ -440,7 +440,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"ssl", PGC_POSTMASTER, CONN_AUTH_SECURITY, - gettext_noop("Enables SSL connections"), + gettext_noop("enable SSL connections"), NULL }, &EnableSSL, @@ -448,23 +448,23 @@ static struct config_bool ConfigureNamesBool[] = }, { {"fsync", PGC_SIGHUP, WAL_SETTINGS, - gettext_noop("If on, server physically writes updates to disk"), - gettext_noop("It will use the fsync() system call in several places to make " + gettext_noop("force synchronization of updates to disk"), + gettext_noop("The server will use the fsync() system call in several places to make " "sure that updates are physically written to disk. This insures " "that a database cluster will recover to a consistent state after " - "an operating system or hardware crash") + "an operating system or hardware crash.") }, &enableFsync, true, NULL, NULL }, { {"zero_damaged_pages", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("Continues processing past damaged page headers"), + gettext_noop("continue processing past damaged page headers"), gettext_noop("Detection of a damaged page header normally causes PostgreSQL to " "report an error, aborting the current transaction. Setting " "zero_damaged_pages to true causes the system to instead report a " "warning, zero out the damaged page, and continue processing. This " - "behavior will destroy data, namely all the rows on the damaged page"), + "behavior will destroy data, namely all the rows on the damaged page."), GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, &zero_damaged_pages, @@ -472,16 +472,16 @@ static struct config_bool ConfigureNamesBool[] = }, { {"silent_mode", PGC_POSTMASTER, LOGGING_WHEN, - gettext_noop("Runs the server silently"), - gettext_noop("If this option is set, the server will automatically run in the" - "background and any controlling terminals are disassociated") + gettext_noop("run the server silently"), + gettext_noop("If this option is set, the server will automatically run in the " + "background and any controlling terminals are dissociated.") }, &SilentMode, false, NULL, NULL }, { {"log_connections", PGC_BACKEND, LOGGING_WHAT, - gettext_noop("Logs each successful connection"), + gettext_noop("log each successful connection"), NULL }, &Log_connections, @@ -489,7 +489,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"log_timestamp", PGC_SIGHUP, LOGGING_WHAT, - gettext_noop("Prefixes server log messages with a time stamp"), + gettext_noop("prefix server log messages with a time stamp"), NULL }, &Log_timestamp, @@ -497,7 +497,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"log_pid", PGC_SIGHUP, LOGGING_WHAT, - gettext_noop("Prefixes server log messages with the server PID"), + gettext_noop("prefix server log messages with the server PID"), NULL }, &Log_pid, @@ -507,9 +507,8 @@ static struct config_bool ConfigureNamesBool[] = #ifdef USE_ASSERT_CHECKING { {"debug_assertions", PGC_USERSET, DEVELOPER_OPTIONS, - gettext_noop("Turns on various assertion checks"), - gettext_noop("This is a debugging aid. To use this option, " - "PostgreSQL must be built with the configure option --enable-cassert"), + gettext_noop("turn on various assertion checks"), + gettext_noop("This is a debugging aid."), GUC_NOT_IN_SAMPLE }, &assert_enabled, @@ -520,7 +519,7 @@ static struct config_bool ConfigureNamesBool[] = { /* currently undocumented, so don't show in SHOW ALL */ {"exit_on_error", PGC_USERSET, UNGROUPED, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE }, @@ -529,7 +528,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"log_statement", PGC_USERLIMIT, LOGGING_WHAT, - gettext_noop("Causes each SQL statement to be logged"), + gettext_noop("log each SQL statement"), NULL }, &log_statement, @@ -537,7 +536,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"log_duration", PGC_USERLIMIT, LOGGING_WHAT, - gettext_noop("Duration of every completed statement is logged"), + gettext_noop("log duration each completed SQL statement"), NULL }, &log_duration, @@ -545,15 +544,15 @@ static struct config_bool ConfigureNamesBool[] = }, { {"debug_print_parse", PGC_USERSET, LOGGING_WHAT, - gettext_noop("Parse tree printed to server logs"), - gettext_noop("Parsed for each executed query") + gettext_noop("print parse tree to server logs"), + NULL }, &Debug_print_parse, false, NULL, NULL }, { {"debug_print_rewritten", PGC_USERSET, LOGGING_WHAT, - gettext_noop("Prints query rewriter output to server log"), + gettext_noop("print parse tree after rewriting to server log"), NULL }, &Debug_print_rewritten, @@ -561,7 +560,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"debug_print_plan", PGC_USERSET, LOGGING_WHAT, - gettext_noop("Prints execution plan to the server log"), + gettext_noop("print execution plan to the server log"), NULL }, &Debug_print_plan, @@ -569,7 +568,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"debug_pretty_print", PGC_USERSET, LOGGING_WHAT, - gettext_noop("Indents displays from parse, rewritten and plan"), + gettext_noop("indent parse and plan tree displays"), NULL }, &Debug_pretty_print, @@ -577,7 +576,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"log_parser_stats", PGC_USERLIMIT, STATS_MONITORING, - gettext_noop("Write parser performance stats to server log"), + gettext_noop("write parser performance statistics to server log"), NULL }, &log_parser_stats, @@ -585,7 +584,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"log_planner_stats", PGC_USERLIMIT, STATS_MONITORING, - gettext_noop("Write planner performance stats to server log"), + gettext_noop("write planner performance statistics to server log"), NULL }, &log_planner_stats, @@ -593,7 +592,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"log_executor_stats", PGC_USERLIMIT, STATS_MONITORING, - gettext_noop("Write executor performance stats to server log"), + gettext_noop("write executor performance statistics to server log"), NULL }, &log_executor_stats, @@ -601,7 +600,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"log_statement_stats", PGC_USERLIMIT, STATS_MONITORING, - gettext_noop("Write statement performance stats to server log"), + gettext_noop("write cumulative performance statistics to server log"), NULL }, &log_statement_stats, @@ -610,7 +609,7 @@ static struct config_bool ConfigureNamesBool[] = #ifdef BTREE_BUILD_STATS { {"log_btree_build_stats", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NOT_IN_SAMPLE }, @@ -621,7 +620,7 @@ static struct config_bool ConfigureNamesBool[] = { {"explain_pretty_print", PGC_USERSET, CLIENT_CONN_OTHER, - gettext_noop("Use indented output format for EXPLAIN VERBOSE"), + gettext_noop("use indented output format for EXPLAIN VERBOSE"), NULL }, &Explain_pretty_print, @@ -629,7 +628,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"stats_start_collector", PGC_POSTMASTER, STATS_COLLECTOR, - gettext_noop("Start server statistics-collection subprocess"), + gettext_noop("start server statistics-collection subprocess"), NULL }, &pgstat_collect_startcollector, @@ -637,7 +636,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"stats_reset_on_server_start", PGC_POSTMASTER, STATS_COLLECTOR, - gettext_noop("Collected statistics zeroed out on server restart"), + gettext_noop("zero collected statistics on server restart"), NULL }, &pgstat_collect_resetonpmstart, @@ -645,7 +644,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"stats_command_string", PGC_SUSET, STATS_COLLECTOR, - gettext_noop("Enable stat collection of executing commands"), + gettext_noop("collect statistics about executing commands"), gettext_noop("Enables the collection of statistics on the currently " "executing command of each session, along with the time " "at which that command began execution.") @@ -655,7 +654,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"stats_row_level", PGC_SUSET, STATS_COLLECTOR, - gettext_noop("Enable collection of row-level stats on db activity"), + gettext_noop("collect row-level statistics on database activity"), NULL }, &pgstat_collect_tuplelevel, @@ -663,7 +662,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"stats_block_level", PGC_SUSET, STATS_COLLECTOR, - gettext_noop("Enables collection of block-level stats on db activity"), + gettext_noop("collect block-level statistics on database activity"), NULL }, &pgstat_collect_blocklevel, @@ -672,7 +671,7 @@ static struct config_bool ConfigureNamesBool[] = { {"trace_notify", PGC_USERSET, DEVELOPER_OPTIONS, - gettext_noop("Generates debugging output for LISTEN and NOTIFY"), + gettext_noop("generate debugging output for LISTEN and NOTIFY"), NULL, GUC_NOT_IN_SAMPLE }, @@ -683,7 +682,7 @@ static struct config_bool ConfigureNamesBool[] = #ifdef LOCK_DEBUG { {"trace_locks", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NOT_IN_SAMPLE }, @@ -692,7 +691,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"trace_userlocks", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NOT_IN_SAMPLE }, @@ -701,7 +700,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"trace_lwlocks", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NOT_IN_SAMPLE }, @@ -710,7 +709,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"debug_deadlocks", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NOT_IN_SAMPLE }, @@ -721,18 +720,18 @@ static struct config_bool ConfigureNamesBool[] = { {"log_hostname", PGC_SIGHUP, LOGGING_WHAT, - gettext_noop("Log hostname to connection logs"), + gettext_noop("log host name in connection logs"), gettext_noop("By default, connection logs only show the IP address " "of the connecting host. If you want them to show the host name you " "can turn this on, but depending on your host name resolution " - "setup it might impose a non-negligible performance penalty") + "setup it might impose a non-negligible performance penalty.") }, &log_hostname, false, NULL, NULL }, { {"log_source_port", PGC_SIGHUP, LOGGING_WHAT, - gettext_noop("Log outgoing port number of the connecting host"), + gettext_noop("log outgoing port number of the connecting host"), NULL }, &LogSourcePort, @@ -741,48 +740,46 @@ static struct config_bool ConfigureNamesBool[] = { {"sql_inheritance", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS, - gettext_noop("This controls the inheritance semantics"), - gettext_noop("In particular, whether subtables are included by " - "various commands by default") + gettext_noop("include subtables by default in various commands"), + NULL }, &SQL_inheritance, true, NULL, NULL }, { {"australian_timezones", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("If true, ACST, CST, EST, and SAT are interpreted " - "as Australian time zones"), + gettext_noop("interpret ACST, CST, EST, and SAT as Australian time zones"), gettext_noop("Otherwise they are interpreted as North/South American " - "time zones and Saturday") + "time zones and Saturday.") }, &Australian_timezones, false, ClearDateCache, NULL }, { {"password_encryption", PGC_USERSET, CONN_AUTH_SECURITY, - gettext_noop("If unspecified the password is encrypted"), + gettext_noop("encrypt passwords"), gettext_noop("When a password is specified in CREATE USER or " "ALTER USER without writing either ENCRYPTED or UNENCRYPTED, " - "this option determines whether the password is to be encrypted") + "this option determines whether the password is to be encrypted.") }, &Password_encryption, true, NULL, NULL }, { {"transform_null_equals", PGC_USERSET, COMPAT_OPTIONS_CLIENT, - gettext_noop("expr=NULL treated as expr IS NULL"), + gettext_noop("treat \"expr=NULL\" as \"expr IS NULL\""), gettext_noop("When turned on, expressions of the form expr = NULL " "(or NULL = expr) are treated as expr IS NULL, that is, they " "return true if expr evaluates to the null value, and false " "otherwise. The correct behavior of expr = NULL is to always " - "return null (unknown)") + "return null (unknown).") }, &Transform_null_equals, false, NULL, NULL }, { {"db_user_namespace", PGC_SIGHUP, CONN_AUTH_SECURITY, - gettext_noop("This allows per-database user names"), + gettext_noop("enable per-database user names"), NULL }, &Db_user_namespace, @@ -791,8 +788,8 @@ static struct config_bool ConfigureNamesBool[] = { /* only here for backwards compatibility */ {"autocommit", PGC_USERSET, CLIENT_CONN_STATEMENT, - gettext_noop("This var doesn't do anything"), - gettext_noop("It's just here so that we won't choke on SET AUTOCOMMIT " + gettext_noop("no effect"), + gettext_noop("This parameter doesn't do anything. It's just here so that we won't choke on SET AUTOCOMMIT " "TO ON from 7.3-vintage clients."), GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE }, @@ -801,7 +798,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"default_transaction_read_only", PGC_USERSET, CLIENT_CONN_STATEMENT, - gettext_noop("Controls default read-only status of new transactions"), + gettext_noop("default read-only status of new transactions"), NULL }, &DefaultXactReadOnly, @@ -809,7 +806,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"transaction_read_only", PGC_USERSET, CLIENT_CONN_STATEMENT, - gettext_noop("Current transaction's read-only status"), + gettext_noop("current transaction's read-only status"), NULL, GUC_NO_RESET_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -818,7 +815,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"add_missing_from", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS, - gettext_noop("Add missing table references to FROM clauses"), + gettext_noop("automatically add missing table references to FROM clauses"), NULL }, &add_missing_from, @@ -836,38 +833,38 @@ static struct config_int ConfigureNamesInt[] = { { {"default_statistics_target", PGC_USERSET, QUERY_TUNING_OTHER, - gettext_noop("Sets the default statistics target"), + gettext_noop("set the default statistics target"), gettext_noop("This applies to table columns that have not had a " - "column-specific target set via ALTER TABLE SET STATISTICS") + "column-specific target set via ALTER TABLE SET STATISTICS.") }, &default_statistics_target, 10, 1, 1000, NULL, NULL }, { {"from_collapse_limit", PGC_USERSET, QUERY_TUNING_OTHER, - gettext_noop("From list size beyond which sub-queries are not " + gettext_noop("FROM-list size beyond which subqueries are not " "collapsed"), - gettext_noop("The planner will merge sub-queries into upper " + gettext_noop("The planner will merge subqueries into upper " "queries if the resulting FROM list would have no more than " - "this many items") + "this many items.") }, &from_collapse_limit, 8, 1, INT_MAX, NULL, NULL }, { {"join_collapse_limit", PGC_USERSET, QUERY_TUNING_OTHER, - gettext_noop("From list size beyond which JOIN constructs not " + gettext_noop("FROM-list size beyond which JOIN constructs are not " "flattened"), gettext_noop("The planner will flatten explicit inner JOIN " "constructs into lists of FROM items whenever a list of no more " - "than this many items would result") + "than this many items would result.") }, &join_collapse_limit, 8, 1, INT_MAX, NULL, NULL }, { {"geqo_threshold", PGC_USERSET, QUERY_TUNING_GEQO, - gettext_noop("Threshold of FROM items beyond which geqo is used"), + gettext_noop("threshold of FROM items beyond which GEQO is used"), NULL }, &geqo_threshold, @@ -875,7 +872,7 @@ static struct config_int ConfigureNamesInt[] = }, { {"geqo_pool_size", PGC_USERSET, QUERY_TUNING_GEQO, - gettext_noop("The number of individuals in one population"), + gettext_noop("GEQO: number of individuals in one population"), NULL }, &Geqo_pool_size, @@ -883,7 +880,7 @@ static struct config_int ConfigureNamesInt[] = }, { {"geqo_effort", PGC_USERSET, QUERY_TUNING_GEQO, - gettext_noop("Effort is used to calculate a default for generations"), + gettext_noop("GEQO: effort is used to calculate a default for generations"), NULL }, &Geqo_effort, @@ -891,9 +888,9 @@ static struct config_int ConfigureNamesInt[] = }, { {"geqo_generations", PGC_USERSET, QUERY_TUNING_GEQO, - gettext_noop("Specifies the number of iterations in the algorithm"), + gettext_noop("GEQO: number of iterations in the algorithm"), gettext_noop("The number must be a positive integer. If 0 is " - "specified then Effort * Log2(PoolSize) is used") + "specified then effort * log2(poolsize) is used") }, &Geqo_generations, 0, 0, INT_MAX, NULL, NULL @@ -901,7 +898,7 @@ static struct config_int ConfigureNamesInt[] = { {"deadlock_timeout", PGC_SIGHUP, LOCK_MANAGEMENT, - gettext_noop("Time to wait on lock (msec) before checking for deadlock"), + gettext_noop("time in milliseconds to wait on lock before checking for deadlock"), NULL }, &DeadlockTimeout, @@ -911,11 +908,11 @@ static struct config_int ConfigureNamesInt[] = #ifdef HAVE_SYSLOG { {"syslog", PGC_SIGHUP, LOGGING_SYSLOG, - gettext_noop("Allows the use of syslog for logging"), + gettext_noop("use syslog for logging"), gettext_noop("If this option is 1, messages go both to syslog " "and the standard output. A value of 2 sends output only to syslog. " "(Some messages will still go to the standard output/error.) The " - "default is 0, which means syslog is off") + "default is 0, which means syslog is off.") }, &Use_syslog, 0, 0, 2, NULL, NULL @@ -931,7 +928,7 @@ static struct config_int ConfigureNamesInt[] = */ { {"max_connections", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("Max number of concurrent connections"), + gettext_noop("maximum number of concurrent connections"), NULL }, &MaxBackends, @@ -940,7 +937,7 @@ static struct config_int ConfigureNamesInt[] = { {"superuser_reserved_connections", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("Number of connection \"slots\" reserved for superusers"), + gettext_noop("number of connection slots reserved for superusers"), NULL }, &ReservedBackends, @@ -949,7 +946,7 @@ static struct config_int ConfigureNamesInt[] = { {"shared_buffers", PGC_POSTMASTER, RESOURCES_MEM, - gettext_noop("The number of shared memory buffers used by the server"), + gettext_noop("number of shared memory buffers used by the server"), NULL }, &NBuffers, @@ -958,7 +955,7 @@ static struct config_int ConfigureNamesInt[] = { {"port", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("The TCP port the server listens on"), + gettext_noop("TCP port the server listens on"), NULL }, &PostPortNumber, @@ -967,8 +964,8 @@ static struct config_int ConfigureNamesInt[] = { {"unix_socket_permissions", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("Sets the access permissions of the Unix domain socket"), - gettext_noop("Unix domain sockets use the usual Unix file system " + gettext_noop("access permissions of the Unix-domain socket"), + gettext_noop("Unix-domain sockets use the usual Unix file system " "permission set. The option value is expected to be an numeric mode " "specification in the form accepted by the chmod and umask system " "calls. (To use the customary octal format the number must start with " @@ -980,7 +977,7 @@ static struct config_int ConfigureNamesInt[] = { {"sort_mem", PGC_USERSET, RESOURCES_MEM, - gettext_noop("Max memory to be used for sorts and hash tables"), + gettext_noop("maximum memory to be used for sorts and hash tables"), gettext_noop("Specifies the amount of memory to be used by internal " "sort operations and hash tables before switching to temporary disk " "files") @@ -991,7 +988,7 @@ static struct config_int ConfigureNamesInt[] = { {"vacuum_mem", PGC_USERSET, RESOURCES_MEM, - gettext_noop("Max mem used to keep track of to-be-reclaimed tuples"), + gettext_noop("maximum memory used to keep track of to-be-reclaimed rows"), NULL }, &VacuumMem, @@ -1000,7 +997,7 @@ static struct config_int ConfigureNamesInt[] = { {"max_files_per_process", PGC_BACKEND, RESOURCES_KERNEL, - gettext_noop("Max num of simultaneously open files for each subprocess"), + gettext_noop("maximum number of simultaneously open files for each server process"), NULL }, &max_files_per_process, @@ -1010,7 +1007,7 @@ static struct config_int ConfigureNamesInt[] = #ifdef LOCK_DEBUG { {"trace_lock_oidmin", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NOT_IN_SAMPLE }, @@ -1019,7 +1016,7 @@ static struct config_int ConfigureNamesInt[] = }, { {"trace_lock_table", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NOT_IN_SAMPLE }, @@ -1029,7 +1026,7 @@ static struct config_int ConfigureNamesInt[] = #endif { {"max_expr_depth", PGC_USERSET, CLIENT_CONN_OTHER, - gettext_noop("Max expression nesting depth"), + gettext_noop("maximum expression nesting depth"), NULL }, &max_expr_depth, @@ -1038,8 +1035,8 @@ static struct config_int ConfigureNamesInt[] = { {"statement_timeout", PGC_USERSET, CLIENT_CONN_STATEMENT, - gettext_noop("Max allowed duration (msec) of any statement"), - gettext_noop("A value of 0 turns off the timeout") + gettext_noop("maximum allowed duration (in milliseconds) of any statement"), + gettext_noop("A value of 0 turns off the timeout.") }, &StatementTimeout, 0, 0, INT_MAX, NULL, NULL @@ -1047,7 +1044,7 @@ static struct config_int ConfigureNamesInt[] = { {"max_fsm_relations", PGC_POSTMASTER, RESOURCES_FSM, - gettext_noop("Max num. of tables+indexes for which free space is " + gettext_noop("maximum number of tables and indexes for which free space is " "tracked"), NULL }, @@ -1056,7 +1053,7 @@ static struct config_int ConfigureNamesInt[] = }, { {"max_fsm_pages", PGC_POSTMASTER, RESOURCES_FSM, - gettext_noop("Max num. of disk pages for which free space is " + gettext_noop("maximum number of disk pages for which free space is " "tracked"), NULL }, @@ -1066,7 +1063,7 @@ static struct config_int ConfigureNamesInt[] = { {"max_locks_per_transaction", PGC_POSTMASTER, LOCK_MANAGEMENT, - gettext_noop("Max locks per transaction"), + gettext_noop("maximum number of locks per transaction"), gettext_noop("The shared lock table is sized on the assumption that " "at most max_locks_per_transaction * max_connections distinct " "objects will need to be locked at any one time.") @@ -1077,7 +1074,7 @@ static struct config_int ConfigureNamesInt[] = { {"authentication_timeout", PGC_SIGHUP, CONN_AUTH_SECURITY, - gettext_noop("Max time (sec) to complete client authentication"), + gettext_noop("maximum time in seconds to complete client authentication"), NULL }, &AuthenticationTimeout, @@ -1087,7 +1084,7 @@ static struct config_int ConfigureNamesInt[] = { /* Not for general use */ {"pre_auth_delay", PGC_SIGHUP, DEVELOPER_OPTIONS, - gettext_noop("No Description Available"), + gettext_noop("no description available"), NULL, GUC_NOT_IN_SAMPLE }, @@ -1097,7 +1094,7 @@ static struct config_int ConfigureNamesInt[] = { {"checkpoint_segments", PGC_SIGHUP, WAL_CHECKPOINTS, - gettext_noop("Max distance between automatic WAL checkpoints"), + gettext_noop("maximum distance between automatic WAL checkpoints"), NULL }, &CheckPointSegments, @@ -1106,7 +1103,7 @@ static struct config_int ConfigureNamesInt[] = { {"checkpoint_timeout", PGC_SIGHUP, WAL_CHECKPOINTS, - gettext_noop("Max time (sec) between automatic WAL checkpoints"), + gettext_noop("maximum time in seconds between automatic WAL checkpoints"), NULL }, &CheckPointTimeout, @@ -1115,8 +1112,8 @@ static struct config_int ConfigureNamesInt[] = { {"checkpoint_warning", PGC_SIGHUP, WAL_CHECKPOINTS, - gettext_noop("Log if filling of checkpoint segments happens more " - "frequently than this (sec)"), + gettext_noop("log if filling of checkpoint segments happens more " + "frequently than this (in seconds)"), gettext_noop("Send a message to the server logs if checkpoints " "caused by the filling of checkpoint segment files happens more " "frequently than this number of seconds. Zero turns off the warning.") @@ -1127,7 +1124,7 @@ static struct config_int ConfigureNamesInt[] = { {"wal_buffers", PGC_POSTMASTER, WAL_SETTINGS, - gettext_noop("Disk-page buffers in shared memory for WAL logging"), + gettext_noop("disk-page buffers in shared memory for WAL"), NULL }, &XLOGbuffers, @@ -1136,7 +1133,7 @@ static struct config_int ConfigureNamesInt[] = { {"wal_debug", PGC_SUSET, DEVELOPER_OPTIONS, - gettext_noop("If nonzero, log WAL-related debugging output"), + gettext_noop("if nonzero, log WAL-related debugging output"), NULL, GUC_NOT_IN_SAMPLE }, @@ -1146,7 +1143,7 @@ static struct config_int ConfigureNamesInt[] = { {"commit_delay", PGC_USERSET, WAL_CHECKPOINTS, - gettext_noop("Delay (usec) between transaction commit and " + gettext_noop("delay in microseconds between transaction commit and " "flushing WAL to disk"), NULL }, @@ -1156,8 +1153,8 @@ static struct config_int ConfigureNamesInt[] = { {"commit_siblings", PGC_USERSET, WAL_CHECKPOINTS, - gettext_noop("Min concurrent open trans. before performing " - "COMMIT_DELAY"), + gettext_noop("minimum concurrent open transactions before performing " + "commit_delay"), NULL }, &CommitSiblings, @@ -1166,11 +1163,10 @@ static struct config_int ConfigureNamesInt[] = { {"extra_float_digits", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Adjusts number of digits displayed for " - "floating-point values"), - gettext_noop("This affects float4, float8, and geometric data types. " + gettext_noop("number of digits displayed for floating-point values"), + gettext_noop("This affects real, double precision, and geometric data types. " "The parameter value is added to the standard number of digits " - "(FLT_DIG or DBL_DIG as appropriate)") + "(FLT_DIG or DBL_DIG as appropriate).") }, &extra_float_digits, 0, -15, 2, NULL, NULL @@ -1178,7 +1174,7 @@ static struct config_int ConfigureNamesInt[] = { {"log_min_duration_statement", PGC_USERLIMIT, LOGGING_WHEN, - gettext_noop("Min execution time (msec) above which statements will " + gettext_noop("minimum execution time in milliseconds above which statements will " "be logged"), gettext_noop("The default is 0 (turning this feature off).") }, @@ -1197,7 +1193,7 @@ static struct config_real ConfigureNamesReal[] = { { {"effective_cache_size", PGC_USERSET, QUERY_TUNING_COST, - gettext_noop("Planner's assumption about size of the disk cache"), + gettext_noop("planner's assumption about size of the disk cache"), gettext_noop("That is, the portion of the kernel's disk cache that " "will be used for PostgreSQL data files. This is measured in disk " "pages, which are normally 8 kB each.") @@ -1207,7 +1203,7 @@ static struct config_real ConfigureNamesReal[] = }, { {"random_page_cost", PGC_USERSET, QUERY_TUNING_COST, - gettext_noop("Planner's estimate of the cost of a nonsequentially " + gettext_noop("planner's estimate of the cost of a nonsequentially " "fetched disk page"), gettext_noop("This is measured as a multiple of the cost of a " "sequential page fetch. A higher value makes it more likely a " @@ -1219,7 +1215,7 @@ static struct config_real ConfigureNamesReal[] = }, { {"cpu_tuple_cost", PGC_USERSET, QUERY_TUNING_COST, - gettext_noop("Planner's estimate of the cost of processing each tuple"), + gettext_noop("planner's estimate of the cost of processing each tuple (row)"), gettext_noop("This is measured as a fraction of the cost of a " "sequential page fetch.") }, @@ -1228,8 +1224,8 @@ static struct config_real ConfigureNamesReal[] = }, { {"cpu_index_tuple_cost", PGC_USERSET, QUERY_TUNING_COST, - gettext_noop("Planner's estimate of processing cost for each " - "index tuple during index scan"), + gettext_noop("planner's estimate of processing cost for each " + "index tuple (row) during index scan"), gettext_noop("This is measured as a fraction of the cost of a " "sequential page fetch.") }, @@ -1238,7 +1234,7 @@ static struct config_real ConfigureNamesReal[] = }, { {"cpu_operator_cost", PGC_USERSET, QUERY_TUNING_COST, - gettext_noop("Planner's estimate of processing cost of each op. in WHERE"), + gettext_noop("planner's estimate of processing cost of each operator in WHERE"), gettext_noop("This is measured as a fraction of the cost of a sequential " "page fetch.") }, @@ -1248,7 +1244,7 @@ static struct config_real ConfigureNamesReal[] = { {"geqo_selection_bias", PGC_USERSET, QUERY_TUNING_GEQO, - gettext_noop("The selective pressure within the population"), + gettext_noop("GEQO: selective pressure within the population"), NULL }, &Geqo_selection_bias, @@ -1258,7 +1254,7 @@ static struct config_real ConfigureNamesReal[] = { {"seed", PGC_USERSET, UNGROUPED, - gettext_noop("Seed for random-number generation"), + gettext_noop("seed for random-number generation"), NULL, GUC_NO_SHOW_ALL | GUC_NO_RESET_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -1277,7 +1273,7 @@ static struct config_string ConfigureNamesString[] = { { {"client_encoding", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Client's character set encoding"), + gettext_noop("client's character set encoding"), NULL, GUC_REPORT }, @@ -1287,7 +1283,7 @@ static struct config_string ConfigureNamesString[] = { {"client_min_messages", PGC_USERSET, LOGGING_WHEN, - gettext_noop("Controls which message levels are sent to the client"), + gettext_noop("message levels that are sent to the client"), gettext_noop("Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, " "DEBUG1, LOG, NOTICE, WARNING, and ERROR. Each level includes all the " "levels that follow it. The later the level, the fewer messages are " @@ -1299,10 +1295,10 @@ static struct config_string ConfigureNamesString[] = { {"log_min_messages", PGC_USERLIMIT, LOGGING_WHEN, - gettext_noop("Controls which message levels logged"), + gettext_noop("message levels that are logged"), gettext_noop("Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, " "INFO, NOTICE, WARNING, ERROR, LOG, FATAL, and PANIC. Each level " - "includes all the levels that follow it") + "includes all the levels that follow it.") }, &log_min_messages_str, "notice", assign_log_min_messages, NULL @@ -1310,8 +1306,8 @@ static struct config_string ConfigureNamesString[] = { {"log_error_verbosity", PGC_SUSET, LOGGING_WHEN, - gettext_noop("Controls verbosity of logged messages"), - gettext_noop("Valid values are 'terse', 'default', and 'verbose'") + gettext_noop("verbosity of logged messages"), + gettext_noop("Valid values are \"terse\", \"default\", and \"verbose\".") }, &log_error_verbosity_str, "default", assign_log_error_verbosity, NULL @@ -1319,9 +1315,9 @@ static struct config_string ConfigureNamesString[] = { {"log_min_error_statement", PGC_USERLIMIT, LOGGING_WHEN, - gettext_noop("Controls whether the erroneous statement is logged"), + gettext_noop("log statement generating error at or above this level"), gettext_noop("All SQL statements that cause an error of the " - "specified level, or a higher level, are logged") + "specified level or a higher level are logged.") }, &log_min_error_statement_str, "panic", assign_min_error_statement, NULL @@ -1329,9 +1325,9 @@ static struct config_string ConfigureNamesString[] = { {"DateStyle", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Sets display format for date and time values"), + gettext_noop("display format for date and time values"), gettext_noop("Also controls interpretation of ambiguous " - "date inputs"), + "date inputs."), GUC_LIST_INPUT | GUC_REPORT }, &datestyle_string, @@ -1340,7 +1336,7 @@ static struct config_string ConfigureNamesString[] = { {"default_transaction_isolation", PGC_USERSET, CLIENT_CONN_STATEMENT, - gettext_noop("The default isolation level of each new transaction"), + gettext_noop("transaction isolation level of each new transaction"), gettext_noop("Each SQL transaction has an isolation level, which " "can be either \"read committed\" or \"serializable\".") }, @@ -1350,7 +1346,7 @@ static struct config_string ConfigureNamesString[] = { {"dynamic_library_path", PGC_SUSET, CLIENT_CONN_OTHER, - gettext_noop("Path for dynamically loadable modules"), + gettext_noop("path for dynamically loadable modules"), gettext_noop("If a dynamically loadable module needs to be opened and " "the specified name does not have a directory component (i.e. the " "name does not contain a slash), the system will search this path for " @@ -1362,7 +1358,7 @@ static struct config_string ConfigureNamesString[] = { {"krb_server_keyfile", PGC_POSTMASTER, CONN_AUTH_SECURITY, - gettext_noop("The location of the Kerberos server key file"), + gettext_noop("location of the Kerberos server key file"), NULL }, &pg_krb_server_keyfile, @@ -1371,7 +1367,7 @@ static struct config_string ConfigureNamesString[] = { {"rendezvous_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("The Rendezvous broadcast service name"), + gettext_noop("Rendezvous broadcast service name"), NULL }, &rendezvous_name, @@ -1382,7 +1378,7 @@ static struct config_string ConfigureNamesString[] = { {"lc_collate", PGC_INTERNAL, CLIENT_CONN_LOCALE, - gettext_noop("Locale collation order"), + gettext_noop("collation order locale"), NULL, GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -1392,7 +1388,7 @@ static struct config_string ConfigureNamesString[] = { {"lc_ctype", PGC_INTERNAL, CLIENT_CONN_LOCALE, - gettext_noop("Locale character classification and case conversion"), + gettext_noop("character classification and case conversion locale"), NULL, GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -1402,7 +1398,7 @@ static struct config_string ConfigureNamesString[] = { {"lc_messages", PGC_SUSET, CLIENT_CONN_LOCALE, - gettext_noop("Language in which messages are displayed"), + gettext_noop("language in which messages are displayed"), NULL }, &locale_messages, @@ -1411,7 +1407,7 @@ static struct config_string ConfigureNamesString[] = { {"lc_monetary", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Locale for formatting monetary amounts"), + gettext_noop("locale for formatting monetary amounts"), NULL }, &locale_monetary, @@ -1420,7 +1416,7 @@ static struct config_string ConfigureNamesString[] = { {"lc_numeric", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Locale for formatting numbers"), + gettext_noop("locale for formatting numbers"), NULL }, &locale_numeric, @@ -1429,7 +1425,7 @@ static struct config_string ConfigureNamesString[] = { {"lc_time", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Locale for formatting date and time values"), + gettext_noop("locale for formatting date and time values"), NULL }, &locale_time, @@ -1438,7 +1434,7 @@ static struct config_string ConfigureNamesString[] = { {"preload_libraries", PGC_POSTMASTER, RESOURCES_KERNEL, - gettext_noop("Shared libraries to preload into postmaster"), + gettext_noop("shared libraries to preload into server"), NULL, GUC_LIST_INPUT | GUC_LIST_QUOTE }, @@ -1448,8 +1444,8 @@ static struct config_string ConfigureNamesString[] = { {"regex_flavor", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS, - gettext_noop("Regular expression \"flavor\""), - gettext_noop("This can be set to advanced, extended, or basic") + gettext_noop("regular expression \"flavor\""), + gettext_noop("This can be set to advanced, extended, or basic.") }, ®ex_flavor_string, "advanced", assign_regex_flavor, NULL @@ -1457,7 +1453,7 @@ static struct config_string ConfigureNamesString[] = { {"search_path", PGC_USERSET, CLIENT_CONN_STATEMENT, - gettext_noop("Schema search order for names not schema-qualified"), + gettext_noop("schema search order for names not schema-qualified"), NULL, GUC_LIST_INPUT | GUC_LIST_QUOTE }, @@ -1468,7 +1464,7 @@ static struct config_string ConfigureNamesString[] = { /* Can't be set in postgresql.conf */ {"server_encoding", PGC_INTERNAL, CLIENT_CONN_LOCALE, - gettext_noop("Server (database) character set encoding"), + gettext_noop("server (database) character set encoding"), NULL, GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -1479,7 +1475,7 @@ static struct config_string ConfigureNamesString[] = { /* Can't be set in postgresql.conf */ {"server_version", PGC_INTERNAL, UNGROUPED, - gettext_noop("Server version"), + gettext_noop("server version"), NULL, GUC_REPORT | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -1490,7 +1486,7 @@ static struct config_string ConfigureNamesString[] = { /* Not for general use --- used by SET SESSION AUTHORIZATION */ {"session_authorization", PGC_USERSET, UNGROUPED, - gettext_noop("Current session userid"), + gettext_noop("session user name"), NULL, GUC_REPORT | GUC_NO_SHOW_ALL | GUC_NO_RESET_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -1502,15 +1498,15 @@ static struct config_string ConfigureNamesString[] = { {"syslog_facility", PGC_POSTMASTER, LOGGING_SYSLOG, gettext_noop("syslog \"facility\" to be used when syslog enabled"), - gettext_noop("You may choose from LOCAL0, LOCAL1, LOCAL2, LOCAL3, " - "LOCAL4, LOCAL5, LOCAL6, LOCAL7") + gettext_noop("Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, " + "LOCAL4, LOCAL5, LOCAL6, LOCAL7.") }, &Syslog_facility, "LOCAL0", assign_facility, NULL }, { {"syslog_ident", PGC_POSTMASTER, LOGGING_SYSLOG, - gettext_noop("Program name used to identify PostgreSQL messages " + gettext_noop("program name used to identify PostgreSQL messages " "in syslog"), NULL }, @@ -1521,7 +1517,7 @@ static struct config_string ConfigureNamesString[] = { {"TimeZone", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Time zone for displaying and interpreting time stamps"), + gettext_noop("time zone for displaying and interpreting time stamps"), NULL }, &timezone_string, @@ -1530,7 +1526,7 @@ static struct config_string ConfigureNamesString[] = { {"transaction_isolation", PGC_USERSET, CLIENT_CONN_STATEMENT, - gettext_noop("Current transaction's isolation level"), + gettext_noop("current transaction's isolation level"), NULL, GUC_NO_RESET_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE }, @@ -1540,7 +1536,7 @@ static struct config_string ConfigureNamesString[] = { {"unix_socket_group", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("The owning group of the Unix-domain socket"), + gettext_noop("owning group of the Unix-domain socket"), gettext_noop("(The owning user of the socket is always the user " "that starts the server.)") }, @@ -1550,7 +1546,7 @@ static struct config_string ConfigureNamesString[] = { {"unix_socket_directory", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("Directory where the Unix-domain socket will be created"), + gettext_noop("directory where the Unix-domain socket will be created"), NULL }, &UnixSocketDir, @@ -1559,7 +1555,7 @@ static struct config_string ConfigureNamesString[] = { {"virtual_host", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("The host name or IP address to listen to"), + gettext_noop("host name or IP address to listen to"), NULL }, &VirtualHost, @@ -1568,7 +1564,7 @@ static struct config_string ConfigureNamesString[] = { {"wal_sync_method", PGC_SIGHUP, WAL_SETTINGS, - gettext_noop("Method used for forcing WAL updates out to disk"), + gettext_noop("method used for forcing WAL updates out to disk"), NULL }, &XLOG_sync_method, @@ -2401,7 +2397,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("\"%s\" is not a recognized option", name))); + errmsg("unrecognized configuration parameter \"%s\"", name))); return false; } @@ -2420,7 +2416,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("\"%s\" cannot be changed", + errmsg("parameter \"%s\" cannot be changed", name))); return false; } @@ -2432,7 +2428,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("\"%s\" cannot be changed after server start", + errmsg("parameter \"%s\" cannot be changed after server start", name))); return false; } @@ -2442,7 +2438,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("\"%s\" cannot be changed now", + errmsg("parameter \"%s\" cannot be changed now", name))); return false; } @@ -2472,7 +2468,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM), - errmsg("\"%s\" cannot be set after connection start", + errmsg("parameter \"%s\" cannot be set after connection start", name))); return false; } @@ -2482,7 +2478,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("permission denied to set option \"%s\"", + errmsg("permission denied to set parameter \"%s\"", name))); return false; } @@ -2540,7 +2536,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("\"%s\" requires a boolean value", + errmsg("parameter \"%s\" requires a Boolean value", name))); return false; } @@ -2552,7 +2548,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("permission denied to set option \"%s\"", + errmsg("permission denied to set parameter \"%s\"", name), errhint("Must be superuser to change this value to false."))); return false; @@ -2576,7 +2572,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid value for \"%s\": %d", + errmsg("invalid value for parameter \"%s\": %d", name, (int) newval))); return false; } @@ -2628,7 +2624,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("\"%s\" requires an integer value", + errmsg("parameter \"%s\" requires an integer value", name))); return false; } @@ -2636,7 +2632,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("%d is outside the valid range for \"%s\" (%d .. %d)", + errmsg("%d is outside the valid range for parameter \"%s\" (%d .. %d)", newval, name, conf->min, conf->max))); return false; } @@ -2649,7 +2645,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("permission denied to set option \"%s\"", + errmsg("permission denied to set parameter \"%s\"", name), errhint("Must be superuser to increase this value or set it to zero."))); return false; @@ -2673,7 +2669,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid value for \"%s\": %d", + errmsg("invalid value for parameter \"%s\": %d", name, newval))); return false; } @@ -2725,7 +2721,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("\"%s\" requires a numeric value", + errmsg("parameter \"%s\" requires a numeric value", name))); return false; } @@ -2733,7 +2729,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("%g is outside the valid range for \"%s\" (%g .. %g)", + errmsg("%g is outside the valid range for parameter \"%s\" (%g .. %g)", newval, name, conf->min, conf->max))); return false; } @@ -2745,7 +2741,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("permission denied to set option \"%s\"", + errmsg("permission denied to set parameter \"%s\"", name), errhint("Must be superuser to increase this value."))); return false; @@ -2769,7 +2765,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid value for \"%s\": %g", + errmsg("invalid value for parameter \"%s\": %g", name, newval))); return false; } @@ -2844,7 +2840,7 @@ set_config_option(const char *name, const char *value, { ereport(elevel, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("permission denied to set option \"%s\"", + errmsg("permission denied to set parameter \"%s\"", name), errhint("Must be superuser to increase this value."))); return false; @@ -2900,7 +2896,7 @@ set_config_option(const char *name, const char *value, free(newval); ereport(elevel, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid value for \"%s\": \"%s\"", + errmsg("invalid value for parameter \"%s\": \"%s\"", name, value ? value : ""))); return false; } @@ -3006,7 +3002,7 @@ GetConfigOption(const char *name) if (record == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("\"%s\" is not a recognized option", name))); + errmsg("unrecognized configuration parameter \"%s\"", name))); switch (record->vartype) { @@ -3042,7 +3038,7 @@ GetConfigOptionResetString(const char *name) if (record == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("\"%s\" is not a recognized option", name))); + errmsg("unrecognized configuration parameter \"%s\"", name))); switch (record->vartype) { @@ -3098,7 +3094,7 @@ flatten_set_variable_args(const char *name, List *args) if (record == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("\"%s\" is not a recognized option", name))); + errmsg("unrecognized configuration parameter \"%s\"", name))); flags = record->flags; @@ -3211,7 +3207,7 @@ set_config_by_name(PG_FUNCTION_ARGS) if (PG_ARGISNULL(0)) ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), - errmsg("SET variable name is required"))); + errmsg("SET requires parameter name"))); /* Get the GUC variable name */ name = DatumGetCString(DirectFunctionCall1(textout, PG_GETARG_DATUM(0))); @@ -3392,7 +3388,7 @@ GetConfigOptionByName(const char *name, const char **varname) if (record == NULL) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("\"%s\" is not a recognized option", name))); + errmsg("unrecognized configuration parameter \"%s\"", name))); if (varname) *varname = record->name; @@ -3768,8 +3764,7 @@ write_nondefault_variables(GucContext context) free(filename); ereport(elevel, (errcode_for_file_access(), - errmsg("could not write exec config params file \"" - CONFIG_EXEC_PARAMS "\": %m"))); + errmsg("could not write to file \"%s\": %m", CONFIG_EXEC_PARAMS))); return; } @@ -3904,8 +3899,7 @@ read_nondefault_variables(void) if (errno != ENOENT) ereport(FATAL, (errcode_for_file_access(), - errmsg("could not read exec config params file \"" - CONFIG_EXEC_PARAMS "\": %m"))); + errmsg("could not read from file \"%s\": %m", CONFIG_EXEC_PARAMS))); return; } @@ -4024,7 +4018,7 @@ ProcessGUCArray(ArrayType *array, GucSource source) { ereport(WARNING, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("could not parse setting for \"%s\"", name))); + errmsg("could not parse setting for parameter \"%s\"", name))); free(name); continue; } diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c index b056a71a3b2..c3f70b625fe 100644 --- a/src/backend/utils/misc/help_config.c +++ b/src/backend/utils/misc/help_config.c @@ -25,7 +25,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/help_config.c,v 1.5 2003/08/08 21:42:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/help_config.c,v 1.6 2003/09/25 06:58:06 petere Exp $ * *------------------------------------------------------------------------- */ @@ -59,28 +59,28 @@ enum outputFormat }; static const char *const GENERIC_FORMAT[] = { - gettext_noop("Name : %-20s \nContext : %-20s \nGroup : %-20s\n"), - gettext_noop("%s\t%s\t%s\t") + gettext_noop("Name: %-20s\nContext: %-20s\nGroup: %-20s\n"), + "%s\t%s\t%s\t" }; static const char *const GENERIC_DESC[] = { gettext_noop("Description: %s\n%s\n"), - gettext_noop("%s %s\n") + "%s\t%s\n" }; static const char *const BOOL_FORMAT[] = { - gettext_noop("Type : BOOL\nReset Value: %-s \n"), - gettext_noop("BOOL\t%s\t\t\t") + gettext_noop("Type: Boolean\nReset value: %-s\n"), + "BOOL\t%s\t\t\t" }; static const char *const INT_FORMAT[] = { - gettext_noop("Type : INT\nReset Value: %-20d \nMin Value : %-20d \nMax Value : %-20d \n"), - gettext_noop("INT\t%d\t%d\t%d\t") + gettext_noop("Type: integer\nReset value: %-20d\nMin value: %-20d\nMax value: %-20d\n"), + "INT\t%d\t%d\t%d\t" }; static const char *const REAL_FORMAT[] = { - gettext_noop("Type : REAL\nReset Value: %-20g \nMin Value : %-20g \nMax Value : %-20g \n"), - gettext_noop("REAL\t%g\t%g\t%g\t") + gettext_noop("Type: real\nReset value: %-20g\nMin value: %-20g\nMax value: %-20g\n"), + "REAL\t%g\t%g\t%g\t" }; static const char *const STRING_FORMAT[] = { - gettext_noop("Type : STRING\nReset Value: %-s \n"), - gettext_noop("STRING\t%s\t\t\t") + gettext_noop("Type: string\nReset value: %-s\n"), + "STRING\t%s\t\t\t" }; static const char *const COLUMN_HEADER[] = { "", |