From: Wayne Davison Date: Sat, 2 Dec 2006 16:13:02 +0000 (+0000) Subject: Moved write_ndx_and_attrs() too. X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/20f0d0f9b9d4b373fdd2198a71d43a2c987e252a Moved write_ndx_and_attrs() too. --- diff --git a/rsync.c b/rsync.c index 4649752e..b2c3ee05 100644 --- a/rsync.c +++ b/rsync.c @@ -91,6 +91,19 @@ void setup_iconv() } #endif +static void write_ndx_and_attrs(int f_out, int ndx, int iflags, + uchar fnamecmp_type, char *buf, int len) +{ + write_int(f_out, ndx); + if (protocol_version < 29) + return; + write_shortint(f_out, iflags); + if (iflags & ITEM_BASIS_TYPE_FOLLOWS) + write_byte(f_out, fnamecmp_type); + if (iflags & ITEM_XNAME_FOLLOWS) + write_vstring(f_out, buf, len); +} + /* This is used by sender.c with a valid f_out, and by receive.c with * f_out = -1. */ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr, diff --git a/sender.c b/sender.c index b0c6570b..52aaa9c6 100644 --- a/sender.c +++ b/sender.c @@ -143,19 +143,6 @@ void successful_send(int ndx) } } -static void write_ndx_and_attrs(int f_out, int ndx, int iflags, - uchar fnamecmp_type, char *buf, int len) -{ - write_int(f_out, ndx); - if (protocol_version < 29) - return; - write_shortint(f_out, iflags); - if (iflags & ITEM_BASIS_TYPE_FOLLOWS) - write_byte(f_out, fnamecmp_type); - if (iflags & ITEM_XNAME_FOLLOWS) - write_vstring(f_out, buf, len); -} - void send_files(struct file_list *flist, int f_out, int f_in) { int fd = -1;