r3644: Fixup examples VFS compile.

Jeremy.
(This used to be commit dfa910e4ab498100d0572838f2ac05faec3c917f)

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 310d305cee31bf2f65a1af869acf384af218498f..c7e5295b00765eb42069bc896b89d4ad64c7c15f 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -76,11 +76,26 @@ static DIR *skel_opendir(vfs_handle_struct *handle, connection_struct *conn, con
        return vfswrap_opendir(NULL, conn, fname);
 }
 
-static struct dirent *skel_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
+static SMB_STRUCT_DIRENT *skel_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
 {
        return vfswrap_readdir(NULL, conn, dirp);
 }
 
+static void skel_seekdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp, long offset)
+{
+       return vfswrap_seekdir(NULL, conn, dirp, offset);
+}
+
+static long skel_telldir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
+{
+       return vfswrap_telldir(NULL, conn, dirp);
+}
+
+static void skel_rewinddir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
+{
+       return vfswrap_rewinddir(NULL, conn, dirp);
+}
+
 static int skel_mkdir(vfs_handle_struct *handle, connection_struct *conn, const char *path, mode_t mode)
 {
        return vfswrap_mkdir(NULL, conn, path, mode);
@@ -489,6 +504,9 @@ static vfs_op_tuple skel_op_tuples[] = {
 
        {SMB_VFS_OP(skel_opendir),                      SMB_VFS_OP_OPENDIR,             SMB_VFS_LAYER_OPAQUE},
        {SMB_VFS_OP(skel_readdir),                      SMB_VFS_OP_READDIR,             SMB_VFS_LAYER_OPAQUE},
+       {SMB_VFS_OP(skel_seekdir),                      SMB_VFS_OP_SEEKDIR,             SMB_VFS_LAYER_OPAQUE},
+       {SMB_VFS_OP(skel_telldir),                      SMB_VFS_OP_TELLDIR,             SMB_VFS_LAYER_OPAQUE},
+       {SMB_VFS_OP(skel_rewinddir),                    SMB_VFS_OP_REWINDDIR,           SMB_VFS_LAYER_OPAQUE},
        {SMB_VFS_OP(skel_mkdir),                        SMB_VFS_OP_MKDIR,               SMB_VFS_LAYER_OPAQUE},
        {SMB_VFS_OP(skel_rmdir),                        SMB_VFS_OP_RMDIR,               SMB_VFS_LAYER_OPAQUE},
        {SMB_VFS_OP(skel_closedir),                     SMB_VFS_OP_CLOSEDIR,            SMB_VFS_LAYER_OPAQUE},

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 448390e72f41751d3775ec9b808110dd36daa1d6..b10161cde1976cfb12da9f75722d8b89f5c009f4 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -75,11 +75,26 @@ static DIR *skel_opendir(vfs_handle_struct *handle, connection_struct *conn, con
        return SMB_VFS_NEXT_OPENDIR(handle, conn, fname);
 }
 
-static struct dirent *skel_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
+static SMB_STRUCT_DIRENT *skel_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
 {
        return SMB_VFS_NEXT_READDIR(handle, conn, dirp);
 }
 
+static void skel_seekdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp, long offset)
+{
+       return SMB_VFS_NEXT_SEEKDIR(handle, conn, dirp, offset);
+}
+
+static long skel_telldir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
+{
+       return SMB_VFS_NEXT_TELLDIR(handle, conn, dirp);
+}
+
+static void skel_rewinddir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp)
+{
+       return SMB_VFS_NEXT_REWINDDIR(handle, conn, dirp);
+}
+
 static int skel_mkdir(vfs_handle_struct *handle, connection_struct *conn, const char *path, mode_t mode)
 {
        return SMB_VFS_NEXT_MKDIR(handle, conn, path, mode);
@@ -458,6 +473,9 @@ static vfs_op_tuple skel_op_tuples[] = {
 
        {SMB_VFS_OP(skel_opendir),                      SMB_VFS_OP_OPENDIR,             SMB_VFS_LAYER_TRANSPARENT},
        {SMB_VFS_OP(skel_readdir),                      SMB_VFS_OP_READDIR,             SMB_VFS_LAYER_TRANSPARENT},
+       {SMB_VFS_OP(skel_seekdir),                      SMB_VFS_OP_SEEKDIR,             SMB_VFS_LAYER_TRANSPARENT},
+       {SMB_VFS_OP(skel_telldir),                      SMB_VFS_OP_TELLDIR,             SMB_VFS_LAYER_TRANSPARENT},
+       {SMB_VFS_OP(skel_rewinddir),                    SMB_VFS_OP_REWINDDIR,           SMB_VFS_LAYER_TRANSPARENT},
        {SMB_VFS_OP(skel_mkdir),                        SMB_VFS_OP_MKDIR,               SMB_VFS_LAYER_TRANSPARENT},
        {SMB_VFS_OP(skel_rmdir),                        SMB_VFS_OP_RMDIR,               SMB_VFS_LAYER_TRANSPARENT},
        {SMB_VFS_OP(skel_closedir),                     SMB_VFS_OP_CLOSEDIR,            SMB_VFS_LAYER_TRANSPARENT},

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index a149db53b1e2b21a335616526acd3b40ebae9b00..b2c0027a21afaa5523596c529f659f9304465daa 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -240,7 +240,7 @@
 /* Directory operations */
 #define SMB_VFS_NEXT_OPENDIR(handle, conn, fname) ((handle)->vfs_next.ops.opendir((handle)->vfs_next.handles.opendir, (conn), (fname)))
 #define SMB_VFS_NEXT_READDIR(handle, conn, dirp) ((handle)->vfs_next.ops.readdir((handle)->vfs_next.handles.readdir, (conn), (dirp))) 
-#define SMB_VFS_NEXT_SEEKDIR(handle, conn, dirp) ((handle)->vfs_next.ops.seekdir((handle)->vfs_next.handles.seekdir, (conn), (dirp), (offset))) 
+#define SMB_VFS_NEXT_SEEKDIR(handle, conn, dirp, offset) ((handle)->vfs_next.ops.seekdir((handle)->vfs_next.handles.seekdir, (conn), (dirp), (offset))) 
 #define SMB_VFS_NEXT_TELLDIR(handle, conn, dirp) ((handle)->vfs_next.ops.telldir((handle)->vfs_next.handles.telldir, (conn), (dirp))) 
 #define SMB_VFS_NEXT_REWINDDIR(handle, conn, dirp) ((handle)->vfs_next.ops.rewinddir((handle)->vfs_next.handles.rewinddir, (conn), (dirp))) 
 #define SMB_VFS_NEXT_DIR(handle, conn, dirp) ((handle)->vfs_next.ops.readdir((handle)->vfs_next.handles.readdir, (conn), (dirp)))