Fix up some misusage of appendStringInfo() and friends

petere · petere · commit 77d05706beb1 · 2017-08-15T23:34:39.000-04:00
Change to appendStringInfoChar() or appendStringInfoString() where those
can be used.

Author: David Rowley &lt;david.rowley@2ndquadrant.com&gt;
Reviewed-by: Ashutosh Bapat &lt;ashutosh.bapat@enterprisedb.com&gt;
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
@@ -973,7 +973,7 @@ deparseSelectStmtForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *rel,
 		/* Append HAVING clause */
 		if (remote_conds)
 		{
-			appendStringInfo(buf, " HAVING ");
+			appendStringInfoString(buf, " HAVING ");
 			appendConditions(remote_conds, &context);
 		}
 	}
@@ -1076,7 +1076,7 @@ deparseFromExpr(List *quals, deparse_expr_cxt *context)
 	/* Construct WHERE clause */
 	if (quals != NIL)
 	{
-		appendStringInfo(buf, " WHERE ");
+		appendStringInfoString(buf, " WHERE ");
 		appendConditions(quals, context);
 	}
 }
@@ -1447,15 +1447,15 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
 			context.root = root;
 			context.params_list = params_list;
 
-			appendStringInfo(buf, "(");
+			appendStringInfoChar(buf, '(');
 			appendConditions(fpinfo->joinclauses, &context);
-			appendStringInfo(buf, ")");
+			appendStringInfoChar(buf, ')');
 		}
 		else
 			appendStringInfoString(buf, "(TRUE)");
 
 		/* End the FROM clause entry. */
-		appendStringInfo(buf, ")");
+		appendStringInfoChar(buf, ')');
 	}
 	else
 	{
@@ -1702,7 +1702,7 @@ deparseDirectUpdateSql(StringInfo buf, PlannerInfo *root,
 
 	if (remote_conds)
 	{
-		appendStringInfo(buf, " WHERE ");
+		appendStringInfoString(buf, " WHERE ");
 		appendConditions(remote_conds, &context);
 	}
 
@@ -1762,7 +1762,7 @@ deparseDirectDeleteSql(StringInfo buf, PlannerInfo *root,
 
 	if (remote_conds)
 	{
-		appendStringInfo(buf, " WHERE ");
+		appendStringInfoString(buf, " WHERE ");
 		appendConditions(remote_conds, &context);
 	}
 
@@ -1978,17 +1978,17 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root,
 		{
 			appendStringInfoString(buf, "CASE WHEN (");
 			ADD_REL_QUALIFIER(buf, varno);
-			appendStringInfo(buf, "*)::text IS NOT NULL THEN ");
+			appendStringInfoString(buf, "*)::text IS NOT NULL THEN ");
 		}
 
 		appendStringInfoString(buf, "ROW(");
 		deparseTargetList(buf, root, varno, rel, false, attrs_used, qualify_col,
 						  &retrieved_attrs);
-		appendStringInfoString(buf, ")");
+		appendStringInfoChar(buf, ')');
 
 		/* Complete the CASE WHEN statement started above. */
 		if (qualify_col)
-			appendStringInfo(buf, " END");
+			appendStringInfoString(buf, " END");
 
 		heap_close(rel, NoLock);
 		bms_free(attrs_used);
@@ -2759,7 +2759,7 @@ deparseAggref(Aggref *node, deparse_expr_cxt *context)
 	appendStringInfoChar(buf, '(');
 
 	/* Add DISTINCT */
-	appendStringInfo(buf, "%s", (node->aggdistinct != NIL) ? "DISTINCT " : "");
+	appendStringInfoString(buf, (node->aggdistinct != NIL) ? "DISTINCT " : "");
 
 	if (AGGKIND_IS_ORDERED_SET(node->aggkind))
 	{
@@ -2944,7 +2944,7 @@ appendGroupByClause(List *tlist, deparse_expr_cxt *context)
 	if (!query->groupClause)
 		return;
 
-	appendStringInfo(buf, " GROUP BY ");
+	appendStringInfoString(buf, " GROUP BY ");
 
 	/*
 	 * Queries with grouping sets are not pushed down, so we don't expect
@@ -2981,7 +2981,7 @@ appendOrderByClause(List *pathkeys, deparse_expr_cxt *context)
 	/* Make sure any constants in the exprs are printed portably */
 	nestlevel = set_transmission_modes();
 
-	appendStringInfo(buf, " ORDER BY");
+	appendStringInfoString(buf, " ORDER BY");
 	foreach(lcell, pathkeys)
 	{
 		PathKey    *pathkey = lfirst(lcell);
@@ -3035,7 +3035,7 @@ appendFunctionName(Oid funcid, deparse_expr_cxt *context)
 
 	/* Always print the function name */
 	proname = NameStr(procform->proname);
-	appendStringInfo(buf, "%s", quote_identifier(proname));
+	appendStringInfoString(buf, quote_identifier(proname));
 
 	ReleaseSysCache(proctup);
 }
@@ -3070,9 +3070,9 @@ deparseSortGroupClause(Index ref, List *tlist, deparse_expr_cxt *context)
 	else
 	{
 		/* Always parenthesize the expression. */
-		appendStringInfoString(buf, "(");
+		appendStringInfoChar(buf, '(');
 		deparseExpr(expr, context);
-		appendStringInfoString(buf, ")");
+		appendStringInfoChar(buf, ')');
 	}
 
 	return (Node *) expr;
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
@@ -1117,9 +1117,9 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications)
 	Assert(list_length(publications) > 0);
 
 	initStringInfo(&cmd);
-	appendStringInfo(&cmd, "SELECT DISTINCT t.schemaname, t.tablename\n"
-					 "  FROM pg_catalog.pg_publication_tables t\n"
-					 " WHERE t.pubname IN (");
+	appendStringInfoString(&cmd, "SELECT DISTINCT t.schemaname, t.tablename\n"
+						   "  FROM pg_catalog.pg_publication_tables t\n"
+						   " WHERE t.pubname IN (");
 	first = true;
 	foreach(lc, publications)
 	{
@@ -1130,9 +1130,9 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications)
 		else
 			appendStringInfoString(&cmd, ", ");
 
-		appendStringInfo(&cmd, "%s", quote_literal_cstr(pubname));
+		appendStringInfoString(&cmd, quote_literal_cstr(pubname));
 	}
-	appendStringInfoString(&cmd, ")");
+	appendStringInfoChar(&cmd, ')');
 
 	res = walrcv_exec(wrconn, cmd.data, 2, tableRow);
 	pfree(cmd.data);
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
@@ -83,7 +83,7 @@ static void outChar(StringInfo str, char c);
 
 /* Write a character-string (possibly NULL) field */
 #define WRITE_STRING_FIELD(fldname) \
-	(appendStringInfo(str, " :" CppAsString(fldname) " "), \
+	(appendStringInfoString(str, " :" CppAsString(fldname) " "), \
 	 outToken(str, node->fldname))
 
 /* Write a parse location field (actually same as INT case) */
@@ -92,12 +92,12 @@ static void outChar(StringInfo str, char c);
 
 /* Write a Node field */
 #define WRITE_NODE_FIELD(fldname) \
-	(appendStringInfo(str, " :" CppAsString(fldname) " "), \
+	(appendStringInfoString(str, " :" CppAsString(fldname) " "), \
 	 outNode(str, node->fldname))
 
 /* Write a bitmapset field */
 #define WRITE_BITMAPSET_FIELD(fldname) \
-	(appendStringInfo(str, " :" CppAsString(fldname) " "), \
+	(appendStringInfoString(str, " :" CppAsString(fldname) " "), \
 	 outBitmapset(str, node->fldname))
 
 
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -355,7 +355,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn,
 						 options->slotname);
 
 	if (options->logical)
-		appendStringInfo(&cmd, " LOGICAL");
+		appendStringInfoString(&cmd, " LOGICAL");
 
 	appendStringInfo(&cmd, " %X/%X",
 					 (uint32) (options->startpoint >> 32),
@@ -774,21 +774,21 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname,
 	appendStringInfo(&cmd, "CREATE_REPLICATION_SLOT \"%s\"", slotname);
 
 	if (temporary)
-		appendStringInfo(&cmd, " TEMPORARY");
+		appendStringInfoString(&cmd, " TEMPORARY");
 
 	if (conn->logical)
 	{
-		appendStringInfo(&cmd, " LOGICAL pgoutput");
+		appendStringInfoString(&cmd, " LOGICAL pgoutput");
 		switch (snapshot_action)
 		{
 			case CRS_EXPORT_SNAPSHOT:
-				appendStringInfo(&cmd, " EXPORT_SNAPSHOT");
+				appendStringInfoString(&cmd, " EXPORT_SNAPSHOT");
 				break;
 			case CRS_NOEXPORT_SNAPSHOT:
-				appendStringInfo(&cmd, " NOEXPORT_SNAPSHOT");
+				appendStringInfoString(&cmd, " NOEXPORT_SNAPSHOT");
 				break;
 			case CRS_USE_SNAPSHOT:
-				appendStringInfo(&cmd, " USE_SNAPSHOT");
+				appendStringInfoString(&cmd, " USE_SNAPSHOT");
 				break;
 		}
 	}
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
@@ -1656,19 +1656,19 @@ pg_get_partkeydef_worker(Oid relid, int prettyFlags,
 	{
 		case PARTITION_STRATEGY_LIST:
 			if (!attrsOnly)
-				appendStringInfo(&buf, "LIST");
+				appendStringInfoString(&buf, "LIST");
 			break;
 		case PARTITION_STRATEGY_RANGE:
 			if (!attrsOnly)
-				appendStringInfo(&buf, "RANGE");
+				appendStringInfoString(&buf, "RANGE");
 			break;
 		default:
 			elog(ERROR, "unexpected partition strategy: %d",
 				 (int) form->partstrat);
 	}
 
 	if (!attrsOnly)
-		appendStringInfo(&buf, " (");
+		appendStringInfoString(&buf, " (");
 	sep = "";
 	for (keyno = 0; keyno < form->partnatts; keyno++)
 	{
@@ -5635,10 +5635,10 @@ get_rule_sortgroupclause(Index ref, List *tlist, bool force_colno,
 								  ||IsA(expr, WindowFunc));
 
 		if (need_paren)
-			appendStringInfoString(context->buf, "(");
+			appendStringInfoChar(context->buf, '(');
 		get_rule_expr(expr, context, true);
 		if (need_paren)
-			appendStringInfoString(context->buf, ")");
+			appendStringInfoChar(context->buf, ')');
 	}
 
 	return expr;
@@ -5665,7 +5665,7 @@ get_rule_groupingset(GroupingSet *gset, List *targetlist,
 		case GROUPING_SET_SIMPLE:
 			{
 				if (!omit_parens || list_length(gset->content) != 1)
-					appendStringInfoString(buf, "(");
+					appendStringInfoChar(buf, '(');
 
 				foreach(l, gset->content)
 				{
@@ -5678,7 +5678,7 @@ get_rule_groupingset(GroupingSet *gset, List *targetlist,
 				}
 
 				if (!omit_parens || list_length(gset->content) != 1)
-					appendStringInfoString(buf, ")");
+					appendStringInfoChar(buf, ')');
 			}
 			return;
 
@@ -5701,7 +5701,7 @@ get_rule_groupingset(GroupingSet *gset, List *targetlist,
 		sep = ", ";
 	}
 
-	appendStringInfoString(buf, ")");
+	appendStringInfoChar(buf, ')');
 }
 
 /*
@@ -8713,7 +8713,7 @@ get_rule_expr(Node *node, deparse_context *context,
 							sep = ", ";
 						}
 
-						appendStringInfoString(buf, ")");
+						appendStringInfoChar(buf, ')');
 						break;
 
 					case PARTITION_STRATEGY_RANGE:
@@ -10941,7 +10941,7 @@ get_range_partbound_string(List *bound_datums)
 		}
 		sep = ", ";
 	}
-	appendStringInfoString(buf, ")");
+	appendStringInfoChar(buf, ')');
 
 	return buf->data;
 }
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
@@ -3458,8 +3458,8 @@ map_sql_type_to_xmlschema_type(Oid typeoid, int typmod)
 			case BPCHAROID:
 			case VARCHAROID:
 			case TEXTOID:
-				appendStringInfo(&result,
-								 "  <xsd:restriction base=\"xsd:string\">\n");
+				appendStringInfoString(&result,
+									   "  <xsd:restriction base=\"xsd:string\">\n");
 				if (typmod != -1)
 					appendStringInfo(&result,
 									 "    <xsd:maxLength value=\"%d\"/>\n",
diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c
@@ -455,7 +455,7 @@ FreePageManagerDump(FreePageManager *fpm)
 	recycle = relptr_access(base, fpm->btree_recycle);
 	if (recycle != NULL)
 	{
-		appendStringInfo(&buf, "btree recycle:");
+		appendStringInfoString(&buf, "btree recycle:");
 		FreePageManagerDumpSpans(fpm, recycle, 1, &buf);
 	}
 
@@ -468,7 +468,7 @@ FreePageManagerDump(FreePageManager *fpm)
 			continue;
 		if (!dumped_any_freelist)
 		{
-			appendStringInfo(&buf, "freelists:\n");
+			appendStringInfoString(&buf, "freelists:\n");
 			dumped_any_freelist = true;
 		}
 		appendStringInfo(&buf, "  %zu:", f + 1);
@@ -1275,7 +1275,7 @@ FreePageManagerDumpBtree(FreePageManager *fpm, FreePageBtree *btp,
 							 btp->u.leaf_key[index].first_page,
 							 btp->u.leaf_key[index].npages);
 	}
-	appendStringInfo(buf, "\n");
+	appendStringInfoChar(buf, '\n');
 
 	if (btp->hdr.magic == FREE_PAGE_INTERNAL_MAGIC)
 	{
@@ -1308,7 +1308,7 @@ FreePageManagerDumpSpans(FreePageManager *fpm, FreePageSpanLeader *span,
 		span = relptr_access(base, span->next);
 	}
 
-	appendStringInfo(buf, "\n");
+	appendStringInfoChar(buf, '\n');
 }
 
 /*
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -15424,7 +15424,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 
 			if (tbinfo->ispartition && !dopt->binary_upgrade)
 			{
-				appendPQExpBufferStr(q, "\n");
+				appendPQExpBufferChar(q, '\n');
 				appendPQExpBufferStr(q, tbinfo->partbound);
 			}
 
@@ -17127,8 +17127,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 
 		appendPQExpBuffer(delcmd, "CREATE OR REPLACE VIEW %s.",
 						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBuffer(delcmd, "%s",
-						  fmtId(tbinfo->dobj.name));
+		appendPQExpBufferStr(delcmd, fmtId(tbinfo->dobj.name));
 		result = createDummyViewAsClause(fout, tbinfo);
 		appendPQExpBuffer(delcmd, " AS\n%s;\n", result->data);
 		destroyPQExpBuffer(result);
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
@@ -1575,7 +1575,7 @@ dumpDatabaseConfig(PGconn *conn, const char *dbname)
 		appendStringLiteralConn(buf, dbname, conn);
 
 		if (server_version >= 90000)
-			appendPQExpBuffer(buf, ")");
+			appendPQExpBufferChar(buf, ')');
 
 		res = executeQuery(conn, buf->data);
 		if (PQntuples(res) == 1 &&
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -4676,7 +4676,7 @@ get_create_object_cmd(EditableObjectType obj_type, Oid oid,
 							psql_error("could not parse reloptions array\n");
 							result = false;
 						}
-						appendPQExpBufferStr(buf, ")");
+						appendPQExpBufferChar(buf, ')');
 					}
 
 					/* View definition from pg_get_viewdef (a SELECT query) */
@@ -4862,7 +4862,7 @@ minimal_error_message(PGresult *res)
 		appendPQExpBufferStr(msg, fld);
 	else
 		appendPQExpBufferStr(msg, "(not available)");
-	appendPQExpBufferStr(msg, "\n");
+	appendPQExpBufferChar(msg, '\n');
 
 	psql_error("%s", msg->data);
 
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -3177,7 +3177,7 @@ describeRoles(const char *pattern, bool verbose, bool showSystem)
 		if (strcmp(PQgetvalue(res, i, 7), "") != 0)
 		{
 			if (buf.len > 0)
-				appendPQExpBufferStr(&buf, "\n");
+				appendPQExpBufferChar(&buf, '\n');
 			appendPQExpBufferStr(&buf, _("Password valid until "));
 			appendPQExpBufferStr(&buf, PQgetvalue(res, i, 7));
 		}
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c

Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,7 @@ deparseSelectStmtForRel(StringInfo buf, PlannerInfo root, RelOptInfo rel,`
`973`	`973`	`/* Append HAVING clause */`
`974`	`974`	`if (remote_conds)`
`975`	`975`	`{`
`976`		`- appendStringInfo(buf, " HAVING ");`
	`976`	`+ appendStringInfoString(buf, " HAVING ");`
`977`	`977`	`appendConditions(remote_conds, &context);`
`978`	`978`	`}`
`979`	`979`	`}`
`@@ -1076,7 +1076,7 @@ deparseFromExpr(List quals, deparse_expr_cxt context)`
`1076`	`1076`	`/* Construct WHERE clause */`
`1077`	`1077`	`if (quals != NIL)`
`1078`	`1078`	`{`
`1079`		`- appendStringInfo(buf, " WHERE ");`
	`1079`	`+ appendStringInfoString(buf, " WHERE ");`
`1080`	`1080`	`appendConditions(quals, context);`
`1081`	`1081`	`}`
`1082`	`1082`	`}`
`@@ -1447,15 +1447,15 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo root, RelOptInfo foreignrel,`
`1447`	`1447`	`context.root = root;`
`1448`	`1448`	`context.params_list = params_list;`
`1449`	`1449`
`1450`		`- appendStringInfo(buf, "(");`
	`1450`	`+ appendStringInfoChar(buf, '(');`
`1451`	`1451`	`appendConditions(fpinfo->joinclauses, &context);`
`1452`		`- appendStringInfo(buf, ")");`
	`1452`	`+ appendStringInfoChar(buf, ')');`
`1453`	`1453`	`}`
`1454`	`1454`	`else`
`1455`	`1455`	`appendStringInfoString(buf, "(TRUE)");`
`1456`	`1456`
`1457`	`1457`	`/* End the FROM clause entry. */`
`1458`		`- appendStringInfo(buf, ")");`
	`1458`	`+ appendStringInfoChar(buf, ')');`
`1459`	`1459`	`}`
`1460`	`1460`	`else`
`1461`	`1461`	`{`
`@@ -1702,7 +1702,7 @@ deparseDirectUpdateSql(StringInfo buf, PlannerInfo *root,`
`1702`	`1702`
`1703`	`1703`	`if (remote_conds)`
`1704`	`1704`	`{`
`1705`		`- appendStringInfo(buf, " WHERE ");`
	`1705`	`+ appendStringInfoString(buf, " WHERE ");`
`1706`	`1706`	`appendConditions(remote_conds, &context);`
`1707`	`1707`	`}`
`1708`	`1708`
`@@ -1762,7 +1762,7 @@ deparseDirectDeleteSql(StringInfo buf, PlannerInfo *root,`
`1762`	`1762`
`1763`	`1763`	`if (remote_conds)`
`1764`	`1764`	`{`
`1765`		`- appendStringInfo(buf, " WHERE ");`
	`1765`	`+ appendStringInfoString(buf, " WHERE ");`
`1766`	`1766`	`appendConditions(remote_conds, &context);`
`1767`	`1767`	`}`
`1768`	`1768`
`@@ -1978,17 +1978,17 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root,`
`1978`	`1978`	`{`
`1979`	`1979`	`appendStringInfoString(buf, "CASE WHEN (");`
`1980`	`1980`	`ADD_REL_QUALIFIER(buf, varno);`
`1981`		`- appendStringInfo(buf, "*)::text IS NOT NULL THEN ");`
	`1981`	`+ appendStringInfoString(buf, "*)::text IS NOT NULL THEN ");`
`1982`	`1982`	`}`
`1983`	`1983`
`1984`	`1984`	`appendStringInfoString(buf, "ROW(");`
`1985`	`1985`	`deparseTargetList(buf, root, varno, rel, false, attrs_used, qualify_col,`
`1986`	`1986`	`&retrieved_attrs);`
`1987`		`- appendStringInfoString(buf, ")");`
	`1987`	`+ appendStringInfoChar(buf, ')');`
`1988`	`1988`
`1989`	`1989`	`/* Complete the CASE WHEN statement started above. */`
`1990`	`1990`	`if (qualify_col)`
`1991`		`- appendStringInfo(buf, " END");`
	`1991`	`+ appendStringInfoString(buf, " END");`
`1992`	`1992`
`1993`	`1993`	`heap_close(rel, NoLock);`
`1994`	`1994`	`bms_free(attrs_used);`
`@@ -2759,7 +2759,7 @@ deparseAggref(Aggref node, deparse_expr_cxt context)`
`2759`	`2759`	`appendStringInfoChar(buf, '(');`
`2760`	`2760`
`2761`	`2761`	`/* Add DISTINCT */`
`2762`		`- appendStringInfo(buf, "%s", (node->aggdistinct != NIL) ? "DISTINCT " : "");`
	`2762`	`+ appendStringInfoString(buf, (node->aggdistinct != NIL) ? "DISTINCT " : "");`
`2763`	`2763`
`2764`	`2764`	`if (AGGKIND_IS_ORDERED_SET(node->aggkind))`
`2765`	`2765`	`{`
`@@ -2944,7 +2944,7 @@ appendGroupByClause(List tlist, deparse_expr_cxt context)`
`2944`	`2944`	`if (!query->groupClause)`
`2945`	`2945`	`return;`
`2946`	`2946`
`2947`		`- appendStringInfo(buf, " GROUP BY ");`
	`2947`	`+ appendStringInfoString(buf, " GROUP BY ");`
`2948`	`2948`
`2949`	`2949`	`/*`
`2950`	`2950`	`* Queries with grouping sets are not pushed down, so we don't expect`
`@@ -2981,7 +2981,7 @@ appendOrderByClause(List pathkeys, deparse_expr_cxt context)`
`2981`	`2981`	`/* Make sure any constants in the exprs are printed portably */`
`2982`	`2982`	`nestlevel = set_transmission_modes();`
`2983`	`2983`
`2984`		`- appendStringInfo(buf, " ORDER BY");`
	`2984`	`+ appendStringInfoString(buf, " ORDER BY");`
`2985`	`2985`	`foreach(lcell, pathkeys)`
`2986`	`2986`	`{`
`2987`	`2987`	`PathKey *pathkey = lfirst(lcell);`
`@@ -3035,7 +3035,7 @@ appendFunctionName(Oid funcid, deparse_expr_cxt *context)`
`3035`	`3035`
`3036`	`3036`	`/* Always print the function name */`
`3037`	`3037`	`proname = NameStr(procform->proname);`
`3038`		`- appendStringInfo(buf, "%s", quote_identifier(proname));`
	`3038`	`+ appendStringInfoString(buf, quote_identifier(proname));`
`3039`	`3039`
`3040`	`3040`	`ReleaseSysCache(proctup);`
`3041`	`3041`	`}`
`@@ -3070,9 +3070,9 @@ deparseSortGroupClause(Index ref, List tlist, deparse_expr_cxt context)`
`3070`	`3070`	`else`
`3071`	`3071`	`{`
`3072`	`3072`	`/* Always parenthesize the expression. */`
`3073`		`- appendStringInfoString(buf, "(");`
	`3073`	`+ appendStringInfoChar(buf, '(');`
`3074`	`3074`	`deparseExpr(expr, context);`
`3075`		`- appendStringInfoString(buf, ")");`
	`3075`	`+ appendStringInfoChar(buf, ')');`
`3076`	`3076`	`}`
`3077`	`3077`
`3078`	`3078`	`return (Node *) expr;`
Original file line number	Diff line number	Diff line change
`@@ -1656,19 +1656,19 @@ pg_get_partkeydef_worker(Oid relid, int prettyFlags,`
`1656`	`1656`	`{`
`1657`	`1657`	`case PARTITION_STRATEGY_LIST:`
`1658`	`1658`	`if (!attrsOnly)`
`1659`		`- appendStringInfo(&buf, "LIST");`
	`1659`	`+ appendStringInfoString(&buf, "LIST");`
`1660`	`1660`	`break;`
`1661`	`1661`	`case PARTITION_STRATEGY_RANGE:`
`1662`	`1662`	`if (!attrsOnly)`
`1663`		`- appendStringInfo(&buf, "RANGE");`
	`1663`	`+ appendStringInfoString(&buf, "RANGE");`
`1664`	`1664`	`break;`
`1665`	`1665`	`default:`
`1666`	`1666`	`elog(ERROR, "unexpected partition strategy: %d",`
`1667`	`1667`	`(int) form->partstrat);`
`1668`	`1668`	`}`
`1669`	`1669`
`1670`	`1670`	`if (!attrsOnly)`
`1671`		`- appendStringInfo(&buf, " (");`
	`1671`	`+ appendStringInfoString(&buf, " (");`
`1672`	`1672`	`sep = "";`
`1673`	`1673`	`for (keyno = 0; keyno < form->partnatts; keyno++)`
`1674`	`1674`	`{`
`@@ -5635,10 +5635,10 @@ get_rule_sortgroupclause(Index ref, List *tlist, bool force_colno,`
`5635`	`5635`	`\|\|IsA(expr, WindowFunc));`
`5636`	`5636`
`5637`	`5637`	`if (need_paren)`
`5638`		`- appendStringInfoString(context->buf, "(");`
	`5638`	`+ appendStringInfoChar(context->buf, '(');`
`5639`	`5639`	`get_rule_expr(expr, context, true);`
`5640`	`5640`	`if (need_paren)`
`5641`		`- appendStringInfoString(context->buf, ")");`
	`5641`	`+ appendStringInfoChar(context->buf, ')');`
`5642`	`5642`	`}`
`5643`	`5643`
`5644`	`5644`	`return expr;`
`@@ -5665,7 +5665,7 @@ get_rule_groupingset(GroupingSet gset, List targetlist,`
`5665`	`5665`	`case GROUPING_SET_SIMPLE:`
`5666`	`5666`	`{`
`5667`	`5667`	`if (!omit_parens \|\| list_length(gset->content) != 1)`
`5668`		`- appendStringInfoString(buf, "(");`
	`5668`	`+ appendStringInfoChar(buf, '(');`
`5669`	`5669`
`5670`	`5670`	`foreach(l, gset->content)`
`5671`	`5671`	`{`
`@@ -5678,7 +5678,7 @@ get_rule_groupingset(GroupingSet gset, List targetlist,`
`5678`	`5678`	`}`
`5679`	`5679`
`5680`	`5680`	`if (!omit_parens \|\| list_length(gset->content) != 1)`
`5681`		`- appendStringInfoString(buf, ")");`
	`5681`	`+ appendStringInfoChar(buf, ')');`
`5682`	`5682`	`}`
`5683`	`5683`	`return;`
`5684`	`5684`
`@@ -5701,7 +5701,7 @@ get_rule_groupingset(GroupingSet gset, List targetlist,`
`5701`	`5701`	`sep = ", ";`
`5702`	`5702`	`}`
`5703`	`5703`
`5704`		`- appendStringInfoString(buf, ")");`
	`5704`	`+ appendStringInfoChar(buf, ')');`
`5705`	`5705`	`}`
`5706`	`5706`
`5707`	`5707`	`/*`
`@@ -8713,7 +8713,7 @@ get_rule_expr(Node node, deparse_context context,`
`8713`	`8713`	`sep = ", ";`
`8714`	`8714`	`}`
`8715`	`8715`
`8716`		`- appendStringInfoString(buf, ")");`
	`8716`	`+ appendStringInfoChar(buf, ')');`
`8717`	`8717`	`break;`
`8718`	`8718`
`8719`	`8719`	`case PARTITION_STRATEGY_RANGE:`
`@@ -10941,7 +10941,7 @@ get_range_partbound_string(List *bound_datums)`
`10941`	`10941`	`}`
`10942`	`10942`	`sep = ", ";`
`10943`	`10943`	`}`
`10944`		`- appendStringInfoString(buf, ")");`
	`10944`	`+ appendStringInfoChar(buf, ')');`
`10945`	`10945`
`10946`	`10946`	`return buf->data;`
`10947`	`10947`	`}`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ FreePageManagerDump(FreePageManager *fpm)`
`455`	`455`	`recycle = relptr_access(base, fpm->btree_recycle);`
`456`	`456`	`if (recycle != NULL)`
`457`	`457`	`{`
`458`		`- appendStringInfo(&buf, "btree recycle:");`
	`458`	`+ appendStringInfoString(&buf, "btree recycle:");`
`459`	`459`	`FreePageManagerDumpSpans(fpm, recycle, 1, &buf);`
`460`	`460`	`}`
`461`	`461`
`@@ -468,7 +468,7 @@ FreePageManagerDump(FreePageManager *fpm)`
`468`	`468`	`continue;`
`469`	`469`	`if (!dumped_any_freelist)`
`470`	`470`	`{`
`471`		`- appendStringInfo(&buf, "freelists:\n");`
	`471`	`+ appendStringInfoString(&buf, "freelists:\n");`
`472`	`472`	`dumped_any_freelist = true;`
`473`	`473`	`}`
`474`	`474`	`appendStringInfo(&buf, " %zu:", f + 1);`
`@@ -1275,7 +1275,7 @@ FreePageManagerDumpBtree(FreePageManager fpm, FreePageBtree btp,`
`1275`	`1275`	`btp->u.leaf_key[index].first_page,`
`1276`	`1276`	`btp->u.leaf_key[index].npages);`
`1277`	`1277`	`}`
`1278`		`- appendStringInfo(buf, "\n");`
	`1278`	`+ appendStringInfoChar(buf, '\n');`
`1279`	`1279`
`1280`	`1280`	`if (btp->hdr.magic == FREE_PAGE_INTERNAL_MAGIC)`
`1281`	`1281`	`{`
`@@ -1308,7 +1308,7 @@ FreePageManagerDumpSpans(FreePageManager fpm, FreePageSpanLeader span,`
`1308`	`1308`	`span = relptr_access(base, span->next);`
`1309`	`1309`	`}`
`1310`	`1310`
`1311`		`- appendStringInfo(buf, "\n");`
	`1311`	`+ appendStringInfoChar(buf, '\n');`
`1312`	`1312`	`}`
`1313`	`1313`
`1314`	`1314`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -4676,7 +4676,7 @@ get_create_object_cmd(EditableObjectType obj_type, Oid oid,`
`4676`	`4676`	`psql_error("could not parse reloptions array\n");`
`4677`	`4677`	`result = false;`
`4678`	`4678`	`}`
`4679`		`- appendPQExpBufferStr(buf, ")");`
	`4679`	`+ appendPQExpBufferChar(buf, ')');`
`4680`	`4680`	`}`
`4681`	`4681`
`4682`	`4682`	`/* View definition from pg_get_viewdef (a SELECT query) */`
`@@ -4862,7 +4862,7 @@ minimal_error_message(PGresult *res)`
`4862`	`4862`	`appendPQExpBufferStr(msg, fld);`
`4863`	`4863`	`else`
`4864`	`4864`	`appendPQExpBufferStr(msg, "(not available)");`
`4865`		`- appendPQExpBufferStr(msg, "\n");`
	`4865`	`+ appendPQExpBufferChar(msg, '\n');`
`4866`	`4866`
`4867`	`4867`	`psql_error("%s", msg->data);`
`4868`	`4868`