mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
Fix a few type errors in VFS modules
This commit is contained in:
parent
27087e6a87
commit
ce378e7c51
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user