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
Reversing the order of maybe_emit_filelist_progress() and
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
2e0e787
..
151ae87
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-84,16
+84,16
@@
static void start_filelist_progress(char *kind)
}
}
-static void
maybe_
emit_filelist_progress(const struct file_list *flist)
+static void emit_filelist_progress(const struct file_list *flist)
{
{
- if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
- emit_filelist_progress(flist);
+ rprintf(FINFO, " %d files...\r", flist->count);
}
}
-static void emit_filelist_progress(const struct file_list *flist)
+static void
maybe_
emit_filelist_progress(const struct file_list *flist)
{
{
- rprintf(FINFO, " %d files...\r", flist->count);
+ if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
+ emit_filelist_progress(flist);
}
}
@@
-301,7
+301,10
@@
static void flist_expand(struct file_list *flist)
new_bytes = sizeof(flist->files[0]) * flist->malloced;
new_bytes = sizeof(flist->files[0]) * flist->malloced;
- new_ptr = realloc(flist->files, new_bytes);
+ if (flist->files)
+ new_ptr = realloc(flist->files, new_bytes);
+ else
+ new_ptr = malloc(new_bytes);
if (verbose >= 2) {
rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
if (verbose >= 2) {
rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",