In clean_flist(), if a duplicate is found for a dir and a non-dir,

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 330ef07..84bca50 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -36,7 +36,7 @@ static int hlink_compare(struct file_struct **file1, struct file_struct **file2)
        if (f1->F_INODE != f2->F_INODE)
                return (int) (f1->F_INODE > f2->F_INODE ? 1 : -1);
 
-       return f_name_cmp(*file1, *file2);
+       return f_name_cmp(f1, f2);
 }
 
 static struct file_struct **hlink_list;
@@ -157,7 +157,7 @@ static void hard_link_one(char *hlink1, char *hlink2)
        if (do_link(hlink1, hlink2)) {
                if (verbose) {
                        rsyserr(FINFO, errno, "link %s => %s failed",
-                               full_name(hlink2), safe_fname(hlink1));
+                               full_fname(hlink2), safe_fname(hlink1));
                }
        }
        else if (verbose)