Author: jra Date: 2007-07-03 23:48:02 +0000 (Tue, 03 Jul 2007) New Revision: 23692
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23692 Log: Couldn't wait, sorry :-). Did the style change. Jeremy. Modified: branches/SAMBA_3_0/source/modules/vfs_recycle.c branches/SAMBA_3_0_26/source/modules/vfs_recycle.c Changeset: Modified: branches/SAMBA_3_0/source/modules/vfs_recycle.c =================================================================== --- branches/SAMBA_3_0/source/modules/vfs_recycle.c 2007-07-03 23:34:01 UTC (rev 23691) +++ branches/SAMBA_3_0/source/modules/vfs_recycle.c 2007-07-03 23:48:02 UTC (rev 23692) @@ -391,7 +391,7 @@ { 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 @@ 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))); } Modified: branches/SAMBA_3_0_26/source/modules/vfs_recycle.c =================================================================== --- branches/SAMBA_3_0_26/source/modules/vfs_recycle.c 2007-07-03 23:34:01 UTC (rev 23691) +++ branches/SAMBA_3_0_26/source/modules/vfs_recycle.c 2007-07-03 23:48:02 UTC (rev 23692) @@ -391,7 +391,7 @@ { 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 @@ 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))); }
