diff options
| author | Gerald Carter <jerry@samba.org> | 2004-12-16 12:30:49 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-12-16 12:30:49 +0000 |
| commit | 8d91e07ef22ad3ed484b04bc4968380a24940696 (patch) | |
| tree | b5b8989f8da9ef7f852081f0460995386edd4b5d /source/modules/vfs_recycle.c | |
| parent | 1a878c865637feb80206c0dc599acebf7f4a46bd (diff) | |
| download | samba-3.0.10.tar.gz samba-3.0.10.tar.xz samba-3.0.10.zip | |
r4231: commiting changes to 3.0.10samba-3.0.10
Diffstat (limited to 'source/modules/vfs_recycle.c')
| -rw-r--r-- | source/modules/vfs_recycle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/modules/vfs_recycle.c b/source/modules/vfs_recycle.c index 1cb1cb327b4..5ff7931c585 100644 --- a/source/modules/vfs_recycle.c +++ b/source/modules/vfs_recycle.c @@ -215,12 +215,12 @@ static BOOL recycle_create_dir(vfs_handle_struct *handle, const char *dname) mode = S_IRUSR | S_IWUSR | S_IXUSR; - tmp_str = strdup(dname); + tmp_str = SMB_STRDUP(dname); ALLOC_CHECK(tmp_str, done); tok_str = tmp_str; len = strlen(dname)+1; - new_dir = (char *)malloc(len + 1); + new_dir = (char *)SMB_MALLOC(len + 1); ALLOC_CHECK(new_dir, done); *new_dir = '\0'; @@ -389,11 +389,11 @@ static int recycle_unlink(vfs_handle_struct *handle, connection_struct *conn, co base = strrchr(file_name, '/'); if (base == NULL) { base = file_name; - path_name = strdup("/"); + path_name = SMB_STRDUP("/"); ALLOC_CHECK(path_name, done); } else { - path_name = strdup(file_name); + path_name = SMB_STRDUP(file_name); ALLOC_CHECK(path_name, done); path_name[base - file_name] = '\0'; base++; @@ -422,7 +422,7 @@ static int recycle_unlink(vfs_handle_struct *handle, connection_struct *conn, co if (recycle_keep_dir_tree(handle) == True) { asprintf(&temp_name, "%s/%s", repository, path_name); } else { - temp_name = strdup(repository); + temp_name = SMB_STRDUP(repository); } ALLOC_CHECK(temp_name, done); |