From cfa51388aa298c50297143938ef4406ca751a6e4 Mon Sep 17 00:00:00 2001 From: Markus Wanner Date: Mon, 6 Apr 2020 10:58:05 +0200 Subject: [PATCH] Run through spell checker. Adjusted only code comments, though. --- compress_io.c | 2 +- dumputils.c | 12 ++++++------ pg_backup_archiver.c | 2 +- pg_backup_custom.c | 4 ++-- pg_backup_tar.c | 2 +- pg_dump.c | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/compress_io.c b/compress_io.c index 0c65b5c..4783d86 100644 --- a/compress_io.c +++ b/compress_io.c @@ -292,7 +292,7 @@ DeflateCompressorZlib(ArchiveHandle *AH, CompressorState *cs, bool flush) if (zp->avail_out < cs->zlibOutSize) { /* - * Any write function shoud do its own error checking but to + * Any write function should do its own error checking but to * make sure we do a check here as well... */ size_t len = cs->zlibOutSize - zp->avail_out; diff --git a/dumputils.c b/dumputils.c index 46fc56e..7869adc 100644 --- a/dumputils.c +++ b/dumputils.c @@ -183,7 +183,7 @@ fmtQualifiedId(int remoteVersion, const char *schema, const char *id) * returned by PQserverVersion()) as a string. This exists mainly to * encapsulate knowledge about two-part vs. three-part version numbers. * - * For re-entrancy, caller must supply the buffer the string is put in. + * For reentrancy, caller must supply the buffer the string is put in. * Recommended size of the buffer is 32 bytes. * * Returns address of 'buf', as a notational convenience. @@ -310,7 +310,7 @@ appendStringLiteralConn(PQExpBuffer buf, const char *str, PGconn *conn) size_t length = strlen(str); /* - * XXX This is a kluge to silence escape_string_warning in our utility + * XXX This is a kludge to silence escape_string_warning in our utility * programs. It should go away someday. */ if (strchr(str, '\\') != NULL && PQserverVersion(conn) >= 80100) @@ -322,7 +322,7 @@ appendStringLiteralConn(PQExpBuffer buf, const char *str, PGconn *conn) appendStringLiteral(buf, str, PQclientEncoding(conn), false); return; } - /* XXX end kluge */ + /* XXX end kludge */ if (!enlargePQExpBuffer(buf, 2 * length + 2)) return; @@ -1003,9 +1003,9 @@ buildDefaultACLCommands(const char *type, const char *nspname, * group groupname=privilegecodes/grantor * (the /grantor part will not be present if pre-7.4 database). * - * The returned grantee string will be the dequoted username or groupname + * The returned grantee string will be the unquoted username or groupname * (preceded with "group " in the latter case). The returned grantor is - * the dequoted grantor name or empty. Privilege characters are decoded + * the unquoted grantor name or empty. Privilege characters are decoded * and split between privileges with grant option (privswgo) and without * (privs). * @@ -1171,7 +1171,7 @@ do { \ /* * Transfer a user or group name starting at *input into the output buffer, - * dequoting if needed. Returns a pointer to just past the input name. + * unquoting if needed. Returns a pointer to just past the input name. * The name is taken to end at an unquoted '=' or end of string. */ static char * diff --git a/pg_backup_archiver.c b/pg_backup_archiver.c index afde17f..0adddfc 100644 --- a/pg_backup_archiver.c +++ b/pg_backup_archiver.c @@ -1078,7 +1078,7 @@ PrintTOCSummary(Archive *AHX, RestoreOptions *ropt) * one physical output line. This prevents confusion when the * file is read by "pg_restore -L". Note that we currently don't * bother to quote names, meaning that the name fields aren't - * automatically parseable. "pg_restore -L" doesn't care because + * automatically parsable. "pg_restore -L" doesn't care because * it only examines the dumpId field, but someday we might want to * try harder. */ diff --git a/pg_backup_custom.c b/pg_backup_custom.c index 05519ba..403d8fd 100644 --- a/pg_backup_custom.c +++ b/pg_backup_custom.c @@ -4,7 +4,7 @@ * * Implements the custom output format. * - * The comments with the routined in this code are a good place to + * The comments with the routine in this code are a good place to * understand how to write a new format. * * See the headers to pg_restore for more details. @@ -687,7 +687,7 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len) * the process of saving it to files. No data should be written prior * to this point, since the user could sort the TOC after creating it. * - * If an archive is to be written, this toutine must call: + * If an archive is to be written, this routine must call: * WriteHead to save the archive header * WriteToc to save the TOC entries * WriteDataChunks to save all DATA & BLOBs. diff --git a/pg_backup_tar.c b/pg_backup_tar.c index 83384f8..f7f6360 100644 --- a/pg_backup_tar.c +++ b/pg_backup_tar.c @@ -685,7 +685,7 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt) * If we're writing the special restore.sql script, emit a suitable * command to include each table's data from the corresponding file. * - * In the COPY case this is a bit klugy because the regular COPY command + * In the COPY case this is a bit kludgy because the regular COPY command * was already printed before we get control. */ if (ctx->isSpecialScript) diff --git a/pg_dump.c b/pg_dump.c index 96909e1..7068630 100644 --- a/pg_dump.c +++ b/pg_dump.c @@ -804,7 +804,7 @@ main(int argc, char **argv) /* * In binary-upgrade mode, we do not have to worry about the actual blob * data or the associated metadata that resides in the pg_largeobject and - * pg_largeobject_metadata tables, respectivly. + * pg_largeobject_metadata tables, respectively. * * However, we do need to collect blob information as there may be * comments or other information on blobs that we do need to dump out. @@ -1086,7 +1086,7 @@ setup_connection(Archive *AH, const char *dumpencoding, * passed a snapshot. As long as the snapshot is acquired in a * SERIALIZABLE, READ ONLY, DEFERRABLE transaction, its use within a * REPEATABLE READ transaction provides the appropriate integrity - * guarantees. This is a kluge, but safe for back-patching. + * guarantees. This is a kludge, but safe for back-patching. */ if (serializable_deferrable && AH->sync_snapshot_id == NULL) ExecuteSqlStatement(AH, @@ -1608,7 +1608,7 @@ dumpTableData_copy(Archive *fout, void *dcontext) { /* Note: this syntax is only supported in 8.2 and up */ appendPQExpBufferStr(q, "COPY (SELECT "); - /* klugery to get rid of parens in column list */ + /* kludgery to get rid of parens in column list */ if (strlen(column_list) > 2) { appendPQExpBufferStr(q, column_list + 1); @@ -1914,7 +1914,7 @@ dumpTableData(Archive *fout, TableDataInfo *tdinfo) { /* Dump/restore using COPY */ dumpFn = dumpTableData_copy; - /* must use 2 steps here 'cause fmtId is nonreentrant */ + /* must use 2 steps here 'cause fmtId is non-reentrant */ appendPQExpBuffer(copyBuf, "COPY %s ", fmtQualifiedDumpable(tbinfo)); appendPQExpBuffer(copyBuf, "%s %sFROM stdin;\n",