From dee3e7cee8e16dc9d40654d7866c990a7043cab0 Mon Sep 17 00:00:00 2001 From: Hou Zhijie Date: Tue, 1 Jun 2021 17:50:35 +0800 Subject: [PATCH] Fixup some appendStringInfo and appendPQExpBuffer calls --- contrib/sepgsql/schema.c | 2 +- src/backend/access/brin/brin_minmax_multi.c | 2 +- src/backend/access/heap/vacuumlazy.c | 8 ++++---- src/backend/postmaster/postmaster.c | 2 +- src/bin/pg_amcheck/pg_amcheck.c | 2 +- src/bin/psql/describe.c | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c index 0285c57..f065a2a 100644 --- a/contrib/sepgsql/schema.c +++ b/contrib/sepgsql/schema.c @@ -84,7 +84,7 @@ sepgsql_schema_post_create(Oid namespaceId) * check db_schema:{create} */ initStringInfo(&audit_name); - appendStringInfo(&audit_name, "%s", quote_identifier(nsp_name)); + appendStringInfoString(&audit_name, quote_identifier(nsp_name)); sepgsql_avc_check_perms_label(ncontext, SEPG_CLASS_DB_SCHEMA, SEPG_DB_SCHEMA__CREATE, diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index bd14184..c62a3c8 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -3084,7 +3084,7 @@ brin_minmax_multi_summary_out(PG_FUNCTION_ARGS) a = FunctionCall1(&fmgrinfo, ranges_deserialized->values[idx++]); - appendStringInfo(&str, "%s", DatumGetPointer(a)); + appendStringInfoString(&str, DatumGetPointer(a)); b = cstring_to_text(str.data); diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index ad3feb8..4b600e9 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -783,18 +783,18 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, msgfmt = _(" %u pages from table (%.2f%% of total) had %lld dead item identifiers removed\n"); if (vacrel->nindexes == 0 || vacrel->num_index_scans == 0) - appendStringInfo(&buf, _("index scan not needed:")); + appendStringInfoString(&buf, _("index scan not needed:")); else - appendStringInfo(&buf, _("index scan needed:")); + appendStringInfoString(&buf, _("index scan needed:")); } else { msgfmt = _(" %u pages from table (%.2f%% of total) have %lld dead item identifiers\n"); if (!vacrel->do_failsafe) - appendStringInfo(&buf, _("index scan bypassed:")); + appendStringInfoString(&buf, _("index scan bypassed:")); else - appendStringInfo(&buf, _("index scan bypassed by failsafe:")); + appendStringInfoString(&buf, _("index scan bypassed by failsafe:")); } orig_rel_pages = vacrel->rel_pages + vacrel->pages_removed; appendStringInfo(&buf, msgfmt, diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 5a05089..9e81584 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -4472,7 +4472,7 @@ BackendInitialize(Port *port) appendStringInfo(&ps_data, "%s ", port->user_name); if (!am_walsender) appendStringInfo(&ps_data, "%s ", port->database_name); - appendStringInfo(&ps_data, "%s", port->remote_host); + appendStringInfoString(&ps_data, port->remote_host); if (port->remote_port[0] != '\0') appendStringInfo(&ps_data, "(%s)", port->remote_port); diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c index 37103e1..6b97d63 100644 --- a/src/bin/pg_amcheck/pg_amcheck.c +++ b/src/bin/pg_amcheck/pg_amcheck.c @@ -844,7 +844,7 @@ prepare_heap_command(PQExpBuffer sql, RelationInfo *rel, PGconn *conn) if (opts.endblock >= 0) appendPQExpBuffer(sql, ", endblock := " INT64_FORMAT, opts.endblock); - appendPQExpBuffer(sql, ")"); + appendPQExpBufferChar(sql, ')'); } /* diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 195f8d8..2abf255 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -2934,7 +2934,7 @@ describeOneTableDetails(const char *schemaname, if (has_some && !has_all) { - appendPQExpBuffer(&buf, " ("); + appendPQExpBufferStr(&buf, " ("); /* options */ if (has_ndistinct) @@ -2954,7 +2954,7 @@ describeOneTableDetails(const char *schemaname, appendPQExpBuffer(&buf, "%smcv", gotone ? ", " : ""); } - appendPQExpBuffer(&buf, ")"); + appendPQExpBufferChar(&buf, ')'); } appendPQExpBuffer(&buf, " ON %s FROM %s", @@ -3577,7 +3577,7 @@ describeOneTableDetails(const char *schemaname, child_relkind == RELKIND_PARTITIONED_INDEX) appendPQExpBufferStr(&buf, ", PARTITIONED"); if (strcmp(PQgetvalue(result, i, 2), "t") == 0) - appendPQExpBuffer(&buf, " (DETACH PENDING)"); + appendPQExpBufferStr(&buf, " (DETACH PENDING)"); if (i < tuples - 1) appendPQExpBufferChar(&buf, ','); -- 2.7.2.windows.1