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
Mentioned new --keep-dirlinks option.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
9aa8850
..
6f20e83
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-282,7
+282,7
@@
static int flist_dir_len;
**/
void flist_expand(struct file_list *flist)
{
**/
void flist_expand(struct file_list *flist)
{
-
void
*new_ptr;
+
struct file_struct *
*new_ptr;
if (flist->count < flist->malloced)
return;
if (flist->count < flist->malloced)
return;
@@
-301,12
+301,8
@@
void flist_expand(struct file_list *flist)
if (flist->malloced < flist->count)
flist->malloced = flist->count;
if (flist->malloced < flist->count)
flist->malloced = flist->count;
- if (flist->files) {
- new_ptr = realloc_array(flist->files,
- struct file_struct *, flist->malloced);
- } else {
- new_ptr = new_array(struct file_struct *, flist->malloced);
- }
+ new_ptr = realloc_array(flist->files, struct file_struct *,
+ flist->malloced);
if (verbose >= 2) {
rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
if (verbose >= 2) {
rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
@@
-315,7
+311,7
@@
void flist_expand(struct file_list *flist)
(new_ptr == flist->files) ? " not" : "");
}
(new_ptr == flist->files) ? " not" : "");
}
- flist->files =
(struct file_struct **)
new_ptr;
+ flist->files = new_ptr;
if (!flist->files)
out_of_memory("flist_expand");
if (!flist->files)
out_of_memory("flist_expand");
@@
-332,7
+328,7
@@
void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
static uid_t uid;
static gid_t gid;
static char lastname[MAXPATHLEN];
static uid_t uid;
static gid_t gid;
static char lastname[MAXPATHLEN];
- char
*fname, fbuf
[MAXPATHLEN];
+ char
fname
[MAXPATHLEN];
int l1, l2;
if (f == -1)
int l1, l2;
if (f == -1)
@@
-350,7
+346,7
@@
void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
io_write_phase = "send_file_entry";
io_write_phase = "send_file_entry";
- f
name = f_name_to(file, fbuf
);
+ f
_name_to(file, fname
);
flags = base_flags;
flags = base_flags;