From: J.W. Schultz <jw@samba.org>
Date: Wed, 7 Jan 2004 09:11:56 +0000 (+0000)
Subject: Cosmetic changes to file_compare() for readability and to
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/fa45cda1aa675aab6d9f9fb88fbfc69d41ea32ab

Cosmetic changes to file_compare() for readability and to
match hlink_compare()
---

diff --git a/flist.c b/flist.c
index 5204ee6c..a14ce5f0 100644
--- a/flist.c
+++ b/flist.c
@@ -1158,17 +1158,20 @@ struct file_list *recv_file_list(int f)
 }
 
 
-int file_compare(struct file_struct **f1, struct file_struct **f2)
+int file_compare(struct file_struct **file1, struct file_struct **file2)
 {
-	if (!(*f1)->basename && !(*f2)->basename)
+	struct file_struct *f1 = *file1;
+	struct file_struct *f2 = *file2;
+
+	if (!f1->basename && !f2->basename)
 		return 0;
-	if (!(*f1)->basename)
+	if (!f1->basename)
 		return -1;
-	if (!(*f2)->basename)
+	if (!f2->basename)
 		return 1;
-	if ((*f1)->dirname == (*f2)->dirname)
-		return u_strcmp((*f1)->basename, (*f2)->basename);
-	return f_name_cmp(*f1, *f2);
+	if (f1->dirname == f2->dirname)
+		return u_strcmp(f1->basename, f2->basename);
+	return f_name_cmp(f1, f2);
 }