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

Change source3/modules/vfs_dirsort.c from MALLOC -> TALLOC.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Jeremy Allison 2013-04-08 15:11:28 -07:00
parent f7756137e8
commit c55eb37114
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source3/modules/vfs_dirsort.c
View File

@ -37,10 +37,7 @@ struct dirsort_privates {
};
static void free_dirsort_privates(void **datap) {
struct dirsort_privates *data = (struct dirsort_privates *) *datap;
SAFE_FREE(data->directory_list);
SAFE_FREE(data);
*datap = NULL;
TALLOC_FREE(*datap);
}
static bool open_and_sort_dir (vfs_handle_struct *handle)
@ -69,9 +66,10 @@ static bool open_and_sort_dir (vfs_handle_struct *handle)
SMB_VFS_NEXT_REWINDDIR(handle, data->source_directory);
/* Set up an array and read the directory entries into it */
SAFE_FREE(data->directory_list); /* destroy previous cache if needed */
data->directory_list = (struct dirent *)SMB_MALLOC(
data->number_of_entries * sizeof(struct dirent));
TALLOC_FREE(data->directory_list); /* destroy previous cache if needed */
data->directory_list = talloc_zero_array(data,
struct dirent,
data->number_of_entries);
if (!data->directory_list) {
return false;
}
@ -95,9 +93,7 @@ static DIR *dirsort_opendir(vfs_handle_struct *handle,
struct dirsort_privates *data = NULL;
/* set up our private data about this directory */
data = (struct dirsort_privates *)SMB_MALLOC(
sizeof(struct dirsort_privates));
data = talloc_zero(handle->conn, struct dirsort_privates);
if (!data) {
return NULL;
}
@ -130,9 +126,7 @@ static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
struct dirsort_privates *data = NULL;
/* set up our private data about this directory */
data = (struct dirsort_privates *)SMB_MALLOC(
sizeof(struct dirsort_privates));
data = talloc_zero(handle->conn, struct dirsort_privates);
if (!data) {
return NULL;
}
@ -145,7 +139,7 @@ static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
attr);
if (data->source_directory == NULL) {
SAFE_FREE(data);
TALLOC_FREE(data);
return NULL;
}