aboutsummaryrefslogtreecommitdiffstats
path: root/hlink.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2013-01-19 10:20:49 -0800
committerWayne Davison <wayned@samba.org>2013-01-19 10:25:18 -0800
commitd42e7181d5d864767a893e88628d97470caa5c0a (patch)
treea0ed5f4afe01c745a83cf50bd8d079eb4e06cb0f /hlink.c
parentc03bb3d181b300a30a45e043d5aa075af5e8e3f8 (diff)
downloadandroid_external_rsync-d42e7181d5d864767a893e88628d97470caa5c0a.tar.gz
android_external_rsync-d42e7181d5d864767a893e88628d97470caa5c0a.tar.bz2
android_external_rsync-d42e7181d5d864767a893e88628d97470caa5c0a.zip
Add free_stat_x() inline function.
Diffstat (limited to 'hlink.c')
-rw-r--r--hlink.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/hlink.c b/hlink.c
index f192e3a3..3ecc52bd 100644
--- a/hlink.c
+++ b/hlink.c
@@ -441,16 +441,8 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
}
}
#endif
- } else {
-#ifdef SUPPORT_ACLS
- if (preserve_acls)
- free_acl(&alt_sx);
-#endif
-#ifdef SUPPORT_XATTRS
- if (preserve_xattrs)
- free_xattr(&alt_sx);
-#endif
- }
+ } else
+ free_stat_x(&alt_sx);
}
if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
@@ -527,14 +519,7 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
our_name, stp, fname, itemizing, code);
flist->in_progress--;
-#ifdef SUPPORT_ACLS
- if (preserve_acls)
- free_acl(&prev_sx);
-#endif
-#ifdef SUPPORT_XATTRS
- if (preserve_xattrs)
- free_xattr(&prev_sx);
-#endif
+ free_stat_x(&prev_sx);
if (val < 0)
continue;
if (remove_source_files == 1 && do_xfers)