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/glusterfs | |
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/glusterfs')
-rw-r--r-- | libglusterfs/src/glusterfs/common-utils.h | 13 | ||||
-rw-r--r-- | libglusterfs/src/glusterfs/mem-pool.h | 2 |
2 files changed, 1 insertions, 14 deletions
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; |