diff options
| author | Yaniv Kaul <ykaul@redhat.com> | 2018-09-23 11:04:22 +0300 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-09-26 04:17:30 +0000 |
| commit | 341ba81448e869ae388b4b37556e47f6bf7413a5 (patch) | |
| tree | 2867552e09e07d4320fc9cefb96a9533fc719658 /cli | |
| parent | 064b24900e1f5e3ba3087f7c6a0249613ebed61f (diff) | |
Quota related files: use dict_{setn|getn|deln|get_int32n|set_int32n|set_strn}
In a previous patch (https://review.gluster.org/20769) we've
added the key length to be passed to dict_* funcs, to remove the need
to strlen() it. This patch moves some code to use it.
Please review carefully.
Compile-tested only!
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Change-Id: If4f425a9827be7c36ccfbb9761006ae824a818c6
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-quotad-client.c | 13 | ||||
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/cli/src/cli-quotad-client.c b/cli/src/cli-quotad-client.c index fbd2c0391ab..52ab97ee815 100644 --- a/cli/src/cli-quotad-client.c +++ b/cli/src/cli-quotad-client.c @@ -109,16 +109,21 @@ cli_quotad_clnt_init(xlator_t *this, dict_t *options) struct rpc_clnt *rpc = NULL; int ret = -1; - ret = dict_set_str(options, "transport.address-family", "unix"); + ret = dict_set_nstrn(options, "transport.address-family", + SLEN("transport.address-family"), "unix", + SLEN("unix")); if (ret) goto out; - ret = dict_set_str(options, "transport-type", "socket"); + ret = dict_set_nstrn(options, "transport-type", SLEN("transport-type"), + "socket", SLEN("socket")); if (ret) goto out; - ret = dict_set_str(options, "transport.socket.connect-path", - "/var/run/gluster/quotad.socket"); + ret = dict_set_nstrn(options, "transport.socket.connect-path", + SLEN("transport.socket.connect-path"), + "/var/run/gluster/quotad.socket", + SLEN("/var/run/gluster/quotad.socket")); if (ret) goto out; diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index fea74667e05..4c952b5ccb7 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -3812,9 +3812,11 @@ print_quota_list_from_quotad(call_frame_t *frame, dict_t *rsp_dict) limits.sl = ntoh64(size_limits->sl); if (type == GF_QUOTA_OPTION_TYPE_LIST) - ret = quota_dict_get_meta(rsp_dict, QUOTA_SIZE_KEY, &used_space); + ret = quota_dict_get_meta(rsp_dict, QUOTA_SIZE_KEY, + SLEN(QUOTA_SIZE_KEY), &used_space); else - ret = quota_dict_get_inode_meta(rsp_dict, QUOTA_SIZE_KEY, &used_space); + ret = quota_dict_get_inode_meta(rsp_dict, QUOTA_SIZE_KEY, + SLEN(QUOTA_SIZE_KEY), &used_space); if (ret < 0) { gf_log("cli", GF_LOG_WARNING, "size key not present in dict"); |