diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-07-13 10:29:48 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-07-13 14:03:42 -0700 |
| commit | 7820b2c1f88b207a8b1270b8c3cb3b797b7563d2 (patch) | |
| tree | 5a383d85eb18399cf7506a90cc7627c749ccf9b8 /rpc/rpc-transport | |
| parent | 2dc0d32e5d8b205fa407073b209bb663d546dde8 (diff) | |
remove useless if-before-free (and free-like) functions
See comments in http://bugzilla.redhat.com/839925 for
the code to perform this change.
Signed-off-by: Jim Meyering <meyering@redhat.com>
BUG: 839925
Change-Id: I10e4ecff16c3749fe17c2831c516737e08a3205a
Reviewed-on: http://review.gluster.com/3661
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'rpc/rpc-transport')
| -rw-r--r-- | rpc/rpc-transport/rdma/src/rdma.c | 8 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index 3d4dfe3620f..facc92358a8 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -196,9 +196,7 @@ gf_rdma_new_post (gf_rdma_device_t *device, int32_t len, ret = 0; out: if (ret != 0) { - if (post->buf != NULL) { - free (post->buf); - } + free (post->buf); GF_FREE (post); post = NULL; @@ -2931,9 +2929,7 @@ out: *readch = NULL; } - if (write_ary != NULL) { - GF_FREE (write_ary); - } + GF_FREE (write_ary); } return ret; diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 655e806ab51..9db09d77e6a 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -467,9 +467,7 @@ __socket_reset (rpc_transport_t *this) iobuf_unref (priv->incoming.iobuf); } - if (priv->incoming.request_info != NULL) { - GF_FREE (priv->incoming.request_info); - } + GF_FREE (priv->incoming.request_info); memset (&priv->incoming, 0, sizeof (priv->incoming)); @@ -1102,8 +1100,7 @@ __socket_read_accepted_successful_reply (rpc_transport_t *this) well and good, we don't need to worry about */ xdr_gfs3_read_rsp (&xdr, &read_rsp); - if (read_rsp.xdata.xdata_val) - free (read_rsp.xdata.xdata_val); + free (read_rsp.xdata.xdata_val); /* need to round off to proper roof (%4), as XDR packing pads the end of opaque object with '0' */ |