diff options
author | Yaniv Kaul <ykaul@redhat.com> | 2019-06-02 21:14:18 +0300 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2019-07-22 11:41:13 +0000 |
commit | 5c20a688fd2408ff8dcc66fd8ebc935e228dd803 (patch) | |
tree | 6205e6c84aea40d964b76323629422c68511365f /xlators/protocol/client/src/client-handshake.c | |
parent | 06e92a2ee437c1a81c815129b1d188af0b4fa84e (diff) |
(multiple files) use dict_allocate_and_serialize() where applicable.
This function does length, allocation and serialization for you.
Change-Id: I142a259952a2fe83dd719442afaefe4a43a8e55e
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/protocol/client/src/client-handshake.c')
-rw-r--r-- | xlators/protocol/client/src/client-handshake.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index 01505587243..1fdc96a6ac6 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -1287,18 +1287,10 @@ client_setvolume(xlator_t *this, struct rpc_clnt *rpc) "Failed to set client opversion in handshake message"); } - ret = dict_serialized_length(options); - if (ret < 0) { - gf_msg(this->name, GF_LOG_ERROR, 0, PC_MSG_DICT_ERROR, - "failed to get serialized length of dict"); + ret = dict_allocate_and_serialize(options, (char **)&req.dict.dict_val, + &req.dict.dict_len); + if (ret != 0) { ret = -1; - goto fail; - } - req.dict.dict_len = ret; - req.dict.dict_val = GF_CALLOC(1, req.dict.dict_len, - gf_client_mt_clnt_req_buf_t); - ret = dict_serialize(options, req.dict.dict_val); - if (ret < 0) { gf_msg(this->name, GF_LOG_ERROR, 0, PC_MSG_DICT_SERIALIZE_FAIL, "failed to serialize " "dictionary"); |