sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib-util: rename memdup to smb_memdup and fix all callers

Browse Source 
Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Björn Baumbach 2014-04-14 14:37:29 +02:00 committed by Jeremy Allison
parent a56c35a4de
commit fae7e5d771
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/lib/util/util.h
View File

@ -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

2
lib/util/samba_util.h
View File

@ -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.

2
lib/util/util.c
View File

@ -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)

4
source3/lib/interface.c
View File

@ -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);
}
}

2
source3/lib/smbldap.c
View File

@ -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;

4
source3/libsmb/clirap.c
View File

@ -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;
}

2
source3/passdb/secrets.c
View File

@ -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;
}

2
source3/smbd/seal.c
View File

@ -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;

4
source3/smbd/sec_ctx.c
View File

@ -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");
}

2
source3/winbindd/winbindd_cache.c
View File

@ -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;

4
source4/smbd/process_thread.c
View File

@ -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;