Rev 643: fixed places that get return type wrong for VFS ops in http://samba.org/~tridge/3_0-ctdb

tridge at samba.org tridge at samba.org
Tue Oct 16 09:46:44 GMT 2007


------------------------------------------------------------
revno: 643
revision-id: tridge at samba.org-20071016094643-iks5v3jwnf7xlxre
parent: tridge at samba.org-20071016091949-8l809hhhqk1t45ym
committer: Andrew Tridgell <tridge at samba.org>
branch nick: s3-ctdb-tridge
timestamp: Tue 2007-10-16 19:46:43 +1000
message:
  fixed places that get return type wrong for VFS ops
modified:
  source/modules/vfs_shadow_copy2.c vfs_shadow_copy2.c-20070616115727-8jw10u301cshsoqz-1
  source/modules/vfs_syncops.c   vfs_syncops.c-20071016091912-7y95np83tib2zgxn-1
=== modified file 'source/modules/vfs_shadow_copy2.c'
--- a/source/modules/vfs_shadow_copy2.c	2007-06-16 17:44:39 +0000
+++ b/source/modules/vfs_shadow_copy2.c	2007-10-16 09:46:43 +0000
@@ -298,13 +298,13 @@
 	SHADOW2_NEXT2(RENAME, (handle, oldname, newname));
 }
 
-static BOOL shadow_copy2_symlink(vfs_handle_struct *handle,
-			  const char *oldname, const char *newname)
+static int shadow_copy2_symlink(vfs_handle_struct *handle,
+				const char *oldname, const char *newname)
 {
 	SHADOW2_NEXT2(SYMLINK, (handle, oldname, newname));
 }
 
-static BOOL shadow_copy2_link(vfs_handle_struct *handle,
+static int shadow_copy2_link(vfs_handle_struct *handle,
 			  const char *oldname, const char *newname)
 {
 	SHADOW2_NEXT2(LINK, (handle, oldname, newname));
@@ -373,10 +373,10 @@
         SHADOW2_NEXT(NTIMES, (handle, name, ts), int, -1);
 }
 
-static BOOL shadow_copy2_readlink(vfs_handle_struct *handle,
-			   const char *fname, char *buf, size_t bufsiz)
+static int shadow_copy2_readlink(vfs_handle_struct *handle,
+				 const char *fname, char *buf, size_t bufsiz)
 {
-        SHADOW2_NEXT(READLINK, (handle, name, buf, bufsiz), BOOL, False);
+        SHADOW2_NEXT(READLINK, (handle, name, buf, bufsiz), int, -1);
 }
 
 static int shadow_copy2_mknod(vfs_handle_struct *handle,
@@ -405,14 +405,14 @@
         SHADOW2_NEXT(SET_NT_ACL, (handle, fsp, name, security_info_sent, psd), BOOL, False);
 }
 
-static BOOL shadow_copy2_mkdir(vfs_handle_struct *handle,  const char *fname, mode_t mode)
+static int shadow_copy2_mkdir(vfs_handle_struct *handle,  const char *fname, mode_t mode)
 {
-        SHADOW2_NEXT(MKDIR, (handle, name, mode), BOOL, False);
+        SHADOW2_NEXT(MKDIR, (handle, name, mode), int, -1);
 }
 
-static BOOL shadow_copy2_rmdir(vfs_handle_struct *handle,  const char *fname)
+static int shadow_copy2_rmdir(vfs_handle_struct *handle,  const char *fname)
 {
-        SHADOW2_NEXT(RMDIR, (handle, name), BOOL, False);
+        SHADOW2_NEXT(RMDIR, (handle, name), int, -1);
 }
 
 static int shadow_copy2_chflags(vfs_handle_struct *handle, const char *fname, int flags)

=== modified file 'source/modules/vfs_syncops.c'
--- a/source/modules/vfs_syncops.c	2007-10-16 09:19:49 +0000
+++ b/source/modules/vfs_syncops.c	2007-10-16 09:46:43 +0000
@@ -105,49 +105,49 @@
 }
 
 /* handle the rest with a macro */
-#define SYNCOPS_NEXT(op, fname, args, rtype, rsuccess) do {   \
-	rtype ret = SMB_VFS_NEXT_ ## op args; \
-	if (ret == rsuccess && fname) syncops_name(fname); \
+#define SYNCOPS_NEXT(op, fname, args) do {   \
+	int ret = SMB_VFS_NEXT_ ## op args; \
+	if (ret == 0 && fname) syncops_name(fname); \
 	return ret; \
 } while (0)
 
-static BOOL syncops_symlink(vfs_handle_struct *handle,
-			    const char *oldname, const char *newname)
+static int syncops_symlink(vfs_handle_struct *handle,
+			   const char *oldname, const char *newname)
 {
-	SYNCOPS_NEXT(SYMLINK, newname, (handle, oldname, newname), BOOL, True);
+	SYNCOPS_NEXT(SYMLINK, newname, (handle, oldname, newname));
 }
 
-static BOOL syncops_link(vfs_handle_struct *handle,
+static int syncops_link(vfs_handle_struct *handle,
 			 const char *oldname, const char *newname)
 {
-	SYNCOPS_NEXT(LINK, newname, (handle, oldname, newname), BOOL, True);
+	SYNCOPS_NEXT(LINK, newname, (handle, oldname, newname));
 }
 
 static int syncops_open(vfs_handle_struct *handle,
 			const char *fname, files_struct *fsp, int flags, mode_t mode)
 {
-	SYNCOPS_NEXT(OPEN, (flags&O_CREAT?fname:NULL), (handle, fname, fsp, flags, mode), int, 0);
+	SYNCOPS_NEXT(OPEN, (flags&O_CREAT?fname:NULL), (handle, fname, fsp, flags, mode));
 }
 
 static int syncops_unlink(vfs_handle_struct *handle, const char *fname)
 {
-        SYNCOPS_NEXT(UNLINK, fname, (handle, fname), int, 0);
+        SYNCOPS_NEXT(UNLINK, fname, (handle, fname));
 }
 
 static int syncops_mknod(vfs_handle_struct *handle,
 			 const char *fname, mode_t mode, SMB_DEV_T dev)
 {
-        SYNCOPS_NEXT(MKNOD, fname, (handle, fname, mode, dev), int, 0);
-}
-
-static BOOL syncops_mkdir(vfs_handle_struct *handle,  const char *fname, mode_t mode)
-{
-        SYNCOPS_NEXT(MKDIR, fname, (handle, fname, mode), BOOL, True);
-}
-
-static BOOL syncops_rmdir(vfs_handle_struct *handle,  const char *fname)
-{
-        SYNCOPS_NEXT(RMDIR, fname, (handle, fname), BOOL, True);
+        SYNCOPS_NEXT(MKNOD, fname, (handle, fname, mode, dev));
+}
+
+static int syncops_mkdir(vfs_handle_struct *handle,  const char *fname, mode_t mode)
+{
+        SYNCOPS_NEXT(MKDIR, fname, (handle, fname, mode));
+}
+
+static int syncops_rmdir(vfs_handle_struct *handle,  const char *fname)
+{
+        SYNCOPS_NEXT(RMDIR, fname, (handle, fname));
 }
 
 



More information about the samba-cvs mailing list