Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/commands/subscriptioncmds.c10
-rw-r--r--src/backend/nodes/outfuncs.c6
-rw-r--r--src/backend/replication/libpqwalreceiver/libpqwalreceiver.c12
-rw-r--r--src/backend/utils/adt/ruleutils.c20
-rw-r--r--src/backend/utils/adt/xml.c4
-rw-r--r--src/backend/utils/mmgr/freepage.c8
6 files changed, 30 insertions, 30 deletions
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 005e74201d4..9bc1d178fc7 100644
--- 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
index 379d92a2b0c..5ce3c7c5999 100644
--- 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
index 37b481c0020..3957bd37fb1 100644
--- 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
index e9bd64b7a88..7469ec773c6 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -1656,11 +1656,11 @@ 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",
@@ -1668,7 +1668,7 @@ pg_get_partkeydef_worker(Oid relid, int prettyFlags,
}
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
index 323614c183d..c47624eff68 100644
--- 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
index 7566a669708..b455484befc 100644
--- 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');
}
/*