From 6aa12fcb30c8f7246fd0215b1d808191c0d87668 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 5 Apr 2012 14:53:08 +1000 Subject: build: Remove SMB_OFF_T, replace with off_t Now that we always require a 64 bit off_t, we no longer need SMB_OFF_T. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Fri Apr 6 01:47:43 CEST 2012 on sn-devel-104 --- examples/VFS/skel_opaque.c | 20 ++++++++++---------- examples/VFS/skel_transparent.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'examples') diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index 40691ed7f9..1a44a39f2d 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -183,7 +183,7 @@ static ssize_t skel_vfs_read(vfs_handle_struct *handle, files_struct *fsp, void return -1; } -static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, SMB_OFF_T offset) +static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, off_t offset) { errno = ENOSYS; return -1; @@ -195,25 +195,25 @@ static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const vo return -1; } -static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset) +static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, off_t offset) { errno = ENOSYS; return -1; } -static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset, int whence) +static off_t skel_lseek(vfs_handle_struct *handle, files_struct *fsp, off_t offset, int whence) { errno = ENOSYS; - return (SMB_OFF_T)-1; + return (off_t)-1; } -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) +static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, off_t offset, size_t n) { errno = ENOSYS; return -1; } -static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, SMB_OFF_T offset, size_t n) +static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t n) { errno = ENOSYS; return -1; @@ -314,7 +314,7 @@ static int skel_ntimes(vfs_handle_struct *handle, return -1; } -static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset) +static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, off_t offset) { errno = ENOSYS; return -1; @@ -322,13 +322,13 @@ static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_ static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp, enum vfs_fallocate_mode mode, - SMB_OFF_T offset, SMB_OFF_T len) + off_t offset, off_t len) { errno = ENOSYS; return -1; } -static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type) +static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, off_t offset, off_t count, int type) { errno = ENOSYS; return false; @@ -346,7 +346,7 @@ static int skel_linux_setlease(struct vfs_handle_struct *handle, struct files_st return -1; } -static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid) +static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid) { errno = ENOSYS; return false; diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c index 2d5fcdd63b..ba7e898cf8 100644 --- a/examples/VFS/skel_transparent.c +++ b/examples/VFS/skel_transparent.c @@ -189,7 +189,7 @@ static ssize_t skel_vfs_read(vfs_handle_struct *handle, files_struct *fsp, void return SMB_VFS_NEXT_READ(handle, fsp, data, n); } -static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, SMB_OFF_T offset) +static ssize_t skel_pread(vfs_handle_struct *handle, files_struct *fsp, void *data, size_t n, off_t offset) { return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset); } @@ -199,22 +199,22 @@ static ssize_t skel_write(vfs_handle_struct *handle, files_struct *fsp, const vo return SMB_VFS_NEXT_WRITE(handle, fsp, data, n); } -static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset) +static ssize_t skel_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, off_t offset) { return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset); } -static SMB_OFF_T skel_lseek(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset, int whence) +static off_t skel_lseek(vfs_handle_struct *handle, files_struct *fsp, off_t offset, int whence) { return SMB_VFS_NEXT_LSEEK(handle, fsp, offset, whence); } -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) +static ssize_t skel_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *hdr, off_t offset, size_t 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 *tofsp, SMB_OFF_T offset, size_t n) +static ssize_t skel_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, off_t offset, size_t n) { return SMB_VFS_NEXT_RECVFILE(handle, fromfd, tofsp, offset, n); } @@ -299,20 +299,20 @@ static int skel_ntimes(vfs_handle_struct *handle, return SMB_VFS_NEXT_NTIMES(handle, smb_fname, ft); } -static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T offset) +static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, off_t offset) { return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset); } static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp, enum vfs_fallocate_mode mode, - SMB_OFF_T offset, - SMB_OFF_T len) + off_t offset, + off_t len) { return SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len); } -static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type) +static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, off_t offset, off_t count, int type) { return SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type); } @@ -327,7 +327,7 @@ static int skel_linux_setlease(struct vfs_handle_struct *handle, struct files_st return SMB_VFS_NEXT_LINUX_SETLEASE(handle, fsp, leasetype); } -static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid) +static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid) { return SMB_VFS_NEXT_GETLOCK(handle, fsp, poffset, pcount, ptype, ppid); } -- cgit