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/dir.c | |
| parent | 1a878c865637feb80206c0dc599acebf7f4a46bd (diff) | |
| download | samba-1f51fd67ae110edf69960955585c2473731c6486.tar.gz samba-1f51fd67ae110edf69960955585c2473731c6486.tar.xz samba-1f51fd67ae110edf69960955585c2473731c6486.zip | |
r4231: commiting changes to 3.0.10samba-3.0.10
Diffstat (limited to 'source/smbd/dir.c')
| -rw-r--r-- | source/smbd/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/smbd/dir.c b/source/smbd/dir.c index 2bda42f76dc..f721bf3ba8a 100644 --- a/source/smbd/dir.c +++ b/source/smbd/dir.c @@ -407,7 +407,7 @@ int dptr_create(connection_struct *conn, pstring path, BOOL old_handle, BOOL exp if (dptrs_open >= MAX_OPEN_DIRECTORIES) dptr_idleoldest(); - dptr = (dptr_struct *)malloc(sizeof(dptr_struct)); + dptr = SMB_MALLOC_P(dptr_struct); if(!dptr) { DEBUG(0,("malloc fail in dptr_create.\n")); return -1; @@ -819,7 +819,7 @@ void *OpenDir(connection_struct *conn, const char *name, BOOL use_veto) if (!p) return(NULL); - dirp = (Dir *)malloc(sizeof(Dir)); + dirp = SMB_MALLOC_P(Dir); if (!dirp) { DEBUG(0,("Out of memory in OpenDir\n")); SMB_VFS_CLOSEDIR(conn,p); @@ -900,7 +900,7 @@ void *OpenDir(connection_struct *conn, const char *name, BOOL use_veto) if (used + l > dirp->mallocsize) { int s = MAX(used+l,used+2000); char *r; - r = (char *)Realloc(dirp->data,s); + r = (char *)SMB_REALLOC(dirp->data,s); if (!r) { DEBUG(0,("Out of memory in OpenDir\n")); break; |