aboutsummaryrefslogtreecommitdiff
path: root/contrib/dblink/dblink.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2017-04-05 09:03:11 -0400
committerPeter Eisentraut <peter_e@gmx.net>2017-04-05 09:03:11 -0400
commite59b74a3fc524a658172d9ec9f1728da89136bce (patch)
treef3ecf09ce0e7d6874e00ea1624206752263b25e4 /contrib/dblink/dblink.c
parentafd79873a0b151bfbe5312acebfe361da09c11fd (diff)
downloadpostgresql-e59b74a3fc524a658172d9ec9f1728da89136bce.tar.gz
postgresql-e59b74a3fc524a658172d9ec9f1728da89136bce.zip
dblink: Small code rearrangement for clarity
suggested by Tom Lane
Diffstat (limited to 'contrib/dblink/dblink.c')
-rw-r--r--contrib/dblink/dblink.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 1d5555afb6f..44b67daedba 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -360,7 +360,7 @@ Datum
dblink_open(PG_FUNCTION_ARGS)
{
PGresult *res = NULL;
- PGconn *conn = NULL;
+ PGconn *conn;
char *curname = NULL;
char *sql = NULL;
char *conname = NULL;
@@ -408,8 +408,8 @@ dblink_open(PG_FUNCTION_ARGS)
if (!rconn || !rconn->conn)
dblink_conn_not_avail(conname);
- else
- conn = rconn->conn;
+
+ conn = rconn->conn;
/* If we are not in a transaction, start one */
if (PQtransactionStatus(conn) == PQTRANS_IDLE)
@@ -451,7 +451,7 @@ PG_FUNCTION_INFO_V1(dblink_close);
Datum
dblink_close(PG_FUNCTION_ARGS)
{
- PGconn *conn = NULL;
+ PGconn *conn;
PGresult *res = NULL;
char *curname = NULL;
char *conname = NULL;
@@ -495,8 +495,8 @@ dblink_close(PG_FUNCTION_ARGS)
if (!rconn || !rconn->conn)
dblink_conn_not_avail(conname);
- else
- conn = rconn->conn;
+
+ conn = rconn->conn;
appendStringInfo(&buf, "CLOSE %s", curname);