diff options
| author | Wayne Davison <wayned@samba.org> | 2009-09-12 09:13:38 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2009-09-12 09:13:38 -0700 |
| commit | 1b502f3ec234bf1045c6bb146f64734d09e81956 (patch) | |
| tree | 6d326c8a215ad1b7568647152522714522a6d76e /flist.c | |
| parent | 44d7d045c7880eba19ab04e80eeb064b0649e4b7 (diff) | |
| download | android_external_rsync-1b502f3ec234bf1045c6bb146f64734d09e81956.tar.gz android_external_rsync-1b502f3ec234bf1045c6bb146f64734d09e81956.tar.bz2 android_external_rsync-1b502f3ec234bf1045c6bb146f64734d09e81956.zip | |
Put file descriptor arg at the start of the arg list for consistency.
Diffstat (limited to 'flist.c')
| -rw-r--r-- | flist.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -674,8 +674,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, stats.total_size += F_LENGTH(file); } -static struct file_struct *recv_file_entry(struct file_list *flist, - int xflags, int f) +static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags) { static int64 modtime; static mode_t mode; @@ -1116,11 +1115,11 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(mode)) - receive_acl(file, f); + receive_acl(f, file); #endif #ifdef SUPPORT_XATTRS if (preserve_xattrs) - receive_xattr(file, f ); + receive_xattr(f, file); #endif if (S_ISREG(mode) || S_ISLNK(mode)) @@ -1531,13 +1530,13 @@ static struct file_struct *send_file_name(int f, struct file_list *flist, #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(file->mode)) { - send_acl(&sx, f); + send_acl(f, &sx); free_acl(&sx); } #endif #ifdef SUPPORT_XATTRS if (preserve_xattrs) { - F_XATTR(file) = send_xattr(&sx, f); + F_XATTR(file) = send_xattr(f, &sx); free_xattr(&sx); } #endif @@ -2441,7 +2440,7 @@ struct file_list *recv_file_list(int f) } flist_expand(flist, 1); - file = recv_file_entry(flist, flags, f); + file = recv_file_entry(f, flist, flags); if (S_ISREG(file->mode)) { /* Already counted */ |