diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2018-09-28 13:03:38 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-10-15 04:05:30 +0000 |
| commit | 76cc1ea613e038ced4bc6ae26233cb0681b63be5 (patch) | |
| tree | ecca8321697c25951dbe94bb4b7d182040d567ac /xlators/mgmt | |
| parent | c962e2cbd73e78f31e690f7b1f8456616006c543 (diff) | |
libglusterfs/dict: Add sizeof()-1 variants of dict functions
One needs to be very careful about giving same key for the key and
SLEN(key) arguments in dict_xxxn() functions. Writing macros that
would take care of passing the SLEN(key) would help reduce this
burden on the developer and reviewer.
updates: bz#1193929
Change-Id: I312c479b919826570b47ae2c219c53e2f9b2ddef
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Diffstat (limited to 'xlators/mgmt')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 6 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 8 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-quota.c | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 5714e44e1f4..aa8892784df 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -3499,13 +3499,11 @@ glusterd_friend_rpc_create(xlator_t *this, glusterd_peerinfo_t *peerinfo, data = dict_getn(this->options, "transport.socket.bind-address", SLEN("transport.socket.bind-address")); if (data) { - ret = dict_setn(options, "transport.socket.source-addr", - SLEN("transport.socket.source-addr"), data); + ret = dict_set_sizen(options, "transport.socket.source-addr", data); } data = dict_getn(this->options, "ping-timeout", SLEN("ping-timeout")); if (data) { - ret = dict_setn(options, "ping-timeout", SLEN("ping-timeout"), - data); + ret = dict_set_sizen(options, "ping-timeout", data); } } diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index c8343fb0a2d..3ccc9a3c776 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -2122,7 +2122,7 @@ _delete_reconfig_opt(dict_t *this, char *key, data_t *value, void *data) * option is going to be reset * */ if (!strncmp(key, VKEY_FEATURES_BITROT, strlen(VKEY_FEATURES_BITROT))) { - dict_deln(this, VKEY_FEATURES_SCRUB, SLEN(VKEY_FEATURES_SCRUB)); + dict_del_sizen(this, VKEY_FEATURES_SCRUB); } out: return 0; @@ -3244,10 +3244,8 @@ glusterd_remove_profile_volume_options(glusterd_volinfo_t *volinfo) { GF_ASSERT(volinfo); - dict_deln(volinfo->dict, VKEY_DIAG_LAT_MEASUREMENT, - SLEN(VKEY_DIAG_LAT_MEASUREMENT)); - dict_deln(volinfo->dict, VKEY_DIAG_CNT_FOP_HITS, - SLEN(VKEY_DIAG_CNT_FOP_HITS)); + dict_del_sizen(volinfo->dict, VKEY_DIAG_LAT_MEASUREMENT); + dict_del_sizen(volinfo->dict, VKEY_DIAG_CNT_FOP_HITS); } static int diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index d2fefeff9f0..014d3d55b98 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -540,8 +540,7 @@ glusterd_quota_get_default_soft_limit(glusterd_volinfo_t *volinfo, else val = gf_strdup("80%"); - ret = dict_set_dynstrn(rsp_dict, "default-soft-limit", - SLEN("default-soft-limit"), val); + ret = dict_set_dynstr_sizen(rsp_dict, "default-soft-limit", val); if (ret) { gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_SET_FAILED, "Failed to set default " |