r23692: Couldn't wait, sorry :-). Did the style change.

Jeremy.
(This used to be commit da0d6ba0f972dbe48e2b7297e86e1717e510fadf)

diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 4360775284f6424bbe78f67860d78835fe9f155f..3a72cacc137551f742f5d169ba46fec2663d36aa 100644 (file)
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -391,7 +391,7 @@ static void recycle_do_touch(vfs_handle_struct *handle, const char *fname,
 {
        SMB_STRUCT_STAT st;
        struct timespec ts[2];
-       int status, err;
+       int ret, err;
 
        if (SMB_VFS_NEXT_STAT(handle, fname, &st) != 0) {
                DEBUG(0,("recycle: stat for %s returned %s\n",
@@ -402,10 +402,10 @@ static void recycle_do_touch(vfs_handle_struct *handle, const char *fname,
        ts[1] = touch_mtime ? ts[0] : get_mtimespec(&st); /* mtime */
 
        become_root();
-       status = SMB_VFS_NEXT_NTIMES(handle, fname, ts);
+       ret = SMB_VFS_NEXT_NTIMES(handle, fname, ts);
        err = errno;
        unbecome_root();
-       if (status == -1 ) {
+       if (ret == -1 ) {
                DEBUG(0, ("recycle: touching %s failed, reason = %s\n",
                          fname, strerror(err)));
        }