aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/common/bufmask.c2
-rw-r--r--src/backend/access/spgist/spgutils.c2
-rw-r--r--src/backend/jit/llvm/llvmjit.c2
-rw-r--r--src/backend/optimizer/util/tlist.c2
-rw-r--r--src/backend/utils/adt/ruleutils.c2
-rw-r--r--src/backend/utils/misc/guc_internal.h10
-rw-r--r--src/bin/pg_dump/pg_dumpall.c2
-rw-r--r--src/bin/pg_upgrade/info.c9
-rw-r--r--src/include/lib/ilist.h2
-rw-r--r--src/test/regress/expected/copy.out2
-rw-r--r--src/test/regress/expected/expressions.out2
-rw-r--r--src/test/regress/sql/copy.sql2
-rw-r--r--src/test/regress/sql/expressions.sql2
-rw-r--r--src/test/ssl/t/SSL/Server.pm2
14 files changed, 21 insertions, 22 deletions
diff --git a/src/backend/access/common/bufmask.c b/src/backend/access/common/bufmask.c
index e3ca644bd6f..5e392dab1e9 100644
--- a/src/backend/access/common/bufmask.c
+++ b/src/backend/access/common/bufmask.c
@@ -78,7 +78,7 @@ mask_unused_space(Page page)
if (pd_lower > pd_upper || pd_special < pd_upper ||
pd_lower < SizeOfPageHeaderData || pd_special > BLCKSZ)
{
- elog(ERROR, "invalid page pd_lower %u pd_upper %u pd_special %u\n",
+ elog(ERROR, "invalid page pd_lower %u pd_upper %u pd_special %u",
pd_lower, pd_upper, pd_special);
}
diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index 9fd0531589b..3761f2c193b 100644
--- a/src/backend/access/spgist/spgutils.c
+++ b/src/backend/access/spgist/spgutils.c
@@ -1301,7 +1301,7 @@ spgproperty(Oid index_oid, int attno,
/*
* Currently, SP-GiST distance-ordered scans require that there be a
* distance operator in the opclass with the default types. So we assume
- * that if such a operator exists, then there's a reason for it.
+ * that if such an operator exists, then there's a reason for it.
*/
/* First we need to know the column's opclass. */
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 1c10c1a55a0..312612115ca 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -816,7 +816,7 @@ llvm_session_initialize(void)
if (LLVMGetTargetFromTriple(llvm_triple, &llvm_targetref, &error) != 0)
{
- elog(FATAL, "failed to query triple %s\n", error);
+ elog(FATAL, "failed to query triple %s", error);
}
/*
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 4d95ffbddb2..c672b338c0d 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -865,7 +865,7 @@ apply_pathtarget_labeling_to_tlist(List *tlist, PathTarget *target)
*
* The outputs of this function are two parallel lists, one a list of
* PathTargets and the other an integer list of bool flags indicating
- * whether the corresponding PathTarget contains any evaluatable SRFs.
+ * whether the corresponding PathTarget contains any evaluable SRFs.
* The lists are given in the order they'd need to be evaluated in, with
* the "lowest" PathTarget first. So the last list entry is always the
* originally given PathTarget, and any entries before it indicate evaluation
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 82f87511a1f..9ac42efdbc3 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -11391,7 +11391,7 @@ get_opclass_name(Oid opclass, Oid actual_datatype,
/*
* generate_opclass_name
- * Compute the name to display for a opclass specified by OID
+ * Compute the name to display for an opclass specified by OID
*
* The result includes all necessary quoting and schema-prefixing.
*/
diff --git a/src/backend/utils/misc/guc_internal.h b/src/backend/utils/misc/guc_internal.h
index 8d93d347a72..608c8ae4784 100644
--- a/src/backend/utils/misc/guc_internal.h
+++ b/src/backend/utils/misc/guc_internal.h
@@ -1,16 +1,16 @@
/*--------------------------------------------------------------------
- * guc_internals.h
+ * guc_internal.h
*
* Declarations shared between backend/utils/misc/guc.c and
* backend/utils/misc/guc-file.l
*
* Copyright (c) 2000-2023, PostgreSQL Global Development Group
*
- * src/include/utils/guc_internals.h
+ * src/include/utils/guc_internal.h
*--------------------------------------------------------------------
*/
-#ifndef GUC_INTERNALS_H
-#define GUC_INTERNALS_H
+#ifndef GUC_INTERNAL_H
+#define GUC_INTERNAL_H
#include "utils/guc.h"
@@ -23,4 +23,4 @@ extern void record_config_file_error(const char *errmsg,
ConfigVariable **head_p,
ConfigVariable **tail_p);
-#endif /* GUC_INTERNALS_H */
+#endif /* GUC_INTERNAL_H */
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index f26a53b286d..fbd1c6fc85b 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -1034,7 +1034,7 @@ dumpRoleMembership(PGconn *conn)
ht = rolename_create(remaining, NULL);
/*
- * Make repeated passses over the grants for this role until all have
+ * Make repeated passes over the grants for this role until all have
* been dumped.
*/
while (remaining > 0)
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 47d0bfd1101..c1399c09b94 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -408,11 +408,10 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
query[0] = '\0'; /* initialize query string to empty */
/*
- * Create a CTE that collects OIDs of regular user tables, including
- * matviews and sequences, but excluding toast tables and indexes. We
- * assume that relations with OIDs >= FirstNormalObjectId belong to the
- * user. (That's probably redundant with the namespace-name exclusions,
- * but let's be safe.)
+ * Create a CTE that collects OIDs of regular user tables and matviews,
+ * but excluding toast tables and indexes. We assume that relations with
+ * OIDs >= FirstNormalObjectId belong to the user. (That's probably
+ * redundant with the namespace-name exclusions, but let's be safe.)
*
* pg_largeobject contains user data that does not appear in pg_dump
* output, so we have to copy that system table. It's easiest to do that
diff --git a/src/include/lib/ilist.h b/src/include/lib/ilist.h
index 9ff21bd41dc..3a9209d1c10 100644
--- a/src/include/lib/ilist.h
+++ b/src/include/lib/ilist.h
@@ -162,7 +162,7 @@ typedef struct dlist_head
/*
- * Doubly linked list iterator type for dlist_head and and dclist_head types.
+ * Doubly linked list iterator type for dlist_head and dclist_head types.
*
* Used as state in dlist_foreach() and dlist_reverse_foreach() (and the
* dclist variant thereof).
diff --git a/src/test/regress/expected/copy.out b/src/test/regress/expected/copy.out
index 3fad1c52d1f..8a8bf43fdea 100644
--- a/src/test/regress/expected/copy.out
+++ b/src/test/regress/expected/copy.out
@@ -182,7 +182,7 @@ create table header_copytest (
b int,
c text
);
--- Make sure it works with with dropped columns
+-- Make sure it works with dropped columns
alter table header_copytest drop column c;
alter table header_copytest add column c text;
copy header_copytest to stdout with (header match);
diff --git a/src/test/regress/expected/expressions.out b/src/test/regress/expected/expressions.out
index df432d4c927..2d5342ab281 100644
--- a/src/test/regress/expected/expressions.out
+++ b/src/test/regress/expected/expressions.out
@@ -86,7 +86,7 @@ WARNING: TIMESTAMP(7) precision reduced to maximum allowed, 6
t
(1 row)
--- current_role/user/user is tested in rolnames.sql
+-- current_role/user/user is tested in rolenames.sql
-- current database / catalog
SELECT current_catalog = current_database();
?column?
diff --git a/src/test/regress/sql/copy.sql b/src/test/regress/sql/copy.sql
index 285022e07c6..f9da7b1508f 100644
--- a/src/test/regress/sql/copy.sql
+++ b/src/test/regress/sql/copy.sql
@@ -204,7 +204,7 @@ create table header_copytest (
b int,
c text
);
--- Make sure it works with with dropped columns
+-- Make sure it works with dropped columns
alter table header_copytest drop column c;
alter table header_copytest add column c text;
copy header_copytest to stdout with (header match);
diff --git a/src/test/regress/sql/expressions.sql b/src/test/regress/sql/expressions.sql
index fea5358d252..d315ef5af50 100644
--- a/src/test/regress/sql/expressions.sql
+++ b/src/test/regress/sql/expressions.sql
@@ -29,7 +29,7 @@ SELECT current_timestamp = current_timestamp(7);
SELECT localtime = localtime(7);
SELECT localtimestamp = localtimestamp(7);
--- current_role/user/user is tested in rolnames.sql
+-- current_role/user/user is tested in rolenames.sql
-- current database / catalog
SELECT current_catalog = current_database();
diff --git a/src/test/ssl/t/SSL/Server.pm b/src/test/ssl/t/SSL/Server.pm
index 0bc209bbd4d..b6344b936a5 100644
--- a/src/test/ssl/t/SSL/Server.pm
+++ b/src/test/ssl/t/SSL/Server.pm
@@ -257,7 +257,7 @@ The certificate file to use. Implementation is SSL backend specific.
=item keyfile => B<value>
-The private key to use. Implementation is SSL backend specific.
+The private key file to use. Implementation is SSL backend specific.
=item crlfile => B<value>