Message style fixes

5 files changed, 22 insertions, 22 deletions

diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index e8354dee44b..afa434cfee2 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -95,8 +95,8 @@ scanint8(const char *str, bool errorOK, int64 *result)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for %s: \"%s\"",
-							"integer", str)));
+					 errmsg("invalid input syntax for integer: \"%s\"",
+							str)));
 	}
 
 	/* process digits */
@@ -130,8 +130,8 @@ gotdigits:
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for %s: \"%s\"",
-							"integer", str)));
+					 errmsg("invalid input syntax for integer: \"%s\"",
+							str)));
 	}
 
 	*result = (sign < 0) ? -tmp : tmp;
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 4779e74895c..41c6139b6a8 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -2314,7 +2314,7 @@ populate_array_report_expected_array(PopulateArrayContext *ctx, int ndim)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 					 errmsg("expected json array"),
-					 errhint("see the value of key \"%s\"", ctx->colname)));
+					 errhint("See the value of key \"%s\".", ctx->colname)));
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
@@ -2336,13 +2336,13 @@ populate_array_report_expected_array(PopulateArrayContext *ctx, int ndim)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 					 errmsg("expected json array"),
-					 errhint("see the array element %s of key \"%s\"",
+					 errhint("See the array element %s of key \"%s\".",
 							 indices.data, ctx->colname)));
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 					 errmsg("expected json array"),
-					 errhint("see the array element %s",
+					 errhint("See the array element %s.",
 							 indices.data)));
 	}
 }
diff --git a/src/backend/utils/adt/mac8.c b/src/backend/utils/adt/mac8.c
index 482d1fb5bf3..e0c655844fb 100644
--- a/src/backend/utils/adt/mac8.c
+++ b/src/backend/utils/adt/mac8.c
@@ -553,8 +553,8 @@ macaddr8tomacaddr(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("macaddr8 data out of range to convert to macaddr"),
 				 errhint("Only addresses that have FF and FE as values in the "
-						 "4th and 5th bytes, from the left, for example: "
-						 "XX-XX-XX-FF-FE-XX-XX-XX, are eligible to be converted "
+						 "4th and 5th bytes from the left, for example "
+						 "xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted "
 						 "from macaddr8 to macaddr.")));
 
 	result->a = addr->a;
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 07682723b78..244904ea940 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -48,8 +48,8 @@ pg_atoi(const char *s, int size, int c)
 	if (*s == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for %s: \"%s\"",
-						"integer", s)));
+				 errmsg("invalid input syntax for integer: \"%s\"",
+						s)));
 
 	errno = 0;
 	l = strtol(s, &badp, 10);
@@ -58,8 +58,8 @@ pg_atoi(const char *s, int size, int c)
 	if (s == badp)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for %s: \"%s\"",
-						"integer", s)));
+				 errmsg("invalid input syntax for integer: \"%s\"",
+						s)));
 
 	switch (size)
 	{
@@ -102,8 +102,8 @@ pg_atoi(const char *s, int size, int c)
 	if (*badp && *badp != c)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for %s: \"%s\"",
-						"integer", s)));
+				 errmsg("invalid input syntax for integer: \"%s\"",
+						s)));
 
 	return (int32) l;
 }
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index 5dd996f62c4..1e38ca2aa5e 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -132,8 +132,8 @@ TransactionIdInRecentPast(uint64 xid_with_epoch, TransactionId *extracted_xid)
 		|| (xid_epoch == now_epoch && xid > now_epoch_last_xid))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("transaction ID " UINT64_FORMAT " is in the future",
-						xid_with_epoch)));
+				 errmsg("transaction ID %s is in the future",
+						psprintf(UINT64_FORMAT, xid_with_epoch))));
 
 	/*
 	 * ShmemVariableCache->oldestClogXid is protected by CLogTruncationLock,
@@ -755,11 +755,11 @@ txid_status(PG_FUNCTION_ARGS)
 		Assert(TransactionIdIsValid(xid));
 
 		if (TransactionIdIsCurrentTransactionId(xid))
-			status = gettext_noop("in progress");
+			status = "in progress";
 		else if (TransactionIdDidCommit(xid))
-			status = gettext_noop("committed");
+			status = "committed";
 		else if (TransactionIdDidAbort(xid))
-			status = gettext_noop("aborted");
+			status = "aborted";
 		else
 		{
 			/*
@@ -774,9 +774,9 @@ txid_status(PG_FUNCTION_ARGS)
 			 * checked commit/abort status).
 			 */
 			if (TransactionIdPrecedes(xid, GetActiveSnapshot()->xmin))
-				status = gettext_noop("aborted");
+				status = "aborted";
 			else
-				status = gettext_noop("in progress");
+				status = "in progress";
 		}
 	}
 	else