From 5faef9d582012433db9ad05af27a77bd591508e1 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 3 Jul 2022 20:11:05 +0200 Subject: Remove redundant null pointer checks before PQclear and PQconninfoFree These functions already had the free()-like behavior of handling null pointers as a no-op. But it wasn't documented, so add it explicitly to the documentation, too. Discussion: https://www.postgresql.org/message-id/flat/dac5d2d0-98f5-94d9-8e69-46da2413593d%40enterprisedb.com --- contrib/postgres_fdw/postgres_fdw.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'contrib/postgres_fdw/postgres_fdw.c') diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index d56951153bb..955a428e3da 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -2790,8 +2790,7 @@ postgresEndDirectModify(ForeignScanState *node) return; /* Release PGresult */ - if (dmstate->result) - PQclear(dmstate->result); + PQclear(dmstate->result); /* Release remote connection */ ReleaseConnection(dmstate->conn); @@ -3604,8 +3603,7 @@ get_remote_estimate(const char *sql, PGconn *conn, } PG_FINALLY(); { - if (res) - PQclear(res); + PQclear(res); } PG_END_TRY(); } @@ -3853,8 +3851,7 @@ fetch_more_data(ForeignScanState *node) } PG_FINALLY(); { - if (res) - PQclear(res); + PQclear(res); } PG_END_TRY(); @@ -4338,8 +4335,7 @@ store_returning_result(PgFdwModifyState *fmstate, } PG_CATCH(); { - if (res) - PQclear(res); + PQclear(res); PG_RE_THROW(); } PG_END_TRY(); @@ -4627,8 +4623,7 @@ get_returning_data(ForeignScanState *node) } PG_CATCH(); { - if (dmstate->result) - PQclear(dmstate->result); + PQclear(dmstate->result); PG_RE_THROW(); } PG_END_TRY(); @@ -4957,8 +4952,7 @@ postgresAnalyzeForeignTable(Relation relation, } PG_FINALLY(); { - if (res) - PQclear(res); + PQclear(res); } PG_END_TRY(); @@ -5114,8 +5108,7 @@ postgresAcquireSampleRowsFunc(Relation relation, int elevel, } PG_CATCH(); { - if (res) - PQclear(res); + PQclear(res); PG_RE_THROW(); } PG_END_TRY(); @@ -5496,8 +5489,7 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid) } PG_FINALLY(); { - if (res) - PQclear(res); + PQclear(res); } PG_END_TRY(); -- cgit v1.2.3