diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-07-03 12:05:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:11 -0500 |
| commit | 3a8af94424c8d60dd80f6b57806ef0b79465badc (patch) | |
| tree | 9189748ee4115aa555d339c87bf7607469ac7201 /source3/include/vfs.h | |
| parent | d10c664b6151d3296d2fde5dc9833ea90e7ea0e8 (diff) | |
| download | samba-3a8af94424c8d60dd80f6b57806ef0b79465badc.tar.gz samba-3a8af94424c8d60dd80f6b57806ef0b79465badc.tar.bz2 samba-3a8af94424c8d60dd80f6b57806ef0b79465badc.zip | |
r8093: Next round. Now it compiles with --enable-socket-wrapper.
Volker
(This used to be commit 25cbcfba30f534f3fb31627ba43421c42ccd5b0f)
Diffstat (limited to 'source3/include/vfs.h')
| -rw-r--r-- | source3/include/vfs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index c1bab368c9..71b4f65627 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -213,7 +213,7 @@ struct vfs_ops { struct vfs_fn_pointers { /* Disk operations */ - int (*connect)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *service, const char *user); + int (*connect_fn)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *service, const char *user); void (*disconnect)(struct vfs_handle_struct *handle, struct connection_struct *conn); SMB_BIG_UINT (*disk_free)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *path, BOOL small_query, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize); @@ -235,7 +235,7 @@ struct vfs_ops { /* File operations */ int (*open)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *fname, int flags, mode_t mode); - int (*close)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd); + int (*close_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd); ssize_t (*read)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, void *data, size_t n); ssize_t (*pread)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, void *data, size_t n, SMB_OFF_T offset); ssize_t (*write)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, const void *data, size_t n); @@ -326,7 +326,7 @@ struct vfs_ops { struct vfs_handles_pointers { /* Disk operations */ - struct vfs_handle_struct *connect; + struct vfs_handle_struct *connect_hnd; struct vfs_handle_struct *disconnect; struct vfs_handle_struct *disk_free; struct vfs_handle_struct *get_quota; @@ -347,7 +347,7 @@ struct vfs_ops { /* File operations */ struct vfs_handle_struct *open; - struct vfs_handle_struct *close; + struct vfs_handle_struct *close_hnd; struct vfs_handle_struct *read; struct vfs_handle_struct *pread; struct vfs_handle_struct *write; |