diff options
| author | Jeremy Allison <jra@samba.org> | 2004-11-10 23:03:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:12 -0500 |
| commit | d1a939e89329c08f2162092a15a8620e389d0ce1 (patch) | |
| tree | 0f52ba3c27a4301b36242779af645c597866d5fe /source3 | |
| parent | e87470fa3fa557c3fbf0f59f4c3a91d9a468fa0e (diff) | |
| download | samba-d1a939e89329c08f2162092a15a8620e389d0ce1.tar.gz samba-d1a939e89329c08f2162092a15a8620e389d0ce1.tar.bz2 samba-d1a939e89329c08f2162092a15a8620e389d0ce1.zip | |
r3671: More warning fixes from Rob Foehl <rwf@loonybin.net>.
Jeremy.
(This used to be commit 3850f142c174034397451de8457564b9604113c5)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_cap.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_shadow_copy.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 0526276acb..18fa04533f 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -45,9 +45,9 @@ static DIR *cap_opendir(vfs_handle_struct *handle, connection_struct *conn, cons return SMB_VFS_NEXT_OPENDIR(handle, conn, capname); } -static struct dirent *cap_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp) +static SMB_STRUCT_DIRENT *cap_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp) { - struct dirent *result; + SMB_STRUCT_DIRENT *result; DEBUG(3,("cap: cap_readdir\n")); result = SMB_VFS_NEXT_READDIR(handle, conn, dirp); if (result) { diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c index 7ad7b1f7b1..88135c0aed 100644 --- a/source3/modules/vfs_shadow_copy.c +++ b/source3/modules/vfs_shadow_copy.c @@ -59,7 +59,7 @@ static int vfs_shadow_copy_debug_level = DBGC_VFS; typedef struct { int pos; int num; - struct dirent *dirs; + SMB_STRUCT_DIRENT *dirs; } shadow_copy_Dir; static BOOL shadow_copy_match_name(const char *name) @@ -92,8 +92,8 @@ static DIR *shadow_copy_opendir(vfs_handle_struct *handle, connection_struct *co ZERO_STRUCTP(dirp); while (True) { - struct dirent *d; - struct dirent *r; + SMB_STRUCT_DIRENT *d; + SMB_STRUCT_DIRENT *r; d = SMB_VFS_NEXT_READDIR(handle, conn, p); @@ -108,7 +108,7 @@ static DIR *shadow_copy_opendir(vfs_handle_struct *handle, connection_struct *co DEBUG(10,("shadow_copy_opendir: not hide [%s]\n",d->d_name)); - r = (struct dirent *)Realloc(dirp->dirs,(dirp->num+1)*sizeof(struct dirent)); + r = (SMB_STRUCT_DIRENT *)Realloc(dirp->dirs,(dirp->num+1)*sizeof(SMB_STRUCT_DIRENT)); if (!r) { DEBUG(0,("shadow_copy_opendir: Out of memory\n")); break; @@ -122,7 +122,7 @@ static DIR *shadow_copy_opendir(vfs_handle_struct *handle, connection_struct *co return((DIR *)dirp); } -struct dirent *shadow_copy_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *_dirp) +SMB_STRUCT_DIRENT *shadow_copy_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *_dirp) { shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp; @@ -156,7 +156,7 @@ static int shadow_copy_get_shadow_copy_data(vfs_handle_struct *handle, files_str while (True) { SHADOW_COPY_LABEL *tlabels; - struct dirent *d; + SMB_STRUCT_DIRENT *d; d = SMB_VFS_NEXT_READDIR(handle, fsp->conn, p); if (d == NULL) { |