summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-07-03 23:48:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:46 -0500
commit9f03efd6e5dbf49d85798cc6f320828f65ef3c3a (patch)
tree535a19e379f849d99b1ecd0bd9f358c89ed5ca59
parent38c84fe163e8c30d599f7cf872d04142757ceeb1 (diff)
downloadsamba-9f03efd6e5dbf49d85798cc6f320828f65ef3c3a.tar.gz
samba-9f03efd6e5dbf49d85798cc6f320828f65ef3c3a.tar.bz2
samba-9f03efd6e5dbf49d85798cc6f320828f65ef3c3a.zip
r23692: Couldn't wait, sorry :-). Did the style change.
Jeremy. (This used to be commit da0d6ba0f972dbe48e2b7297e86e1717e510fadf)
-rw-r--r--source3/modules/vfs_recycle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 4360775284..3a72cacc13 100644
--- 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)));
}