The branch, v3-2-test has been updated
via 0c4b1974a19d1ee78d3973808e9b854c19847a2b (commit)
from a7a3f335e3b867ca6c8d75a53262b15d7c75d7b1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0c4b1974a19d1ee78d3973808e9b854c19847a2b
Author: Tim Prouty <[email protected]>
Date: Sat Feb 14 20:34:16 2009 -0800
s3 vfs: Fix SMB_VFS_RECVFILE/SENDFILE macros
-----------------------------------------------------------------------
Summary of changes:
source/include/vfs_macros.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/vfs_macros.h b/source/include/vfs_macros.h
index 0acf861..a1c1946 100644
--- a/source/include/vfs_macros.h
+++ b/source/include/vfs_macros.h
@@ -54,8 +54,8 @@
#define SMB_VFS_WRITE(fsp, data, n)
((fsp)->conn->vfs.ops.write((fsp)->conn->vfs.handles.write, (fsp), (data), (n)))
#define SMB_VFS_PWRITE(fsp, data, n, off)
((fsp)->conn->vfs.ops.pwrite((fsp)->conn->vfs.handles.pwrite, (fsp), (data),
(n), (off)))
#define SMB_VFS_LSEEK(fsp, offset, whence)
((fsp)->conn->vfs.ops.lseek((fsp)->conn->vfs.handles.lseek, (fsp), (offset),
(whence)))
-#define SMB_VFS_SENDFILE(tofd, fromfsp, header, offset, count)
((fsp)->conn->vfs.ops.sendfile((fsp)->conn->vfs.handles.sendfile, (tofd),
(fromfsp), (header), (offset), (count)))
-#define SMB_VFS_RECVFILE(fromfd, tofsp, offset, count)
((fsp)->conn->vfs.ops.recvfile((fsp)->conn->vfs.handles.recvfile, (fromfd),
(tofsp), (offset), (count)))
+#define SMB_VFS_SENDFILE(tofd, fromfsp, header, offset, count)
((fromfsp)->conn->vfs.ops.sendfile((fromfsp)->conn->vfs.handles.sendfile,
(tofd), (fromfsp), (header), (offset), (count)))
+#define SMB_VFS_RECVFILE(fromfd, tofsp, offset, count)
((tofsp)->conn->vfs.ops.recvfile((tofsp)->conn->vfs.handles.recvfile, (fromfd),
(tofsp), (offset), (count)))
#define SMB_VFS_RENAME(conn, old, new)
((conn)->vfs.ops.rename((conn)->vfs.handles.rename, (old), (new)))
#define SMB_VFS_FSYNC(fsp)
((fsp)->conn->vfs.ops.fsync((fsp)->conn->vfs.handles.fsync, (fsp)))
#define SMB_VFS_STAT(conn, fname, sbuf)
((conn)->vfs.ops.stat((conn)->vfs.handles.stat, (fname), (sbuf)))
@@ -180,8 +180,8 @@
#define SMB_VFS_OPAQUE_WRITE(fsp, data, n)
((fsp)->conn->vfs_opaque.ops.write((fsp)->conn->vfs_opaque.handles.write,
(fsp), (data), (n)))
#define SMB_VFS_OPAQUE_PWRITE(fsp, data, n, off)
((fsp)->conn->vfs_opaque.ops.pwrite((fsp)->conn->vfs_opaque.handles.pwrite,
(fsp), (data), (n), (off)))
#define SMB_VFS_OPAQUE_LSEEK(fsp, offset, whence)
((fsp)->conn->vfs_opaque.ops.lseek((fsp)->conn->vfs_opaque.handles.lseek,
(fsp), (offset), (whence)))
-#define SMB_VFS_OPAQUE_SENDFILE(tofd, fromfsp, header, offset, count)
((fsp)->conn->vfs_opaque.ops.sendfile((fsp)->conn->vfs_opaque.handles.sendfile,
(tofd), (fromfsp), (header), (offset), (count)))
-#define SMB_VFS_OPAQUE_RECVFILE(fromfd, tofsp, offset, count)
((fsp)->conn->vfs_opaque.ops.recvfile((fsp)->conn->vfs_opaque.handles.recvfile,
(fromfd), (tofsp), (offset), (count)))
+#define SMB_VFS_OPAQUE_SENDFILE(tofd, fromfsp, header, offset, count)
((fromfsp)->conn->vfs_opaque.ops.sendfile((fromfsp)->conn->vfs_opaque.handles.sendfile,
(tofd), (fromfsp), (header), (offset), (count)))
+#define SMB_VFS_OPAQUE_RECVFILE(fromfd, tofsp, offset, count)
((tofsp)->conn->vfs_opaque.ops.recvfile((tofsp)->conn->vfs_opaque.handles.recvfile,
(fromfd), (tofsp), (offset), (count)))
#define SMB_VFS_OPAQUE_RENAME(conn, old, new)
((conn)->vfs_opaque.ops.rename((conn)->vfs_opaque.handles.rename, (old), (new)))
#define SMB_VFS_OPAQUE_FSYNC(fsp)
((fsp)->conn->vfs_opaque.ops.fsync((fsp)->conn->vfs_opaque.handles.fsync,
(fsp)))
#define SMB_VFS_OPAQUE_STAT(conn, fname, sbuf)
((conn)->vfs_opaque.ops.stat((conn)->vfs_opaque.handles.stat, (fname), (sbuf)))
--
Samba Shared Repository
