diff options
author | Björn Baumbach <bb@sernet.de> | 2014-04-14 14:37:29 +0200 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2014-04-16 20:39:08 +0200 |
commit | fae7e5d771d1c69bded1189b23335647023fa0f7 (patch) | |
tree | 7ae416ce7f3d12664b3fa75ac47c1e3a70514986 | |
parent | a56c35a4deec9745ff27a66ddc85db48c5dfaf97 (diff) | |
download | samba-fae7e5d771d1c69bded1189b23335647023fa0f7.tar.gz samba-fae7e5d771d1c69bded1189b23335647023fa0f7.tar.xz samba-fae7e5d771d1c69bded1189b23335647023fa0f7.zip |
lib-util: rename memdup to smb_memdup and fix all callers
Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Volker Lendecke <vl@samba.org>
-rw-r--r-- | ctdb/lib/util/util.h | 2 | ||||
-rw-r--r-- | lib/util/samba_util.h | 2 | ||||
-rw-r--r-- | lib/util/util.c | 2 | ||||
-rw-r--r-- | source3/lib/interface.c | 4 | ||||
-rw-r--r-- | source3/lib/smbldap.c | 2 | ||||
-rw-r--r-- | source3/libsmb/clirap.c | 4 | ||||
-rw-r--r-- | source3/passdb/secrets.c | 2 | ||||
-rw-r--r-- | source3/smbd/seal.c | 2 | ||||
-rw-r--r-- | source3/smbd/sec_ctx.c | 4 | ||||
-rw-r--r-- | source3/winbindd/winbindd_cache.c | 2 | ||||
-rw-r--r-- | source4/smbd/process_thread.c | 4 |
11 files changed, 15 insertions, 15 deletions
diff --git a/ctdb/lib/util/util.h b/ctdb/lib/util/util.h index 467fba88ad..9929d2e7e2 100644 --- a/ctdb/lib/util/util.h +++ b/ctdb/lib/util/util.h @@ -524,7 +524,7 @@ char *smb_xstrndup(const char *s, size_t n); /** Like strdup but for memory. **/ -_PUBLIC_ void *memdup(const void *p, size_t size); +_PUBLIC_ void *smb_memdup(const void *p, size_t size); /** * see if a range of memory is all zero. A NULL pointer is considered diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index f52347e536..dcb92eed46 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -739,7 +739,7 @@ char *smb_xstrndup(const char *s, size_t n); /** Like strdup but for memory. **/ -_PUBLIC_ void *memdup(const void *p, size_t size); +_PUBLIC_ void *smb_memdup(const void *p, size_t size); /** * Write a password to the log file. diff --git a/lib/util/util.c b/lib/util/util.c index 20808843f8..1429750fd4 100644 --- a/lib/util/util.c +++ b/lib/util/util.c @@ -693,7 +693,7 @@ char *smb_xstrndup(const char *s, size_t n) Like strdup but for memory. **/ -_PUBLIC_ void *memdup(const void *p, size_t size) +_PUBLIC_ void *smb_memdup(const void *p, size_t size) { void *p2; if (size == 0) diff --git a/source3/lib/interface.c b/source3/lib/interface.c index 39dc9cb04c..3edeae5742 100644 --- a/source3/lib/interface.c +++ b/source3/lib/interface.c @@ -503,10 +503,10 @@ void load_interfaces(void) total_probed = get_interfaces(talloc_tos(), &ifaces); if (total_probed > 0) { - probed_ifaces = (struct iface_struct *)memdup(ifaces, + probed_ifaces = (struct iface_struct *)smb_memdup(ifaces, sizeof(ifaces[0])*total_probed); if (!probed_ifaces) { - DEBUG(0,("ERROR: memdup failed\n")); + DEBUG(0,("ERROR: smb_memdup failed\n")); exit(1); } } diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index 08640d070a..f2d58a54d1 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -353,7 +353,7 @@ static void smbldap_set_mod_internal(LDAPMod *** modlist, int modop, const char mods[i]->mod_bvalues[j] = SMB_MALLOC_P(struct berval); SMB_ASSERT(mods[i]->mod_bvalues[j] != NULL); - mods[i]->mod_bvalues[j]->bv_val = (char *)memdup(blob->data, blob->length); + mods[i]->mod_bvalues[j]->bv_val = (char *)smb_memdup(blob->data, blob->length); SMB_ASSERT(mods[i]->mod_bvalues[j]->bv_val != NULL); mods[i]->mod_bvalues[j]->bv_len = blob->length; diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 7e6f8d74ba..036919f903 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -67,14 +67,14 @@ bool cli_api(struct cli_state *cli, * talloc */ - *rparam = (char *)memdup(my_rparam, num_my_rparam); + *rparam = (char *)smb_memdup(my_rparam, num_my_rparam); if (*rparam == NULL) { goto fail; } *rprcnt = num_my_rparam; TALLOC_FREE(my_rparam); - *rdata = (char *)memdup(my_rdata, num_my_rdata); + *rdata = (char *)smb_memdup(my_rdata, num_my_rdata); if (*rdata == NULL) { goto fail; } diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index 9d91c2f3d3..bff9a0d8df 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -144,7 +144,7 @@ void *secrets_fetch(const char *key, size_t *size) return NULL; } - result = memdup(dbuf.dptr, dbuf.dsize); + result = smb_memdup(dbuf.dptr, dbuf.dsize); if (result == NULL) { return NULL; } diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index bb9bb08350..273013b427 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -245,7 +245,7 @@ NTSTATUS srv_request_encryption_setup(connection_struct *conn, /* Return the raw blob. */ SAFE_FREE(*ppdata); - *ppdata = (unsigned char *)memdup(response.data, response.length); + *ppdata = (unsigned char *)smb_memdup(response.data, response.length); if ((*ppdata) == NULL && response.length > 0) return NT_STATUS_NO_MEMORY; *p_data_size = response.length; diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c index d474219eba..c34247e615 100644 --- a/source3/smbd/sec_ctx.c +++ b/source3/smbd/sec_ctx.c @@ -331,8 +331,8 @@ void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, const struct TALLOC_FREE(ctx_p->token); if (ngroups) { - ctx_p->ut.groups = (gid_t *)memdup(groups, - sizeof(gid_t) * ngroups); + ctx_p->ut.groups = (gid_t *)smb_memdup(groups, + sizeof(gid_t) * ngroups); if (!ctx_p->ut.groups) { smb_panic("memdup failed"); } diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index b9cfd826dc..9c4b5bd4e8 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -3562,7 +3562,7 @@ static struct cache_entry *create_centry_validate(const char *kstr, TDB_DATA dat struct cache_entry *centry; centry = SMB_XMALLOC_P(struct cache_entry); - centry->data = (unsigned char *)memdup(data.dptr, data.dsize); + centry->data = (unsigned char *)smb_memdup(data.dptr, data.dsize); if (!centry->data) { SAFE_FREE(centry); return NULL; diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index 764c1f36d5..ad264c9156 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -218,7 +218,7 @@ static void thread_set_title(struct tevent_context *ev, const char *title) static int thread_mutex_init(smb_mutex_t *mutex, const char *name) { pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; - mutex->mutex = memdup(&m, sizeof(m)); + mutex->mutex = smb_memdup(&m, sizeof(m)); if (! mutex->mutex) { errno = ENOMEM; return -1; @@ -294,7 +294,7 @@ static int thread_mutex_unlock(smb_mutex_t *mutex, const char *name) static int thread_rwlock_init(smb_rwlock_t *rwlock, const char *name) { pthread_rwlock_t m = PTHREAD_RWLOCK_INITIALIZER; - rwlock->rwlock = memdup(&m, sizeof(m)); + rwlock->rwlock = smb_memdup(&m, sizeof(m)); if (! rwlock->rwlock) { errno = ENOMEM; return -1; |