# HG changeset patch
# User zas_
# Date 1217267816 0
# Node ID 77a1d5a0326d1bbbf648f620f207c6247ef9e4bd
# Parent  6ce7133c730d3acce0472f1561dbaee6117ab98f
Optimize redundant tests.

diff -r 6ce7133c730d -r 77a1d5a0326d src/filedata.c
--- a/src/filedata.c	Mon Jul 28 17:55:06 2008 +0000
+++ b/src/filedata.c	Mon Jul 28 17:56:56 2008 +0000
@@ -1624,15 +1624,18 @@
 			ret |= CHANGE_NO_WRITE_PERM_DEST_DIR;
 			DEBUG_1("Change checked: destination dir is readonly: %s -> %s", fd->path, fd->change->dest);
 			}
-		else if (isfile(fd->change->dest) && !access_file(fd->change->dest, W_OK) && (strcmp(fd->change->dest, fd->path) != 0))
-			{
-			ret |= CHANGE_NO_WRITE_PERM_DEST;
-			DEBUG_1("Change checked: destination file exists and is readonly: %s -> %s", fd->path, fd->change->dest);
-			}
 		else if (isfile(fd->change->dest) && (strcmp(fd->change->dest, fd->path) != 0))
 			{
-			ret |= CHANGE_WARN_DEST_EXISTS;
-			DEBUG_1("Change checked: destination exists: %s -> %s", fd->path, fd->change->dest);
+			if (!access_file(fd->change->dest, W_OK))
+				{
+				ret |= CHANGE_NO_WRITE_PERM_DEST;
+				DEBUG_1("Change checked: destination file exists and is readonly: %s -> %s", fd->path, fd->change->dest);
+				}
+			else
+				{
+				ret |= CHANGE_WARN_DEST_EXISTS;
+				DEBUG_1("Change checked: destination exists: %s -> %s", fd->path, fd->change->dest);
+				}
 			}
 		else if (isdir(fd->change->dest) && (strcmp(fd->change->dest, fd->path) != 0))
 			{