Remove unneeded null pointer checks before PQfreemem()

PQfreemem() just calls free(), and the latter already checks for null
pointers.

Reviewed-by: Tom Lane <[email protected]>
Discussion: https://www.postgresql.org/message-id/flat/cf26e970-8e92-59f1-247a-aa265235075b%40enterprisedb.com

diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index b7c8f2c805e41e9242a625589d684c3586e499fd..264b879bd395ee230072fb75432053eadafc064a 100644 (file)
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -231,12 +231,9 @@ vacuumlo(const char *database, const struct _param *param)
                        pg_log_error("%s", PQerrorMessage(conn));
                        PQclear(res);
                        PQfinish(conn);
-                       if (schema != NULL)
-                               PQfreemem(schema);
-                       if (table != NULL)
-                               PQfreemem(table);
-                       if (field != NULL)
-                               PQfreemem(field);
+                       PQfreemem(schema);
+                       PQfreemem(table);
+                       PQfreemem(field);
                        return -1;
                }
 

diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 2865024524513e9b37fdcc624dd20a783fb47411..7f697b0f29234e90ef772d6775046c61d5fe1c0f 100644 (file)
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -741,8 +741,7 @@ static void
 libpqrcv_disconnect(WalReceiverConn *conn)
 {
        PQfinish(conn->streamConn);
-       if (conn->recvBuf != NULL)
-               PQfreemem(conn->recvBuf);
+       PQfreemem(conn->recvBuf);
        pfree(conn);
 }
 
@@ -768,8 +767,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer,
 {
        int                     rawlen;
 
-       if (conn->recvBuf != NULL)
-               PQfreemem(conn->recvBuf);
+       PQfreemem(conn->recvBuf);
        conn->recvBuf = NULL;
 
        /* Try to receive a CopyData message */

diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index 976d1e73b1fcbd6266f3e0cc81ef08d9c8bcb119..5f6fd3201f38926163595a1ccef0264a3d3bb71b 100644 (file)
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -858,8 +858,7 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream,
        }
 
 error:
-       if (copybuf != NULL)
-               PQfreemem(copybuf);
+       PQfreemem(copybuf);
        return NULL;
 }
 
@@ -940,8 +939,7 @@ CopyStreamReceive(PGconn *conn, long timeout, pgsocket stop_socket,
        char       *copybuf = NULL;
        int                     rawlen;
 
-       if (*buffer != NULL)
-               PQfreemem(*buffer);
+       PQfreemem(*buffer);
        *buffer = NULL;
 
        /* Try to receive a CopyData message */
@@ -1204,8 +1202,7 @@ HandleEndOfCopyStream(PGconn *conn, StreamCtl *stream, char *copybuf,
                }
                still_sending = false;
        }
-       if (copybuf != NULL)
-               PQfreemem(copybuf);
+       PQfreemem(copybuf);
        *stoppos = blockpos;
        return res;
 }