Replace some appendStringInfo* calls with more appropriate variants

petere · petere · commit d02f16470f11 · 2015-05-11T20:38:55.000-04:00
Author: David Rowley &lt;dgrowleyml@gmail.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ pg_decode_change(LogicalDecodingContext ctx, ReorderBufferTXN txn,`
`419`	`419`	`get_namespace_name(`
`420`	`420`	`get_rel_namespace(RelationGetRelid(relation))),`
`421`	`421`	`NameStr(class_form->relname)));`
`422`		`- appendStringInfoString(ctx->out, ":");`
	`422`	`+ appendStringInfoChar(ctx->out, ':');`
`423`	`423`
`424`	`424`	`switch (change->action)`
`425`	`425`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ smgr_desc(StringInfo buf, XLogReaderState *record)`
`29`	`29`	`xl_smgr_create xlrec = (xl_smgr_create ) rec;`
`30`	`30`	`char *path = relpathperm(xlrec->rnode, xlrec->forkNum);`
`31`	`31`
`32`		`- appendStringInfo(buf, "%s", path);`
	`32`	`+ appendStringInfoString(buf, path);`
`33`	`33`	`pfree(path);`
`34`	`34`	`}`
`35`	`35`	`else if (info == XLOG_SMGR_TRUNCATE)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record)`
`75`	`75`	`{`
`76`	`76`	`xl_restore_point xlrec = (xl_restore_point ) rec;`
`77`	`77`
`78`		`- appendStringInfo(buf, "%s", xlrec->rp_name);`
	`78`	`+ appendStringInfoString(buf, xlrec->rp_name);`
`79`	`79`	`}`
`80`	`80`	`else if (info == XLOG_FPI \|\| info == XLOG_FPI_FOR_HINT)`
`81`	`81`	`{`
`@@ -125,7 +125,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record)`
`125`	`125`	`bool fpw;`
`126`	`126`
`127`	`127`	`memcpy(&fpw, rec, sizeof(bool));`
`128`		`- appendStringInfo(buf, "%s", fpw ? "true" : "false");`
	`128`	`+ appendStringInfoString(buf, fpw ? "true" : "false");`
`129`	`129`	`}`
`130`	`130`	`else if (info == XLOG_END_OF_RECOVERY)`
`131`	`131`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2174,7 +2174,7 @@ print_function_rettype(StringInfo buf, HeapTuple proctup)`
`2174`	`2174`	`appendStringInfoString(&rbuf, "TABLE(");`
`2175`	`2175`	`ntabargs = print_function_arguments(&rbuf, proctup, true, false);`
`2176`	`2176`	`if (ntabargs > 0)`
`2177`		`- appendStringInfoString(&rbuf, ")");`
	`2177`	`+ appendStringInfoChar(&rbuf, ')');`
`2178`	`2178`	`else`
`2179`	`2179`	`resetStringInfo(&rbuf);`
`2180`	`2180`	`}`