summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-rebalance.c
diff options
context:
space:
mode:
authorYaniv Kaul <ykaul@redhat.com>2018-08-21 20:39:16 +0300
committerAmar Tumballi <amarts@redhat.com>2018-09-07 03:39:50 +0000
commitce17a3a66dd15f09d1bf5404f7f3dee860ca6f8c (patch)
tree41b7b2baafd869b611f4c741df7cd262e17a3bb0 /xlators/cluster/dht/src/dht-rebalance.c
parent21e78061a24a094067fb267b77c4ffaae7e762f3 (diff)
multiple xlators: strncpy()->sprintf(), reduce strlen()'s
xlators/cluster/afr/src/afr-common.c xlators/cluster/dht/src/dht-common.c xlators/cluster/dht/src/dht-rebalance.c xlators/cluster/stripe/src/stripe-helpers.c strncpy may not be very efficient for short strings copied into a large buffer: If the length of src is less than n, strncpy() writes additional null bytes to dest to ensure that a total of n bytes are written. Instead, use snprintf(). Also: - save the result of strlen() and re-use it when possible. - move from strlen to SLEN (sizeof() ) for const strings. Compile-tested only! Change-Id: Icdf79dd3d9f9ff120e4720ff2b8bd016df575c38 updates: bz#1193929 Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-rebalance.c')
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index ed61880c8e4..9983429acec 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -147,12 +147,12 @@ dht_send_rebalance_event (xlator_t *this, int cmd, gf_defrag_status_t status)
volname = defrag->tier_conf.volname;
} else {
/* DHT volume */
- len = strlen (this->name);
+ len = strlen (this->name) - strlen (suffix);
tmpstr = gf_strdup (this->name);
if (tmpstr) {
- ptr = tmpstr + (len - strlen (suffix));
+ ptr = tmpstr + len;
if (!strcmp (ptr, suffix)) {
- tmpstr[len - strlen (suffix)] = '\0';
+ tmpstr[len] = '\0';
volname = tmpstr;
}
}