diff options
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/adt/pg_locale.c | 2 | ||||
-rw-r--r-- | src/backend/utils/adt/rangetypes_typanalyze.c | 2 | ||||
-rw-r--r-- | src/backend/utils/adt/txid.c | 2 | ||||
-rw-r--r-- | src/backend/utils/adt/varlena.c | 2 | ||||
-rw-r--r-- | src/backend/utils/adt/xml.c | 2 | ||||
-rwxr-xr-x | src/backend/utils/misc/check_guc | 2 | ||||
-rw-r--r-- | src/backend/utils/mmgr/slab.c | 2 | ||||
-rw-r--r-- | src/backend/utils/sort/tuplesort.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 2376bda497b..15fda7f1225 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -79,7 +79,7 @@ #undef StrNCpy #include <shlwapi.h> #ifdef StrNCpy -#undef STrNCpy +#undef StrNCpy #endif #endif diff --git a/src/backend/utils/adt/rangetypes_typanalyze.c b/src/backend/utils/adt/rangetypes_typanalyze.c index 631e4210626..d01d3032cca 100644 --- a/src/backend/utils/adt/rangetypes_typanalyze.c +++ b/src/backend/utils/adt/rangetypes_typanalyze.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- * - * ragetypes_typanalyze.c + * rangetypes_typanalyze.c * Functions for gathering statistics from range columns * * For a range type column, histograms of lower and upper bounds, and diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c index 4483db573f3..90b2c9b6948 100644 --- a/src/backend/utils/adt/txid.c +++ b/src/backend/utils/adt/txid.c @@ -705,7 +705,7 @@ txid_snapshot_xip(PG_FUNCTION_ARGS) TxidSnapshot *snap; txid value; - /* on first call initialize snap_state and get copy of snapshot */ + /* on first call initialize fctx and get copy of snapshot */ if (SRF_IS_FIRSTCALL()) { TxidSnapshot *arg = (TxidSnapshot *) PG_GETARG_VARLENA_P(0); diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 0864838867f..fa08b55eb62 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -2052,7 +2052,7 @@ varstr_sortsupport(SortSupport ssup, Oid typid, Oid collid) /* * If we're using abbreviated keys, or if we're using a locale-aware - * comparison, we need to initialize a StringSortSupport object. Both + * comparison, we need to initialize a VarStringSortSupport object. Both * cases will make use of the temporary buffers we initialize here for * scratch space (and to detect requirement for BpChar semantics from * caller), and the abbreviation case requires additional state. diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 5e629d29ea8..0280c2625c6 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -3987,7 +3987,7 @@ xml_xpathobjtoxmlarray(xmlXPathObjectPtr xpathobj, /* * Common code for xpath() and xmlexists() * - * Evaluate XPath expression and return number of nodes in res_items + * Evaluate XPath expression and return number of nodes in res_nitems * and array of XML values in astate. Either of those pointers can be * NULL if the corresponding result isn't wanted. * diff --git a/src/backend/utils/misc/check_guc b/src/backend/utils/misc/check_guc index d228bbed685..416a0875b6c 100755 --- a/src/backend/utils/misc/check_guc +++ b/src/backend/utils/misc/check_guc @@ -18,7 +18,7 @@ ## can be ignored INTENTIONALLY_NOT_INCLUDED="debug_deadlocks \ is_superuser lc_collate lc_ctype lc_messages lc_monetary lc_numeric lc_time \ -pre_auth_delay role seed server_encoding server_version server_version_int \ +pre_auth_delay role seed server_encoding server_version server_version_num \ session_authorization trace_lock_oidmin trace_lock_table trace_locks trace_lwlocks \ trace_notify trace_userlocks transaction_isolation transaction_read_only \ zero_damaged_pages" diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c index bd8d2009829..700a91a2a37 100644 --- a/src/backend/utils/mmgr/slab.c +++ b/src/backend/utils/mmgr/slab.c @@ -182,7 +182,7 @@ static const MemoryContextMethods SlabMethods = { * chunkSize: allocation chunk size * * The chunkSize may not exceed: - * MAXALIGN_DOWN(SIZE_MAX) - MAXALIGN(sizeof(SlabBlock)) - SLAB_CHUNKHDRSZ + * MAXALIGN_DOWN(SIZE_MAX) - MAXALIGN(sizeof(SlabBlock)) - sizeof(SlabChunk) */ MemoryContext SlabContextCreate(MemoryContext parent, diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index bda802b447f..d2bd2aee9f0 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -1150,7 +1150,7 @@ tuplesort_begin_datum(Oid datumType, Oid sortOperator, Oid sortCollation, * to compare. In a tuple sort, we could support that, because we can * always extract the original datum from the tuple as needed. Here, we * can't, because a datum sort only stores a single copy of the datum; the - * "tuple" field of each sortTuple is NULL. + * "tuple" field of each SortTuple is NULL. */ state->sortKeys->abbreviate = !typbyval; |