diff options
author | Vijay Bellur <vbellur@redhat.com> | 2019-02-27 16:02:43 -0800 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2019-04-12 13:08:28 +0000 |
commit | c261eb6c1fa41b6a0eadabbb3a2f64dc194ec254 (patch) | |
tree | 93eb38d3e003c998a53844cc7a0081d1a9cf9b40 /libglusterfs/src | |
parent | 0e1223491e964096384edfae5032ed0d50d028ad (diff) |
Replace memdup() with gf_memdup()
memdup() and gf_memdup() have the same implementation. Removed one API
as the presence of both can be confusing.
Change-Id: I562130c668457e13e4288e592792872d2e49887e
updates: bz#1193929
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'libglusterfs/src')
-rw-r--r-- | libglusterfs/src/default-args.c | 3 | ||||
-rw-r--r-- | libglusterfs/src/dict.c | 4 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/common-utils.h | 13 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/mem-pool.h | 2 |
4 files changed, 5 insertions, 17 deletions
diff --git a/libglusterfs/src/default-args.c b/libglusterfs/src/default-args.c index cfceabd1f46..9d4070449cd 100644 --- a/libglusterfs/src/default-args.c +++ b/libglusterfs/src/default-args.c @@ -1137,7 +1137,8 @@ args_rchecksum_cbk_store(default_args_cbk_t *args, int32_t op_ret, args->op_errno = op_errno; if (op_ret >= 0) { args->weak_checksum = weak_checksum; - args->strong_checksum = memdup(strong_checksum, SHA256_DIGEST_LENGTH); + args->strong_checksum = gf_memdup(strong_checksum, + SHA256_DIGEST_LENGTH); } if (xdata) args->xdata = dict_ref(xdata); diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c index 6b63b8f0e8b..2374ab032d1 100644 --- a/libglusterfs/src/dict.c +++ b/libglusterfs/src/dict.c @@ -306,7 +306,7 @@ data_copy(data_t *old) newdata->len = old->len; if (old->data) { - newdata->data = memdup(old->data, old->len); + newdata->data = gf_memdup(old->data, old->len); if (!newdata->data) goto err_out; } @@ -3139,7 +3139,7 @@ dict_unserialize(char *orig_buf, int32_t size, dict_t **fill) goto out; } value->len = vallen; - value->data = memdup(buf, vallen); + value->data = gf_memdup(buf, vallen); value->data_type = GF_DATA_TYPE_STR_OLD; value->is_static = _gf_false; buf += vallen; diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h index 0140f7b9fd5..56ea83c37d9 100644 --- a/libglusterfs/src/glusterfs/common-utils.h +++ b/libglusterfs/src/glusterfs/common-utils.h @@ -682,19 +682,6 @@ iov_0filled(const struct iovec *vector, int count) return ret; } -static inline void * -memdup(const void *ptr, size_t size) -{ - void *newptr = NULL; - - newptr = GF_MALLOC(size, gf_common_mt_memdup); - if (!newptr) - return NULL; - - memcpy(newptr, ptr, size); - return newptr; -} - typedef enum { gf_timefmt_default = 0, gf_timefmt_FT = 0, /* YYYY-MM-DD hh:mm:ss */ diff --git a/libglusterfs/src/glusterfs/mem-pool.h b/libglusterfs/src/glusterfs/mem-pool.h index 0250b590fd9..1f2b1a9a5c4 100644 --- a/libglusterfs/src/glusterfs/mem-pool.h +++ b/libglusterfs/src/glusterfs/mem-pool.h @@ -193,7 +193,7 @@ gf_memdup(const void *src, size_t size) { void *dup_mem = NULL; - dup_mem = GF_MALLOC(size, gf_common_mt_strdup); + dup_mem = GF_MALLOC(size, gf_common_mt_memdup); if (!dup_mem) goto out; |