Make the smbd VFS typesafe

1 files changed, 7 insertions, 20 deletions

diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index f6fc9256d0..c2053e14e6 100644
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -167,29 +167,16 @@ static void dirsort_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
 	data->pos = 0;
 }
 
-/* VFS operations structure */
-
-static vfs_op_tuple dirsort_op_tuples[] = {
-
-    /* Directory operations */
-
-    {SMB_VFS_OP(dirsort_opendir),	     SMB_VFS_OP_OPENDIR,
-     SMB_VFS_LAYER_TRANSPARENT},
-    {SMB_VFS_OP(dirsort_readdir),	     SMB_VFS_OP_READDIR,
-     SMB_VFS_LAYER_TRANSPARENT},
-    {SMB_VFS_OP(dirsort_seekdir),	     SMB_VFS_OP_SEEKDIR,
-     SMB_VFS_LAYER_TRANSPARENT},
-    {SMB_VFS_OP(dirsort_telldir),	     SMB_VFS_OP_TELLDIR,
-     SMB_VFS_LAYER_TRANSPARENT},
-    {SMB_VFS_OP(dirsort_rewinddir),	     SMB_VFS_OP_REWINDDIR,
-     SMB_VFS_LAYER_TRANSPARENT},
-
-    {NULL,				     SMB_VFS_OP_NOOP,
-     SMB_VFS_LAYER_NOOP}
+static struct vfs_fn_pointers vfs_dirsort_fns = {
+	.opendir = dirsort_opendir,
+	.readdir = dirsort_readdir,
+	.seekdir = dirsort_seekdir,
+	.telldir = dirsort_telldir,
+	.rewind_dir = dirsort_rewinddir,
 };
 
 NTSTATUS vfs_dirsort_init(void)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "dirsort",
-				dirsort_op_tuples);
+				&vfs_dirsort_fns);
 }