diff options
| author | Jeremy Allison <jra@samba.org> | 2008-01-10 16:36:05 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-01-10 16:36:05 -0800 |
| commit | 6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57 (patch) | |
| tree | 90f31e435fac5c882591305e7ff1ff4377eec266 /examples | |
| parent | f33f4ef4a24fcbf09eeba0d51e7db74e9b13b432 (diff) | |
| parent | fef9cf00e1e110ff5872f1c368d080fe4f7939d6 (diff) | |
| download | samba-6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57.tar.gz samba-6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57.tar.bz2 samba-6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 767e0164adf8803df50b0b7bd8e81d25af72bb78)
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/VFS/skel_opaque.c | 8 | ||||
| -rw-r--r-- | examples/VFS/skel_transparent.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index 6b1f29b12d..5b196af5eb 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -155,15 +155,15 @@ static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OF return vfswrap_lseek(NULL, fsp, offset, whence); } -static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fsp, int fromfd, const DATA_BLOB *hdr, +static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n) { - return vfswrap_sendfile(NULL, tofd, fsp, fromfd, hdr, offset, n); + return vfswrap_sendfile(NULL, tofd, fromfsp, hdr, offset, n); } -static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *fsp, int tofd, SMB_OFF_T offset, size_t n) +static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t n) { - return vfswrap_recvfile(NULL, fromfd, fsp, tofd, offset, n); + return vfswrap_recvfile(NULL, fromfd, tofsp, offset, n); } static int skel_rename(vfs_handle_struct *handle, const char *oldname, const char *newname) diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c index c168b461ba..55407be10c 100644 --- a/examples/VFS/skel_transparent.c +++ b/examples/VFS/skel_transparent.c @@ -149,14 +149,14 @@ static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OF return SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence); } -static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fsp, int fromfd, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n) +static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n) { - return SMB_VFS_NEXT_SENDFILE(handle, tofd, fsp, fromfd, hdr, offset, n); + return SMB_VFS_NEXT_SENDFILE(handle, tofd, fromfsp, hdr, offset, n); } -static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *fsp, int tofd, SMB_OFF_T offset, size_t n) +static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t n) { - return SMB_VFS_NEXT_RECVFILE(handle, fromfd, fsp, tofd, offset, n); + return SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n); } static int skel_rename(vfs_handle_struct *handle, const char *oldname, const char *newname) |