From d02f16470f117db3038dbfd87662d5f0eb5a2a9b Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 11 May 2015 20:38:55 -0400 Subject: [PATCH] Replace some appendStringInfo* calls with more appropriate variants Author: David Rowley --- contrib/postgres_fdw/postgres_fdw.c | 4 ++-- contrib/test_decoding/test_decoding.c | 2 +- src/backend/access/rmgrdesc/smgrdesc.c | 2 +- src/backend/access/rmgrdesc/xlogdesc.c | 4 ++-- src/backend/catalog/namespace.c | 2 +- src/backend/utils/adt/ruleutils.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index ec89b25f61..0c44260842 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -2734,7 +2734,7 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid) appendStringInfoString(&buf, ", "); deparseStringLiteral(&buf, rv->relname); } - appendStringInfoString(&buf, ")"); + appendStringInfoChar(&buf, ')'); } /* Append ORDER BY at the end of query to ensure output ordering */ @@ -2798,7 +2798,7 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid) */ appendStringInfoString(&buf, " OPTIONS (column_name "); deparseStringLiteral(&buf, attname); - appendStringInfoString(&buf, ")"); + appendStringInfoChar(&buf, ')'); /* Add COLLATE if needed */ if (import_collate && collname != NULL && collnamespace != NULL) diff --git a/contrib/test_decoding/test_decoding.c b/contrib/test_decoding/test_decoding.c index bca03ee21b..ae2aca8a8d 100644 --- a/contrib/test_decoding/test_decoding.c +++ b/contrib/test_decoding/test_decoding.c @@ -419,7 +419,7 @@ pg_decode_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, get_namespace_name( get_rel_namespace(RelationGetRelid(relation))), NameStr(class_form->relname))); - appendStringInfoString(ctx->out, ":"); + appendStringInfoChar(ctx->out, ':'); switch (change->action) { diff --git a/src/backend/access/rmgrdesc/smgrdesc.c b/src/backend/access/rmgrdesc/smgrdesc.c index 4ae08b1988..56d02c325c 100644 --- a/src/backend/access/rmgrdesc/smgrdesc.c +++ b/src/backend/access/rmgrdesc/smgrdesc.c @@ -29,7 +29,7 @@ smgr_desc(StringInfo buf, XLogReaderState *record) xl_smgr_create *xlrec = (xl_smgr_create *) rec; char *path = relpathperm(xlrec->rnode, xlrec->forkNum); - appendStringInfo(buf, "%s", path); + appendStringInfoString(buf, path); pfree(path); } else if (info == XLOG_SMGR_TRUNCATE) diff --git a/src/backend/access/rmgrdesc/xlogdesc.c b/src/backend/access/rmgrdesc/xlogdesc.c index 2c432f3e2a..4f2913683a 100644 --- a/src/backend/access/rmgrdesc/xlogdesc.c +++ b/src/backend/access/rmgrdesc/xlogdesc.c @@ -75,7 +75,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record) { xl_restore_point *xlrec = (xl_restore_point *) rec; - appendStringInfo(buf, "%s", xlrec->rp_name); + appendStringInfoString(buf, xlrec->rp_name); } else if (info == XLOG_FPI || info == XLOG_FPI_FOR_HINT) { @@ -125,7 +125,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record) bool fpw; memcpy(&fpw, rec, sizeof(bool)); - appendStringInfo(buf, "%s", fpw ? "true" : "false"); + appendStringInfoString(buf, fpw ? "true" : "false"); } else if (info == XLOG_END_OF_RECOVERY) { diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 2f6d697d82..b16af64bb3 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -2937,7 +2937,7 @@ NameListToString(List *names) if (IsA(name, String)) appendStringInfoString(&string, strVal(name)); else if (IsA(name, A_Star)) - appendStringInfoString(&string, "*"); + appendStringInfoChar(&string, '*'); else elog(ERROR, "unexpected node type in name list: %d", (int) nodeTag(name)); diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 156b5331f3..903e80aea3 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -2174,7 +2174,7 @@ print_function_rettype(StringInfo buf, HeapTuple proctup) appendStringInfoString(&rbuf, "TABLE("); ntabargs = print_function_arguments(&rbuf, proctup, true, false); if (ntabargs > 0) - appendStringInfoString(&rbuf, ")"); + appendStringInfoChar(&rbuf, ')'); else resetStringInfo(&rbuf); }