mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded null pointer checks before PQfreemem()

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

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/flat/cf26e970-8e92-59f1-247a-aa265235075b%40enterprisedb.com
This commit is contained in:
Peter Eisentraut 2022-08-26 19:16:28 +02:00
parent 45987aae26
commit e890ce7a4f
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/vacuumlo/vacuumlo.c
View File

@ -231,11 +231,8 @@ vacuumlo(const char *database, const struct _param *param)
pg_log_error("%s", PQerrorMessage(conn)); pg_log_error("%s", PQerrorMessage(conn));
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
if (schema != NULL)
PQfreemem(schema); PQfreemem(schema);
if (table != NULL)
PQfreemem(table); PQfreemem(table);
if (field != NULL)
PQfreemem(field); PQfreemem(field);
return -1; return -1;
} }

2
src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
View File

@ -741,7 +741,6 @@ static void
libpqrcv_disconnect(WalReceiverConn *conn) libpqrcv_disconnect(WalReceiverConn *conn)
{ {
PQfinish(conn->streamConn); PQfinish(conn->streamConn);
if (conn->recvBuf != NULL)
PQfreemem(conn->recvBuf); PQfreemem(conn->recvBuf);
pfree(conn); pfree(conn);
} }
@ -768,7 +767,6 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer,
{ {
int rawlen; int rawlen;
if (conn->recvBuf != NULL)
PQfreemem(conn->recvBuf); PQfreemem(conn->recvBuf);
conn->recvBuf = NULL; conn->recvBuf = NULL;

3
src/bin/pg_basebackup/receivelog.c
View File

@ -858,7 +858,6 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream,
} }
error: error:
if (copybuf != NULL)
PQfreemem(copybuf); PQfreemem(copybuf);
return NULL; return NULL;
} }
@ -940,7 +939,6 @@ CopyStreamReceive(PGconn *conn, long timeout, pgsocket stop_socket,
char *copybuf = NULL; char *copybuf = NULL;
int rawlen; int rawlen;
if (*buffer != NULL)
PQfreemem(*buffer); PQfreemem(*buffer);
*buffer = NULL; *buffer = NULL;
@ -1204,7 +1202,6 @@ HandleEndOfCopyStream(PGconn *conn, StreamCtl *stream, char *copybuf,
} }
still_sending = false; still_sending = false;
} }
if (copybuf != NULL)
PQfreemem(copybuf); PQfreemem(copybuf);
*stoppos = blockpos; *stoppos = blockpos;
return res; return res;