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
Merge modified --with-rsh patch: we now determine the default
[rsync/rsync.git]
/
batch.c
diff --git
a/batch.c
b/batch.c
index
912bb69
..
a470710
100644
(file)
--- a/
batch.c
+++ b/
batch.c
@@
-354,7
+354,7
@@
void read_batch_flist_info(struct file_struct **fptr)
}
}
}
}
-void write_batch_csums_file(
char
*buff, int bytes_to_write)
+void write_batch_csums_file(
void
*buff, int bytes_to_write)
{
static int fdb_open = 1;
{
static int fdb_open = 1;
@@
-395,7
+395,7
@@
void close_batch_csums_file()
void write_batch_csum_info(int *flist_entry, int flist_count,
struct sum_struct *s)
{
void write_batch_csum_info(int *flist_entry, int flist_count,
struct sum_struct *s)
{
-
in
t i;
+
size_
t i;
unsigned int int_zero = 0;
extern int csum_length;
unsigned int int_zero = 0;
extern int csum_length;
@@
-404,16
+404,15
@@
void write_batch_csum_info(int *flist_entry, int flist_count,
/* Write csum info to batch file */
/* FIXME: This will break if s->count is ever not exactly an int. */
/* Write csum info to batch file */
/* FIXME: This will break if s->count is ever not exactly an int. */
- write_batch_csums_file(
(char *)
flist_entry, sizeof(int));
+ write_batch_csums_file(flist_entry, sizeof(int));
if (s)
if (s)
- write_batch_csums_file(
(char *)
&s->count, sizeof(int));
+ write_batch_csums_file(&s->count, sizeof(int));
else
else
- write_batch_csums_file(
(char *)
&int_zero, sizeof (int));
+ write_batch_csums_file(&int_zero, sizeof (int));
if (s) {
for (i = 0; i < s->count; i++) {
if (s) {
for (i = 0; i < s->count; i++) {
- write_batch_csums_file((char *) &s->sums[i].sum1,
- sizeof(uint32));
+ write_batch_csums_file(&s->sums[i].sum1, sizeof(uint32));
if ((*flist_entry == flist_count - 1)
&& (i == s->count - 1)) {
fdb_close = 1;
if ((*flist_entry == flist_count - 1)
&& (i == s->count - 1)) {
fdb_close = 1;