- The XMIT_SAME_DEV define is now pre-protocol-30 specific.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 62731a6..93c849a 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -81,7 +81,7 @@ static struct idev tmp_idev;
 static char tmp_sum[MD4_SUM_LENGTH];
 
 static char empty_sum[MD4_SUM_LENGTH];
-static int flist_count_offset;
+static int flist_count_offset; /* for --delete --progress */
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
 static void output_flist(struct file_list *flist);
@@ -90,7 +90,7 @@ void init_flist(void)
 {
        if (verbose > 4) {
                rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n",
-                       FILE_STRUCT_LEN, EXTRA_LEN);
+                       (int)FILE_STRUCT_LEN, (int)EXTRA_LEN);
        }
        checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
 }
@@ -387,7 +387,7 @@ static void send_file_entry(struct file_struct *file, int f)
                                flags |= XMIT_SAME_DEV;
                } else
                        dev = tmp_idev.dev;
-               flags |= XMIT_HAS_IDEV_DATA;
+               flags |= XMIT_HLINKED;
        }
 #endif
 
@@ -618,8 +618,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 #ifdef SUPPORT_HARD_LINKS
        if (preserve_hard_links) {
                if (protocol_version < 28 && S_ISREG(mode))
-                       flags |= XMIT_HAS_IDEV_DATA;
-               if (flags & XMIT_HAS_IDEV_DATA)
+                       flags |= XMIT_HLINKED;
+               if (flags & XMIT_HLINKED)
                        extra_len += EXTRA_LEN;
        }
 #endif
@@ -643,7 +643,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
        bp += basename_len + linkname_len; /* skip space for symlink too */
 
 #ifdef SUPPORT_HARD_LINKS
-       if (flags & XMIT_HAS_IDEV_DATA)
+       if (flags & XMIT_HLINKED)
                file->flags |= FLAG_HLINKED;
 #endif
        file->modtime = modtime;
@@ -710,7 +710,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 #endif
 
 #ifdef SUPPORT_HARD_LINKS
-       if (preserve_hard_links && flags & XMIT_HAS_IDEV_DATA) {
+       if (preserve_hard_links && flags & XMIT_HLINKED) {
                struct idev *idevp = pool_talloc(hlink_pool, struct idev,
                                                 1, "inode_table");
                F_HL_IDEV(file) = idevp;
@@ -1045,8 +1045,7 @@ static void send_if_directory(int f, struct file_list *flist,
  * file list in memory without sending it over the wire.  Also, get_dirlist()
  * might call this with f set to -2, which also indicates that local filter
  * rules should be ignored. */
-static void send_directory(int f, struct file_list *flist,
-                          char *fbuf, int len)
+static void send_directory(int f, struct file_list *flist, char *fbuf, int len)
 {
        struct dirent *di;
        unsigned remainder;
@@ -1914,8 +1913,7 @@ char *f_name(struct file_struct *f, char *fbuf)
  * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
  * buffer (the functions we call will append names onto the end, but the old
  * dir value will be restored on exit). */
-struct file_list *get_dirlist(char *dirname, int dlen,
-                             int ignore_filter_rules)
+struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
 {
        struct file_list *dirlist;
        char dirbuf[MAXPATHLEN];