r3671: More warning fixes from Rob Foehl <rwf@loonybin.net>.

Jeremy.
(This used to be commit 3850f142c174034397451de8457564b9604113c5)

diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 0526276acb83b324e821a21b254788e9ca372e2f..18fa04533f0bbd46045ca1dbe45fa687a2faa4be 100644 (file)
--- 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 7ad7b1f7b14f4f41831b4cf9c69f9b587c140d0f..88135c0aed14b0f77a89ed745993d2f98be0c685 100644 (file)
--- 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) {