summaryrefslogtreecommitdiff
path: root/src/interfaces
diff options
context:
space:
mode:
authorTom Lane2021-05-12 17:14:10 +0000
committerTom Lane2021-05-12 17:14:10 +0000
commitdef5b065ff22a16a80084587613599fe15627213 (patch)
tree13f424449b7fb90c85659071b6adf4e27ae6d272 /src/interfaces
parente6ccd1ce1644d1b40b7981f8bc172394de524f99 (diff)
Initial pgindent and pgperltidy run for v14.
Also "make reformat-dat-files". The only change worthy of note is that pgindent messed up the formatting of launcher.c's struct LogicalRepWorkerId, which led me to notice that that struct wasn't used at all anymore, so I just took it out.
Diffstat (limited to 'src/interfaces')
-rw-r--r--src/interfaces/ecpg/preproc/ecpg.c1
-rw-r--r--src/interfaces/ecpg/preproc/parse.pl24
-rw-r--r--src/interfaces/libpq/fe-secure-openssl.c8
-rw-r--r--src/interfaces/libpq/fe-trace.c2
4 files changed, 18 insertions, 17 deletions
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index 9d861b428b0..13e0f8cf9c2 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -379,6 +379,7 @@ main(int argc, char *const argv[])
for (list = g_declared_list; list != NULL;)
{
struct declared_list *this = list;
+
list = list->next;
free(this);
}
diff --git a/src/interfaces/ecpg/preproc/parse.pl b/src/interfaces/ecpg/preproc/parse.pl
index e46d2a589b4..1e24801a6fb 100644
--- a/src/interfaces/ecpg/preproc/parse.pl
+++ b/src/interfaces/ecpg/preproc/parse.pl
@@ -63,19 +63,19 @@ my %replace_types = (
'opt_array_bounds' => '<index>',
# "ignore" means: do not create type and rules for this non-term-id
- 'parse_toplevel' => 'ignore',
- 'stmtmulti' => 'ignore',
- 'CreateAsStmt' => 'ignore',
- 'DeallocateStmt' => 'ignore',
- 'ColId' => 'ignore',
- 'type_function_name' => 'ignore',
- 'ColLabel' => 'ignore',
- 'Sconst' => 'ignore',
+ 'parse_toplevel' => 'ignore',
+ 'stmtmulti' => 'ignore',
+ 'CreateAsStmt' => 'ignore',
+ 'DeallocateStmt' => 'ignore',
+ 'ColId' => 'ignore',
+ 'type_function_name' => 'ignore',
+ 'ColLabel' => 'ignore',
+ 'Sconst' => 'ignore',
'opt_distinct_clause' => 'ignore',
- 'PLpgSQL_Expr' => 'ignore',
- 'PLAssignStmt' => 'ignore',
- 'plassign_target' => 'ignore',
- 'plassign_equals' => 'ignore',);
+ 'PLpgSQL_Expr' => 'ignore',
+ 'PLAssignStmt' => 'ignore',
+ 'plassign_target' => 'ignore',
+ 'plassign_equals' => 'ignore',);
# these replace_line commands excise certain keywords from the core keyword
# lists. Be sure to account for these in ColLabel and related productions.
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index 6f357dfbfec..00d43f3efff 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -943,8 +943,8 @@ initialize_SSL(PGconn *conn)
if ((cvstore = SSL_CTX_get_cert_store(SSL_context)) != NULL)
{
- char *fname = NULL;
- char *dname = NULL;
+ char *fname = NULL;
+ char *dname = NULL;
if (conn->sslcrl && strlen(conn->sslcrl) > 0)
fname = conn->sslcrl;
@@ -1467,8 +1467,8 @@ pgtls_close(PGconn *conn)
{
/*
* In the non-SSL case, just remove the crypto callbacks if the
- * connection has then loaded. This code path has no dependency
- * on any pending SSL calls.
+ * connection has then loaded. This code path has no dependency on
+ * any pending SSL calls.
*/
if (conn->crypto_loaded)
destroy_needed = true;
diff --git a/src/interfaces/libpq/fe-trace.c b/src/interfaces/libpq/fe-trace.c
index 37ec06fc4d0..ed4247be673 100644
--- a/src/interfaces/libpq/fe-trace.c
+++ b/src/interfaces/libpq/fe-trace.c
@@ -644,7 +644,7 @@ pqTraceOutputMessage(PGconn *conn, const char *message, bool toServer)
if (!toServer)
pqTraceOutputS(conn->Pfdebug, message, &logCursor);
else
- fprintf(conn->Pfdebug, "Sync"); /* no message content */
+ fprintf(conn->Pfdebug, "Sync"); /* no message content */
break;
case 't': /* Parameter Description */
pqTraceOutputt(conn->Pfdebug, message, &logCursor, regress);