Fix a few type errors in VFS modules

diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 7e363b6be77ef6ca3201c35fdc877fe43d09ce8e..aa77da7cd724d2329a84d68cc5abd0ce26b16eb8 100644 (file)
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -53,7 +53,9 @@ static SMB_STRUCT_DIR *cap_opendir(vfs_handle_struct *handle, const char *fname,
        return SMB_VFS_NEXT_OPENDIR(handle, capname, mask, attr);
 }
 
-static SMB_STRUCT_DIRENT *cap_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static SMB_STRUCT_DIRENT *cap_readdir(vfs_handle_struct *handle,
+                                     SMB_STRUCT_DIR *dirp,
+                                     SMB_STRUCT_STAT *sbuf)
 {
        SMB_STRUCT_DIRENT *result;
        SMB_STRUCT_DIRENT *newdirent;
@@ -334,7 +336,8 @@ static int cap_ntimes(vfs_handle_struct *handle,
 }
 
 
-static bool cap_symlink(vfs_handle_struct *handle, const char *oldpath, const char *newpath)
+static int cap_symlink(vfs_handle_struct *handle, const char *oldpath,
+                      const char *newpath)
 {
        char *capold = capencode(talloc_tos(), oldpath);
        char *capnew = capencode(talloc_tos(), newpath);
@@ -346,7 +349,8 @@ static bool cap_symlink(vfs_handle_struct *handle, const char *oldpath, const ch
        return SMB_VFS_NEXT_SYMLINK(handle, capold, capnew);
 }
 
-static bool cap_readlink(vfs_handle_struct *handle, const char *path, char *buf, size_t bufsiz)
+static int cap_readlink(vfs_handle_struct *handle, const char *path,
+                       char *buf, size_t bufsiz)
 {
        char *cappath = capencode(talloc_tos(), path);
 

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index 1fd101282cda4579e7f2f46385d7575df052a749..3b691c03503eae1c98e6926548bee0fe20cc4934 100644 (file)
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -103,7 +103,8 @@ static SMB_STRUCT_DIR *catia_opendir(vfs_handle_struct *handle,
 }
 
 static SMB_STRUCT_DIRENT *catia_readdir(vfs_handle_struct *handle,
-                                       SMB_STRUCT_DIR *dirp)
+                                       SMB_STRUCT_DIR *dirp,
+                                       SMB_STRUCT_STAT *sbuf)
 {
        SMB_STRUCT_DIRENT *result = NULL;
        SMB_STRUCT_DIRENT *newdirent = NULL;

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index c4db8fa393f6ed6209b44fc0de58a5dabee65456..bb7853b92628956e1f58aa65860df750e11fd1b3 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1102,7 +1102,8 @@ static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle,
        return NT_STATUS_OK;
 }
 
-static int vfswrap_chflags(vfs_handle_struct *handle, const char *path, int flags)
+static int vfswrap_chflags(vfs_handle_struct *handle, const char *path,
+                          unsigned int flags)
 {
 #ifdef HAVE_CHFLAGS
        return chflags(path, flags);
@@ -1113,7 +1114,7 @@ static int vfswrap_chflags(vfs_handle_struct *handle, const char *path, int flag
 }
 
 static struct file_id vfswrap_file_id_create(struct vfs_handle_struct *handle,
-                                            SMB_STRUCT_STAT *sbuf)
+                                            const SMB_STRUCT_STAT *sbuf)
 {
        struct file_id key;
 

diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index 53d1820c11a1f816b178ec3587d5259fff664b1a..f6fc9256d07bba844d1a16ed2a4a01446b43ad56 100644 (file)
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -113,7 +113,8 @@ static SMB_STRUCT_DIR *dirsort_opendir(vfs_handle_struct *handle,
 }
 
 static SMB_STRUCT_DIRENT *dirsort_readdir(vfs_handle_struct *handle,
-                                         SMB_STRUCT_DIR *dirp)
+                                         SMB_STRUCT_DIR *dirp,
+                                         SMB_STRUCT_STAT *sbuf)
 {
        struct dirsort_privates *data = NULL;
        time_t current_mtime;

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index e8702aa2c8fb06744c47db86ab6d8a4aec18652a..bf53ae269c4011bab9cbe41dacf682d9c70a362f 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -561,7 +561,7 @@ static int smb_full_audit_statvfs(struct vfs_handle_struct *handle,
        return result;
 }
 
-static int smb_full_audit_fs_capabilities(struct vfs_handle_struct *handle)
+static uint32_t smb_full_audit_fs_capabilities(struct vfs_handle_struct *handle)
 {
        int result;
 
@@ -897,7 +897,7 @@ static int smb_full_audit_lstat(vfs_handle_struct *handle,
        return result;    
 }
 
-static int smb_full_audit_get_alloc_size(vfs_handle_struct *handle,
+static uint64_t smb_full_audit_get_alloc_size(vfs_handle_struct *handle,
                       files_struct *fsp, const SMB_STRUCT_STAT *sbuf)
 {
        int result;

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 1f300a055caf34dde35da58387c14bea6dcfb141..29247ac7c27f1839cc8a6c65e996a1ca8f28251b 100644 (file)
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -549,7 +549,8 @@ static int shadow_copy2_rmdir(vfs_handle_struct *handle,  const char *fname)
         SHADOW2_NEXT(RMDIR, (handle, name), int, -1);
 }
 
-static int shadow_copy2_chflags(vfs_handle_struct *handle, const char *fname, int flags)
+static int shadow_copy2_chflags(vfs_handle_struct *handle, const char *fname,
+                               unsigned int flags)
 {
         SHADOW2_NEXT(CHFLAGS, (handle, name, flags), int, -1);
 }