From b7cfb9e2c08c052fd85fe722f812a94d25715313 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 13 Dec 2006 15:36:15 +0000 Subject: [PATCH] Renamed the F_*HLINK* macros to make their purpose clearer. --- generator.c | 10 +++++----- rsync.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generator.c b/generator.c index a53bb646..55f0e4a5 100644 --- a/generator.c +++ b/generator.c @@ -1238,7 +1238,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_NOT_HLINK_FIRST(file) + if (preserve_hard_links && F_HLINK_NOT_FIRST(file) && hard_link_check(file, ndx, fname, statret, &st, itemizing, code)) return; #endif @@ -1297,7 +1297,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = 1; } #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_NOT_HLINK_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) return; #endif if (do_symlink(sl, fname) != 0) { @@ -1374,7 +1374,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = 1; } #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_NOT_HLINK_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) return; #endif if (verbose > 2) { @@ -1494,7 +1494,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (statret != 0) { #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_NOT_HLINK_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) return; #endif if (stat_errno == ENOENT) @@ -1557,7 +1557,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, pretend_missing: /* pretend the file didn't exist */ #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_NOT_HLINK_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) return; #endif statret = real_ret = -1; diff --git a/rsync.h b/rsync.h index a5092426..f2178267 100644 --- a/rsync.h +++ b/rsync.h @@ -569,8 +569,8 @@ extern int preserve_gid; /* Some utility defines: */ #define F_IS_ACTIVE(f) F_BASENAME(f)[0] #define F_IS_HLINKED(f) ((f)->flags & FLAG_HLINKED) -#define F_NOT_HLINK_FIRST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_FIRST) -#define F_NOT_HLINK_LAST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_LAST) +#define F_HLINK_NOT_FIRST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_FIRST) +#define F_HLINK_NOT_LAST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_LAST) #define DEV_MAJOR(a) (a)[0] #define DEV_MINOR(a) (a)[1] -- 2.34.1