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/smbd/vfs.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/smbd/vfs.c')
| -rw-r--r-- | source/smbd/vfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/smbd/vfs.c b/source/smbd/vfs.c index 0328558fe88..68a6dca31dd 100644 --- a/source/smbd/vfs.c +++ b/source/smbd/vfs.c @@ -185,7 +185,7 @@ NTSTATUS smb_register_vfs(int version, const char *name, vfs_op_tuple *vfs_op_tu return NT_STATUS_OBJECT_NAME_COLLISION; } - entry = smb_xmalloc(sizeof(struct vfs_init_function_entry)); + entry = SMB_XMALLOC_P(struct vfs_init_function_entry); entry->name = smb_xstrdup(name); entry->vfs_op_tuples = vfs_op_tuples; @@ -258,7 +258,7 @@ BOOL vfs_init_custom(connection_struct *conn, const char *vfs_object) return False; } - handle = (vfs_handle_struct *)talloc_zero(conn->mem_ctx,sizeof(vfs_handle_struct)); + handle = TALLOC_ZERO_P(conn->mem_ctx,vfs_handle_struct); if (!handle) { DEBUG(0,("talloc_zero() failed!\n")); SAFE_FREE(module_name); @@ -681,7 +681,7 @@ static void array_promote(char *array,int elsize,int element) if (element == 0) return; - p = (char *)malloc(elsize); + p = (char *)SMB_MALLOC(elsize); if (!p) { DEBUG(5,("array_promote: malloc fail\n")); @@ -876,7 +876,7 @@ BOOL reduce_name(connection_struct *conn, const pstring fname) pstrcat(tmp_fname, last_component); #ifdef REALPATH_TAKES_NULL SAFE_FREE(resolved_name); - resolved_name = strdup(tmp_fname); + resolved_name = SMB_STRDUP(tmp_fname); if (!resolved_name) { DEBUG(0,("reduce_name: malloc fail for %s\n", tmp_fname)); errno = saved_errno; |