Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed "count" to "used" in struct file_list since there can
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
3c80286
..
fbe18c7
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-162,12
+162,12
@@
int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
continue;
}
ndx = NDX_FLIST_OFFSET - ndx;
continue;
}
ndx = NDX_FLIST_OFFSET - ndx;
- if (ndx < 0 || ndx >= dir_flist->
count
) {
+ if (ndx < 0 || ndx >= dir_flist->
used
) {
ndx = NDX_FLIST_OFFSET - ndx;
rprintf(FERROR,
"[%s] Invalid dir index: %d (%d - %d)\n",
who_am_i(), ndx, NDX_FLIST_OFFSET,
ndx = NDX_FLIST_OFFSET - ndx;
rprintf(FERROR,
"[%s] Invalid dir index: %d (%d - %d)\n",
who_am_i(), ndx, NDX_FLIST_OFFSET,
- NDX_FLIST_OFFSET - dir_flist->
count
+ 1);
+ NDX_FLIST_OFFSET - dir_flist->
used
+ 1);
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
@@
-188,7
+188,7
@@
int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
/* Honor the old-style keep-alive indicator. */
if (protocol_version < 30
/* Honor the old-style keep-alive indicator. */
if (protocol_version < 30
- && ndx == cur_flist->
count
&& iflags == ITEM_IS_NEW) {
+ && ndx == cur_flist->
used
&& iflags == ITEM_IS_NEW) {
if (am_sender)
maybe_send_keepalive();
goto read_loop;
if (am_sender)
maybe_send_keepalive();
goto read_loop;
@@
-200,7
+200,7
@@
int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
"Invalid file index: %d (%d - %d) with iflags %x [%s]\n",
ndx, first_flist->ndx_start + first_flist->ndx_start,
first_flist->prev->ndx_start + first_flist->ndx_start
"Invalid file index: %d (%d - %d) with iflags %x [%s]\n",
ndx, first_flist->ndx_start + first_flist->ndx_start,
first_flist->prev->ndx_start + first_flist->ndx_start
- + first_flist->prev->
count
- 1, iflags, who_am_i());
+ + first_flist->prev->
used
- 1, iflags, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
cur_flist = flist;
exit_cleanup(RERR_PROTOCOL);
}
cur_flist = flist;
@@
-500,7
+500,7
@@
struct file_list *flist_for_ndx(int ndx)
return NULL;
flist = flist->prev;
}
return NULL;
flist = flist->prev;
}
- while (ndx >= flist->ndx_start + flist->
count
) {
+ while (ndx >= flist->ndx_start + flist->
used
) {
if (!(flist = flist->next))
return NULL;
}
if (!(flist = flist->next))
return NULL;
}