be empty items that make the count inaccurate (and the name
somewhat deceiving).
if (do_progress) {
/* This overwrites the progress line */
rprintf(FINFO, "%d file%sto consider\n",
if (do_progress) {
/* This overwrites the progress line */
rprintf(FINFO, "%d file%sto consider\n",
- flist->count, flist->count == 1 ? " " : "s ");
+ flist->used, flist->used == 1 ? " " : "s ");
} else
rprintf(FINFO, "done\n");
}
} else
rprintf(FINFO, "done\n");
}
-/* Make sure flist can hold at least flist->count + extra entries. */
+/* Make sure flist can hold at least flist->used + extra entries. */
static void flist_expand(struct file_list *flist, int extra)
{
struct file_struct **new_ptr;
static void flist_expand(struct file_list *flist, int extra)
{
struct file_struct **new_ptr;
- if (flist->count + extra <= flist->malloced)
+ if (flist->used + extra <= flist->malloced)
return;
if (flist->malloced < FLIST_START)
return;
if (flist->malloced < FLIST_START)
/* In case count jumped or we are starting the list
* with a known size just set it. */
/* In case count jumped or we are starting the list
* with a known size just set it. */
- if (flist->malloced < flist->count + extra)
- flist->malloced = flist->count + extra;
+ if (flist->malloced < flist->used + extra)
+ flist->malloced = flist->used + extra;
new_ptr = realloc_array(flist->files, struct file_struct *,
flist->malloced);
new_ptr = realloc_array(flist->files, struct file_struct *,
flist->malloced);
&& BITS_SETnUNSET(xflags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
struct file_struct *first;
first_hlink_ndx = read_varint30(f);
&& BITS_SETnUNSET(xflags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
struct file_struct *first;
first_hlink_ndx = read_varint30(f);
- if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) {
+ if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->used) {
rprintf(FERROR,
"hard-link reference out of range: %d (%d)\n",
rprintf(FERROR,
"hard-link reference out of range: %d (%d)\n",
- first_hlink_ndx, flist->count);
+ first_hlink_ndx, flist->used);
exit_cleanup(RERR_PROTOCOL);
}
first = flist->files[first_hlink_ndx];
exit_cleanup(RERR_PROTOCOL);
}
first = flist->files[first_hlink_ndx];
}
#ifdef ICONV_OPTION
if (ic_ndx)
}
#ifdef ICONV_OPTION
if (ic_ndx)
- F_NDX(file) = flist->count + flist->ndx_start;
+ F_NDX(file) = flist->used + flist->ndx_start;
#endif
if (basename != thisname) {
#endif
if (basename != thisname) {
if (preserve_hard_links && xflags & XMIT_HLINKED) {
if (protocol_version >= 30) {
F_HL_GNUM(file) = xflags & XMIT_HLINK_FIRST
if (preserve_hard_links && xflags & XMIT_HLINKED) {
if (protocol_version >= 30) {
F_HL_GNUM(file) = xflags & XMIT_HLINK_FIRST
- ? flist->count : first_hlink_ndx;
+ ? flist->used : first_hlink_ndx;
} else {
static int32 cnt = 0;
struct idev_node *np;
} else {
static int32 cnt = 0;
struct idev_node *np;
- maybe_emit_filelist_progress(flist->count + flist_count_offset);
+ maybe_emit_filelist_progress(flist->used + flist_count_offset);
- flist->files[flist->count++] = file;
+ flist->files[flist->used++] = file;
- send_file_entry(f, file, flist->count - 1);
+ send_file_entry(f, file, flist->used - 1);
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
send_acl(&sx, f);
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
send_acl(&sx, f);
if (!S_ISDIR(file->mode))
continue;
if (!S_ISDIR(file->mode))
continue;
- dir_flist->files[dir_flist->count++] = file;
+ dir_flist->files[dir_flist->used++] = file;
dir_cnt--;
if (!(file->flags & FLAG_XFER_DIR)
dir_cnt--;
if (!(file->flags & FLAG_XFER_DIR)
- DIR_NEXT_SIBLING(dp) = dir_flist->count - 1;
+ DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
- DIR_FIRST_CHILD(parent_dp) = dir_flist->count - 1;
+ DIR_FIRST_CHILD(parent_dp) = dir_flist->used - 1;
- send_dir_ndx = dir_flist->count - 1;
+ send_dir_ndx = dir_flist->used - 1;
dp = F_DIRNODE_P(file);
DIR_PARENT(dp) = parent_ndx;
dp = F_DIRNODE_P(file);
DIR_PARENT(dp) = parent_ndx;
char *p;
DIR *d;
int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
char *p;
DIR *d;
int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
- int start = flist->count;
+ int start = flist->used;
int filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
assert(flist != NULL);
int filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
assert(flist != NULL);
closedir(d);
if (f >= 0 && recurse && !divert_dirs) {
closedir(d);
if (f >= 0 && recurse && !divert_dirs) {
- int i, end = flist->count - 1;
- /* send_if_directory() bumps flist->count, so use "end". */
+ int i, end = flist->used - 1;
+ /* send_if_directory() bumps flist->used, so use "end". */
for (i = start; i <= end; i++)
send_if_directory(f, flist, flist->files[i], fbuf, len, flags);
}
for (i = start; i <= end; i++)
send_if_directory(f, flist, flist->files[i], fbuf, len, flags);
}
* files in the upcoming file-lists. */
if (cur_flist->next) {
flist = first_flist->prev; /* the newest flist */
* files in the upcoming file-lists. */
if (cur_flist->next) {
flist = first_flist->prev; /* the newest flist */
- future_cnt = flist->count + flist->ndx_start
+ future_cnt = flist->used + flist->ndx_start
- cur_flist->next->ndx_start;
} else
future_cnt = 0;
- cur_flist->next->ndx_start;
} else
future_cnt = 0;
#ifdef ICONV_OPTION
if (need_unsorted_flist) {
#ifdef ICONV_OPTION
if (need_unsorted_flist) {
- if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+ if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
out_of_memory("send_extra_file_list");
memcpy(flist->sorted, flist->files,
out_of_memory("send_extra_file_list");
memcpy(flist->sorted, flist->files,
- flist->count * sizeof (struct file_struct*));
+ flist->used * sizeof (struct file_struct*));
} else
#endif
flist->sorted = flist->files;
} else
#endif
flist->sorted = flist->files;
add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart);
flist_done_allocating(flist);
add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart);
flist_done_allocating(flist);
- file_total += flist->count;
- future_cnt += flist->count;
+ file_total += flist->used;
+ future_cnt += flist->used;
stats.flist_size += stats.total_written - start_write;
stats.flist_size += stats.total_written - start_write;
- stats.num_files += flist->count;
+ stats.num_files += flist->used;
if (verbose > 3)
output_flist(flist);
if (verbose > 3)
output_flist(flist);
#ifdef ICONV_OPTION
if (need_unsorted_flist) {
if (inc_recurse) {
#ifdef ICONV_OPTION
if (need_unsorted_flist) {
if (inc_recurse) {
- if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+ if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
out_of_memory("send_file_list");
memcpy(flist->sorted, flist->files,
out_of_memory("send_file_list");
memcpy(flist->sorted, flist->files,
- flist->count * sizeof (struct file_struct*));
+ flist->used * sizeof (struct file_struct*));
flist->sorted = flist->files;
flist->sorted = flist->files;
+ flist->low = 0;
+ flist->high = flist->used - 1;
+ }
} else
#endif
{
flist->sorted = flist->files;
clean_flist(flist, 0);
}
} else
#endif
{
flist->sorted = flist->files;
clean_flist(flist, 0);
}
- file_total += flist->count;
+ file_total += flist->used;
if (!numeric_ids && !inc_recurse)
send_id_list(f);
if (!numeric_ids && !inc_recurse)
send_id_list(f);
io_end_buffering_out();
stats.flist_size = stats.total_written - start_write;
io_end_buffering_out();
stats.flist_size = stats.total_written - start_write;
- stats.num_files = flist->count;
+ stats.num_files = flist->used;
if (verbose > 3)
output_flist(flist);
if (verbose > 3)
output_flist(flist);
if (inc_recurse) {
if (flist->ndx_start == 0)
dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
if (inc_recurse) {
if (flist->ndx_start == 0)
dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
- dstart = dir_flist->count;
+ dstart = dir_flist->used;
} else {
dir_flist = flist;
dstart = 0;
} else {
dir_flist = flist;
dstart = 0;
if (inc_recurse && S_ISDIR(file->mode)) {
flist_expand(dir_flist, 1);
if (inc_recurse && S_ISDIR(file->mode)) {
flist_expand(dir_flist, 1);
- dir_flist->files[dir_flist->count++] = file;
+ dir_flist->files[dir_flist->used++] = file;
- flist->files[flist->count++] = file;
+ flist->files[flist->used++] = file;
- maybe_emit_filelist_progress(flist->count);
+ maybe_emit_filelist_progress(flist->used);
if (verbose > 2) {
rprintf(FINFO, "recv_file_name(%s)\n",
f_name(file, NULL));
}
}
if (verbose > 2) {
rprintf(FINFO, "recv_file_name(%s)\n",
f_name(file, NULL));
}
}
- file_total += flist->count;
+ file_total += flist->used;
- rprintf(FINFO, "received %d names\n", flist->count);
+ rprintf(FINFO, "received %d names\n", flist->used);
if (show_filelist_p())
finish_filelist_progress(flist);
if (show_filelist_p())
finish_filelist_progress(flist);
* order and for calling flist_find()). We keep the "files"
* list unsorted for our exchange of index numbers with the
* other side (since their names may not sort the same). */
* order and for calling flist_find()). We keep the "files"
* list unsorted for our exchange of index numbers with the
* other side (since their names may not sort the same). */
- if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+ if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
out_of_memory("recv_file_list");
memcpy(flist->sorted, flist->files,
out_of_memory("recv_file_list");
memcpy(flist->sorted, flist->files,
- flist->count * sizeof (struct file_struct*));
- if (inc_recurse && dir_flist->count > dstart) {
+ flist->used * sizeof (struct file_struct*));
+ if (inc_recurse && dir_flist->used > dstart) {
dir_flist->sorted = realloc_array(dir_flist->sorted,
struct file_struct *,
dir_flist->sorted = realloc_array(dir_flist->sorted,
struct file_struct *,
memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart,
memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart,
- (dir_flist->count - dstart) * sizeof (struct file_struct*));
- fsort(dir_flist->sorted + dstart, dir_flist->count - dstart);
+ (dir_flist->used - dstart) * sizeof (struct file_struct*));
+ fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
}
} else
#endif
{
flist->sorted = flist->files;
}
} else
#endif
{
flist->sorted = flist->files;
- if (inc_recurse && dir_flist->count > dstart) {
+ if (inc_recurse && dir_flist->used > dstart) {
dir_flist->sorted = dir_flist->files;
dir_flist->sorted = dir_flist->files;
- fsort(dir_flist->sorted + dstart, dir_flist->count - dstart);
+ fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
- for (i = 0; i < flist->count; i++)
+ for (i = flist->low; i <= flist->high; i++)
list_file_entry(flist->files[i]);
}
list_file_entry(flist->files[i]);
}
rprintf(FINFO, "recv_file_list done\n");
stats.flist_size += stats.total_read - start_read;
rprintf(FINFO, "recv_file_list done\n");
stats.flist_size += stats.total_read - start_read;
- stats.num_files += flist->count;
+ stats.num_files += flist->used;
change_local_filter_dir(NULL, 0, 0);
} else {
ndx = NDX_FLIST_OFFSET - ndx;
change_local_filter_dir(NULL, 0, 0);
} else {
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);
}
if (verbose > 3) {
exit_cleanup(RERR_PROTOCOL);
}
if (verbose > 3) {
flist->file_pool = first_flist->file_pool;
flist->ndx_start = first_flist->prev->ndx_start
flist->file_pool = first_flist->file_pool;
flist->ndx_start = first_flist->prev->ndx_start
- + first_flist->prev->count;
+ + first_flist->prev->used;
flist->prev = first_flist->prev;
flist->prev->next = first_flist->prev = flist;
flist->prev = first_flist->prev;
flist->prev->next = first_flist->prev = flist;
flist->next = first_flist;
}
flist->next->prev = flist->prev;
flist->next = first_flist;
}
flist->next->prev = flist->prev;
- file_total -= flist->count;
+ file_total -= flist->used;
- if (flist->count == 0) {
+ if (flist->used == 0) {
- fsort(flist->sorted, flist->count);
+ fsort(flist->sorted, flist->used);
if (!am_sender || inc_recurse) {
if (!am_sender || inc_recurse) {
- for (i = prev_i = 0; i < flist->count; i++) {
+ for (i = prev_i = 0; i < flist->used; i++) {
if (F_IS_ACTIVE(flist->sorted[i])) {
prev_i = i;
break;
if (F_IS_ACTIVE(flist->sorted[i])) {
prev_i = i;
break;
}
flist->low = prev_i;
} else {
}
flist->low = prev_i;
} else {
- i = prev_i = flist->count - 1;
+ i = prev_i = flist->used - 1;
- while (++i < flist->count) {
+ while (++i < flist->used) {
int j;
struct file_struct *file = flist->sorted[i];
int j;
struct file_struct *file = flist->sorted[i];
int i;
rprintf(FINFO, "[%s] flist start=%d, count=%d, low=%d, high=%d\n",
int i;
rprintf(FINFO, "[%s] flist start=%d, count=%d, low=%d, high=%d\n",
- who, flist->ndx_start, flist->count, flist->low, flist->high);
- for (i = 0; i < flist->count; i++) {
+ who, flist->ndx_start, flist->used, flist->low, flist->high);
+ for (i = 0; i < flist->used; i++) {
file = flist->sorted[i];
if ((am_root || am_sender) && uid_ndx) {
snprintf(uidbuf, sizeof uidbuf, " uid=%u",
file = flist->sorted[i];
if ((am_root || am_sender) && uid_ndx) {
snprintf(uidbuf, sizeof uidbuf, " uid=%u",
xfer_dirs = save_xfer_dirs;
recurse = save_recurse;
if (do_progress)
xfer_dirs = save_xfer_dirs;
recurse = save_recurse;
if (do_progress)
- flist_count_offset += dirlist->count;
+ flist_count_offset += dirlist->used;
dirlist->sorted = dirlist->files;
clean_flist(dirlist, 0);
dirlist->sorted = dirlist->files;
clean_flist(dirlist, 0);
dirlist = get_dirlist(fname, dlen, 0);
ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
dirlist = get_dirlist(fname, dlen, 0);
ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
goto done;
if (!(flags & DEL_RECURSE)) {
goto done;
if (!(flags & DEL_RECURSE)) {
/* We do our own recursion, so make delete_item() non-recursive. */
flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY;
/* We do our own recursion, so make delete_item() non-recursive. */
flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY;
- for (j = dirlist->count; j--; ) {
+ for (j = dirlist->used; j--; ) {
struct file_struct *fp = dirlist->files[j];
if (fp->flags & FLAG_MOUNT_DIR) {
struct file_struct *fp = dirlist->files[j];
if (fp->flags & FLAG_MOUNT_DIR) {
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
- for (i = dirlist->count; i--; ) {
+ for (i = dirlist->used; i--; ) {
struct file_struct *fp = dirlist->files[i];
if (!F_IS_ACTIVE(fp))
continue;
struct file_struct *fp = dirlist->files[i];
if (!F_IS_ACTIVE(fp))
continue;
if (dry_run > 1 || list_only)
return;
if (dry_run > 1 || list_only)
return;
- for (j = 0; j < cur_flist->count; j++) {
+ for (j = 0; j < cur_flist->used; j++) {
struct file_struct *file = cur_flist->sorted[j];
if (!(file->flags & FLAG_XFER_DIR))
struct file_struct *file = cur_flist->sorted[j];
if (!(file->flags & FLAG_XFER_DIR))
fname_len = strlen(fname);
fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len);
fname_len = strlen(fname);
fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len);
- for (j = 0; j < dirlist->count; j++) {
+ for (j = 0; j < dirlist->used; j++) {
struct file_struct *fp = dirlist->files[j];
const char *suf, *name;
int len, suf_len;
struct file_struct *fp = dirlist->files[j];
const char *suf, *name;
int len, suf_len;
if (ndx < 0) {
start = 0;
if (ndx < 0) {
start = 0;
- end = flist->count - 1;
} else
start = end = ndx;
} else
start = end = ndx;
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
- if (delete_before && !solo_file && cur_flist->count > 0)
+ if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
deldelay_size = BIGPATHBUFLEN * 4;
do_delete_pass();
if (delete_during == 2) {
deldelay_size = BIGPATHBUFLEN * 4;
int i, ndx_count = 0;
int32 *ndx_list;
int i, ndx_count = 0;
int32 *ndx_list;
- if (!(ndx_list = new_array(int32, cur_flist->count)))
+ if (!(ndx_list = new_array(int32, cur_flist->used)))
out_of_memory("match_hard_links");
out_of_memory("match_hard_links");
- for (i = 0; i < cur_flist->count; i++) {
+ for (i = 0; i < cur_flist->used; i++) {
if (F_IS_HLINKED(cur_flist->sorted[i]))
ndx_list[ndx_count++] = i;
}
if (F_IS_HLINKED(cur_flist->sorted[i]))
ndx_list[ndx_count++] = i;
}
rprintf(FERROR,
"Invalid file index: %d (%d - %d) [%s]\n",
ndx, first_flist->ndx_start,
rprintf(FERROR,
"Invalid file index: %d (%d - %d) [%s]\n",
ndx, first_flist->ndx_start,
- first_flist->prev->ndx_start + first_flist->prev->count - 1,
+ first_flist->prev->ndx_start + first_flist->prev->used - 1,
who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
flist = flist->prev;
}
who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
flist = flist->prev;
}
- while (ndx >= flist->ndx_start + flist->count) {
+ while (ndx >= flist->ndx_start + flist->used) {
if (!(flist = flist->next))
goto invalid_ndx;
}
if (!(flist = flist->next))
goto invalid_ndx;
}
if (protocol_version >= 30)
send_msg(MSG_NOOP, "", 0, 0);
else {
if (protocol_version >= 30)
send_msg(MSG_NOOP, "", 0, 0);
else {
- write_int(sock_f_out, cur_flist->count);
+ write_int(sock_f_out, cur_flist->used);
write_shortint(sock_f_out, ITEM_IS_NEW);
}
}
write_shortint(sock_f_out, ITEM_IS_NEW);
}
}
}
flist = send_file_list(f_out,argc,argv);
}
flist = send_file_list(f_out,argc,argv);
- if (!flist || flist->count == 0)
+ if (!flist || flist->used == 0)
exit_cleanup(0);
io_start_buffering_in(f_in);
exit_cleanup(0);
io_start_buffering_in(f_in);
if (inc_recurse && file_total == 1)
recv_additional_file_list(f_in);
if (inc_recurse && file_total == 1)
recv_additional_file_list(f_in);
- if (flist && flist->count > 0) {
+ if (flist && flist->used > 0) {
local_name = get_local_name(flist, argv[0]);
fix_basis_dirs();
local_name = get_local_name(flist, argv[0]);
fix_basis_dirs();
next_gen_ndx = read_int(fd);
if (next_gen_ndx == -1) {
if (inc_recurse)
next_gen_ndx = read_int(fd);
if (next_gen_ndx == -1) {
if (inc_recurse)
- next_gen_ndx = first_flist->prev->count + first_flist->prev->ndx_start;
+ next_gen_ndx = first_flist->prev->used + first_flist->prev->ndx_start;
- next_gen_ndx = cur_flist->count;
+ next_gen_ndx = cur_flist->used;
int ndx, recv_ok;
if (verbose > 2)
int ndx, recv_ok;
if (verbose > 2)
- rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->count);
+ rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
- delayed_bits = bitbag_create(cur_flist->count + 1);
+ delayed_bits = bitbag_create(cur_flist->used + 1);
updating_basis = inplace;
updating_basis = inplace;
}
if (read_batch && cur_flist) {
int high = inc_recurse
}
if (read_batch && cur_flist) {
int high = inc_recurse
- ? first_flist->prev->count + first_flist->prev->ndx_start
- : cur_flist->count;
+ ? first_flist->prev->used + first_flist->prev->ndx_start
+ : cur_flist->used;
get_next_gen_ndx(batch_gen_fd, next_gen_ndx, high);
next_gen_ndx = -1;
}
get_next_gen_ndx(batch_gen_fd, next_gen_ndx, high);
next_gen_ndx = -1;
}
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);
}
/* 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;
"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;
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;
}
struct file_struct **files, **sorted;
alloc_pool_t file_pool;
void *pool_boundary;
struct file_struct **files, **sorted;
alloc_pool_t file_pool;
void *pool_boundary;
- int count, malloced;
- int low, high; /* 0-relative index values excluding empties */
- int ndx_start; /* the start offset for inc_recurse mode */
+ int used, malloced;
+ int low, high; /* 0-relative index values excluding empties */
+ int ndx_start; /* the start offset for inc_recurse mode */
int parent_ndx; /* dir_flist index of parent directory */
int in_progress, to_redo;
};
int parent_ndx; /* dir_flist index of parent directory */
int in_progress, to_redo;
};
match_acl_ids();
#endif
if (am_root && preserve_uid && !numeric_ids) {
match_acl_ids();
#endif
if (am_root && preserve_uid && !numeric_ids) {
- for (i = 0; i < flist->count; i++)
+ for (i = 0; i < flist->used; i++)
F_OWNER(flist->files[i]) = match_uid(F_OWNER(flist->files[i]));
}
if (preserve_gid && (!am_root || !numeric_ids)) {
F_OWNER(flist->files[i]) = match_uid(F_OWNER(flist->files[i]));
}
if (preserve_gid && (!am_root || !numeric_ids)) {
- for (i = 0; i < flist->count; i++) {
+ for (i = 0; i < flist->used; i++) {
F_GROUP(flist->files[i]) = match_gid(F_GROUP(flist->files[i]),
&flist->files[i]->flags);
}
F_GROUP(flist->files[i]) = match_gid(F_GROUP(flist->files[i]),
&flist->files[i]->flags);
}