diff options
| author | Jeremy Allison <jra@samba.org> | 2004-12-16 21:12:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:39 -0500 |
| commit | 54fdd5c7dc98e9039d94bc6b45ee31cb1d363eac (patch) | |
| tree | 3e777cddfa2c8a2da0540ff010d02d63c9894631 /source3/smbwrapper/smbw.c | |
| parent | 46f0e330f1e455e3338a7e7a3b7a287df752fe1a (diff) | |
| download | samba-54fdd5c7dc98e9039d94bc6b45ee31cb1d363eac.tar.gz samba-54fdd5c7dc98e9039d94bc6b45ee31cb1d363eac.tar.bz2 samba-54fdd5c7dc98e9039d94bc6b45ee31cb1d363eac.zip | |
r4236: More *alloc fixes.
Jeremy.
(This used to be commit 6b25a6e088390d33314ca69c8f17c869cec3904b)
Diffstat (limited to 'source3/smbwrapper/smbw.c')
| -rw-r--r-- | source3/smbwrapper/smbw.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c index 0ddacdf8ba..bf60c2bc68 100644 --- a/source3/smbwrapper/smbw.c +++ b/source3/smbwrapper/smbw.c @@ -546,7 +546,7 @@ struct smbw_server *smbw_server(char *server, char *share) DEBUG(4,(" tconx ok\n")); - srv = (struct smbw_server *)malloc(sizeof(*srv)); + srv = SMB_MALLOC_P(struct smbw_server); if (!srv) { errno = ENOMEM; goto failed; @@ -558,25 +558,25 @@ struct smbw_server *smbw_server(char *server, char *share) srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share)); - srv->server_name = strdup(server); + srv->server_name = SMB_STRDUP(server); if (!srv->server_name) { errno = ENOMEM; goto failed; } - srv->share_name = strdup(share); + srv->share_name = SMB_STRDUP(share); if (!srv->share_name) { errno = ENOMEM; goto failed; } - srv->workgroup = strdup(workgroup); + srv->workgroup = SMB_STRDUP(workgroup); if (!srv->workgroup) { errno = ENOMEM; goto failed; } - srv->username = strdup(username); + srv->username = SMB_STRDUP(username); if (!srv->username) { errno = ENOMEM; goto failed; @@ -664,7 +664,7 @@ int smbw_open(const char *fname, int flags, mode_t mode) return fd; } - file = (struct smbw_file *)malloc(sizeof(*file)); + file = SMB_MALLOC_P(struct smbw_file); if (!file) { errno = ENOMEM; goto failed; @@ -672,7 +672,7 @@ int smbw_open(const char *fname, int flags, mode_t mode) ZERO_STRUCTP(file); - file->f = (struct smbw_filedes *)malloc(sizeof(*(file->f))); + file->f = SMB_MALLOC_P(struct smbw_filedes); if (!file->f) { errno = ENOMEM; goto failed; @@ -681,7 +681,7 @@ int smbw_open(const char *fname, int flags, mode_t mode) ZERO_STRUCTP(file->f); file->f->cli_fd = fd; - file->f->fname = strdup(path); + file->f->fname = SMB_STRDUP(path); if (!file->f->fname) { errno = ENOMEM; goto failed; @@ -1288,7 +1288,7 @@ int smbw_dup(int fd) goto failed; } - file2 = (struct smbw_file *)malloc(sizeof(*file2)); + file2 = SMB_MALLOC_P(struct smbw_file); if (!file2) { close(fd2); errno = ENOMEM; @@ -1340,7 +1340,7 @@ int smbw_dup2(int fd, int fd2) goto failed; } - file2 = (struct smbw_file *)malloc(sizeof(*file2)); + file2 = SMB_MALLOC_P(struct smbw_file); if (!file2) { close(fd2); errno = ENOMEM; |