Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fc3ca11
)
Another optimization of "bp" adding when creating a file_struct.
author
Wayne Davison
<wayned@samba.org>
Sat, 15 Mar 2008 14:27:33 +0000
(07:27 -0700)
committer
Wayne Davison
<wayned@samba.org>
Sat, 15 Mar 2008 14:27:33 +0000
(07:27 -0700)
flist.c
patch
|
blob
|
blame
|
history
diff --git
a/flist.c
b/flist.c
index
489d92c
..
dd3b3b1
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-854,7
+854,6
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
- bp += basename_len;
#ifdef SUPPORT_HARD_LINKS
if (xflags & XMIT_HLINKED)
#ifdef SUPPORT_HARD_LINKS
if (xflags & XMIT_HLINKED)
@@
-919,6
+918,7
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
#ifdef SUPPORT_LINKS
if (linkname_len) {
#ifdef SUPPORT_LINKS
if (linkname_len) {
+ bp += basename_len;
if (first_hlink_ndx >= flist->ndx_start) {
struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
memcpy(bp, F_SYMLINK(first), linkname_len);
if (first_hlink_ndx >= flist->ndx_start) {
struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
memcpy(bp, F_SYMLINK(first), linkname_len);
@@
-1177,7
+1177,6
@@
struct file_struct *make_file(const char *fname, struct file_list *flist,
bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
- bp += basename_len;
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && flist && flist->prev) {
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && flist && flist->prev) {
@@
-1216,7
+1215,7
@@
struct file_struct *make_file(const char *fname, struct file_list *flist,
#ifdef SUPPORT_LINKS
if (linkname_len)
#ifdef SUPPORT_LINKS
if (linkname_len)
- memcpy(bp, linkname, linkname_len);
+ memcpy(bp
+ basename_len
, linkname, linkname_len);
#endif
if (always_checksum && am_sender && S_ISREG(st.st_mode))
#endif
if (always_checksum && am_sender && S_ISREG(st.st_mode))