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:
446e239
)
Some name tweaks.
author
Wayne Davison
<wayned@samba.org>
Fri, 2 Jan 2004 08:19:26 +0000
(08:19 +0000)
committer
Wayne Davison
<wayned@samba.org>
Fri, 2 Jan 2004 08:19:26 +0000
(08:19 +0000)
generator.c
patch
|
blob
|
blame
|
history
diff --git
a/generator.c
b/generator.c
index
0e51def
..
fd2ac59
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-270,7
+270,7
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
{
int fd;
STRUCT_STAT st;
{
int fd;
STRUCT_STAT st;
- struct map_struct *buf;
+ struct map_struct *
map
buf;
int statret;
struct file_struct *file = flist->files[i];
char *fnamecmp;
int statret;
struct file_struct *file = flist->files[i];
char *fnamecmp;
@@
-506,11
+506,10
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
return;
}
return;
}
- if (st.st_size > 0) {
- buf = map_file(fd,st.st_size);
- } else {
- buf = NULL;
- }
+ if (st.st_size > 0)
+ mapbuf = map_file(fd,st.st_size);
+ else
+ mapbuf = NULL;
if (verbose > 3)
rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
if (verbose > 3)
rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
@@
-519,10
+518,10
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
rprintf(FINFO, "generating and sending sums for %d\n", i);
write_int(f_out,i);
rprintf(FINFO, "generating and sending sums for %d\n", i);
write_int(f_out,i);
- generate_and_send_sums(buf, st.st_size, f_out);
+ generate_and_send_sums(
map
buf, st.st_size, f_out);
close(fd);
close(fd);
- if (
buf) unmap_file(
buf);
+ if (
mapbuf) unmap_file(map
buf);
}
}
@@
-531,7
+530,7
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
{
int i;
int phase=0;
{
int i;
int phase=0;
- char buf[MAXPATHLEN];
+ char
f
buf[MAXPATHLEN];
if (verbose > 2)
rprintf(FINFO,"generator starting pid=%d count=%d\n",
if (verbose > 2)
rprintf(FINFO,"generator starting pid=%d count=%d\n",
@@
-564,7
+563,7
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
}
recv_generator(local_name? local_name
}
recv_generator(local_name? local_name
- : f_name_to(file,
buf, sizeof
buf), flist, i, f);
+ : f_name_to(file,
fbuf,sizeof f
buf), flist, i, f);
file->mode = saved_mode;
}
file->mode = saved_mode;
}
@@
-583,7
+582,7
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
for (i = read_int(f_recv); i != -1; i = read_int(f_recv)) {
struct file_struct *file = flist->files[i];
recv_generator(local_name? local_name
for (i = read_int(f_recv); i != -1; i = read_int(f_recv)) {
struct file_struct *file = flist->files[i];
recv_generator(local_name? local_name
- : f_name_to(file,
buf, sizeof
buf), flist, i, f);
+ : f_name_to(file,
fbuf,sizeof f
buf), flist, i, f);
}
phase++;
}
phase++;