summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-07-13 10:29:48 +0200
committerAnand Avati <avati@redhat.com>2012-07-13 14:03:42 -0700
commit7820b2c1f88b207a8b1270b8c3cb3b797b7563d2 (patch)
tree5a383d85eb18399cf7506a90cc7627c749ccf9b8 /glusterfsd
parent2dc0d32e5d8b205fa407073b209bb663d546dde8 (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 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c69
-rw-r--r--glusterfsd/src/glusterfsd.c12
2 files changed, 27 insertions, 54 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index 9262451c6..f37129878 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -194,8 +194,7 @@ glusterfs_terminate_response_send (rpcsvc_request_t *req, int op_ret)
ret = glusterfs_submit_reply (req, &rsp, NULL, 0, NULL,
(xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
- if (rsp.output.output_val)
- GF_FREE (rsp.output.output_val);
+ GF_FREE (rsp.output.output_val);
if (dict)
dict_unref (dict);
return ret;
@@ -289,10 +288,8 @@ out:
ret = glusterfs_translator_info_response_send (priv->req, ret,
msg, output);
- if (priv->xlator_req.name)
- free (priv->xlator_req.name);
- if (priv->xlator_req.input.input_val)
- free (priv->xlator_req.input.input_val);
+ free (priv->xlator_req.name);
+ free (priv->xlator_req.input.input_val);
if (dict)
dict_unref (dict);
if (output)
@@ -499,8 +496,7 @@ out:
close (fd);
if (input_fd >= 0)
close (input_fd);
- if (buf)
- GF_FREE (buf);
+ GF_FREE (buf);
unlink (export_path);
(void)glusterfs_handle_translator_info_get_cont (priv);
@@ -625,8 +621,7 @@ out:
close (input_fd);
if (output_fd >= 0)
close (output_fd);
- if (buf)
- GF_FREE (buf);
+ GF_FREE (buf);
unlink (export_path);
(void)glusterfs_handle_translator_info_get_cont (priv);
@@ -716,8 +711,7 @@ out:
dict_unref (input);
if (output)
dict_unref (output);
- if (xlator_req.name)
- free (xlator_req.name); //malloced by xdr
+ free (xlator_req.name); //malloced by xdr
return 0;
}
@@ -790,12 +784,10 @@ glusterfs_handle_defrag (rpcsvc_request_t *req)
out:
if (dict)
dict_unref (dict);
- if (xlator_req.input.input_val)
- free (xlator_req.input.input_val); // malloced by xdr
+ free (xlator_req.input.input_val); // malloced by xdr
if (output)
dict_unref (output);
- if (xlator_req.name)
- free (xlator_req.name); //malloced by xdr
+ free (xlator_req.name); //malloced by xdr
return ret;
@@ -922,14 +914,10 @@ out:
dict_unref (dict);
if (output)
dict_unref (output);
- if (brick_req.input.input_val)
- free (brick_req.input.input_val);
- if (xname)
- GF_FREE (xname);
- if (msg)
- GF_FREE (msg);
- if (rsp.output.output_val)
- GF_FREE (rsp.output.output_val);
+ free (brick_req.input.input_val);
+ GF_FREE (xname);
+ GF_FREE (msg);
+ GF_FREE (rsp.output.output_val);
return ret;
}
@@ -1104,16 +1092,11 @@ glusterfs_handle_node_status (rpcsvc_request_t *req)
out:
if (dict)
dict_unref (dict);
- if (node_req.input.input_val)
- free (node_req.input.input_val);
- if (msg)
- GF_FREE (msg);
- if (rsp.output.output_val)
- GF_FREE (rsp.output.output_val);
- if (node_name)
- GF_FREE (node_name);
- if (subvol_name)
- GF_FREE (subvol_name);
+ free (node_req.input.input_val);
+ GF_FREE (msg);
+ GF_FREE (rsp.output.output_val);
+ GF_FREE (node_name);
+ GF_FREE (subvol_name);
gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);
return ret;
@@ -1200,14 +1183,12 @@ glusterfs_handle_nfs_profile (rpcsvc_request_t *req)
(xdrproc_t)xdr_gd1_mgmt_brick_op_rsp);
out:
- if (nfs_req.input.input_val)
- free (nfs_req.input.input_val);
+ free (nfs_req.input.input_val);
if (dict)
dict_unref (dict);
if (output)
dict_unref (output);
- if (rsp.output.output_val)
- GF_FREE (rsp.output.output_val);
+ GF_FREE (rsp.output.output_val);
gf_log (THIS->name, GF_LOG_DEBUG, "Returning %d", ret);
return ret;
@@ -1627,8 +1608,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
out:
STACK_DESTROY (frame->root);
- if (rsp.spec)
- free (rsp.spec);
+ free (rsp.spec);
if (ret && ctx && !ctx->active) {
/* Do it only for the first time */
@@ -1699,8 +1679,7 @@ mgmt_event_notify_cbk (struct rpc_req *req, struct iovec *iov, int count,
goto out;
}
out:
- if (rsp.dict.dict_val)
- free (rsp.dict.dict_val); //malloced by xdr
+ free (rsp.dict.dict_val); //malloced by xdr
return ret;
}
@@ -1739,8 +1718,7 @@ glusterfs_rebalance_event_notify_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
out:
- if (rsp.dict.dict_val)
- free (rsp.dict.dict_val); //malloced by xdr
+ free (rsp.dict.dict_val); //malloced by xdr
return ret;
}
@@ -1775,8 +1753,7 @@ glusterfs_rebalance_event_notify (dict_t *dict)
glusterfs_rebalance_event_notify_cbk,
(xdrproc_t)xdr_gf_event_notify_req);
- if (req.dict.dict_val)
- GF_FREE (req.dict.dict_val);
+ GF_FREE (req.dict.dict_val);
STACK_DESTROY (frame->root);
return ret;
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 76f019481..93e840606 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -531,12 +531,9 @@ gf_remember_xlator_option (struct list_head *options, char *arg)
out:
if (ret == -1) {
if (option) {
- if (option->volume)
- GF_FREE (option->volume);
- if (option->key)
- GF_FREE (option->key);
- if (option->value)
- GF_FREE (option->value);
+ GF_FREE (option->volume);
+ GF_FREE (option->key);
+ GF_FREE (option->value);
GF_FREE (option);
}
@@ -615,8 +612,7 @@ parse_opts (int key, char *arg, struct argp_state *state)
break;
case ARGP_VOLUME_FILE_KEY:
- if (cmd_args->volfile)
- GF_FREE (cmd_args->volfile);
+ GF_FREE (cmd_args->volfile);
if (arg[0] != '/') {
pwd = getcwd (NULL, PATH_MAX);