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
The debug output for add_exclude() now needs to limit the pattern to
[rsync/rsync.git]
/
token.c
diff --git
a/token.c
b/token.c
index
8f498f1
..
da3a85b
100644
(file)
--- a/
token.c
+++ b/
token.c
@@
-68,7
+68,7
@@
static int simple_recv_token(int f,char **data)
int n;
if (!buf) {
int n;
if (!buf) {
- buf =
(char *)malloc(
CHUNK_SIZE);
+ buf =
new_array(char,
CHUNK_SIZE);
if (!buf) out_of_memory("simple_recv_token");
}
if (!buf) out_of_memory("simple_recv_token");
}
@@
-174,7
+174,7
@@
send_deflated_token(int f, int token,
rprintf(FERROR, "compression init failed\n");
exit_cleanup(RERR_STREAMIO);
}
rprintf(FERROR, "compression init failed\n");
exit_cleanup(RERR_STREAMIO);
}
- if ((obuf =
malloc(
OBUF_SIZE)) == NULL)
+ if ((obuf =
new_array(char,
OBUF_SIZE)) == NULL)
out_of_memory("send_deflated_token");
init_done = 1;
} else
out_of_memory("send_deflated_token");
init_done = 1;
} else
@@
-202,7
+202,7
@@
send_deflated_token(int f, int token,
write_int(f, run_start);
if (write_batch) {
temp_byte = (char)(n==0? TOKEN_LONG: TOKENRUN_LONG);
write_int(f, run_start);
if (write_batch) {
temp_byte = (char)(n==0? TOKEN_LONG: TOKENRUN_LONG);
- write_batch_delta_file(&temp_byte,sizeof(
temp_byte
));
+ write_batch_delta_file(&temp_byte,sizeof(
char
));
write_batch_delta_file((char *)&run_start,sizeof(run_start));
}
}
write_batch_delta_file((char *)&run_start,sizeof(run_start));
}
}
@@
-210,9
+210,10
@@
send_deflated_token(int f, int token,
write_byte(f, n);
write_byte(f, n >> 8);
if (write_batch) {
write_byte(f, n);
write_byte(f, n >> 8);
if (write_batch) {
- write_batch_delta_file((char *)&n,sizeof(char));
+ temp_byte = (char)n;
+ write_batch_delta_file(&temp_byte,sizeof(char));
temp_byte = (char)(n >> 8);
temp_byte = (char)(n >> 8);
- write_batch_delta_file(&temp_byte,sizeof(
temp_byte
));
+ write_batch_delta_file(&temp_byte,sizeof(
char
));
}
}
last_run_end = last_token;
}
}
last_run_end = last_token;
@@
-285,7
+286,7
@@
send_deflated_token(int f, int token,
write_byte(f, END_FLAG);
if (write_batch) {
temp_byte = END_FLAG;
write_byte(f, END_FLAG);
if (write_batch) {
temp_byte = END_FLAG;
- write_batch_delta_file(
(char *)&temp_byte,sizeof(temp_byte
));
+ write_batch_delta_file(
&temp_byte,sizeof(char
));
}
} else if (token != -2) {
}
} else if (token != -2) {
@@
-336,8
+337,8
@@
recv_deflated_token(int f, char **data)
rprintf(FERROR, "inflate init failed\n");
exit_cleanup(RERR_STREAMIO);
}
rprintf(FERROR, "inflate init failed\n");
exit_cleanup(RERR_STREAMIO);
}
- if (
(cbuf = malloc(MAX_DATA_COUNT)) == NULL
- ||
(dbuf = malloc(AVAIL_OUT_SIZE(CHUNK_SIZE))) == NULL
)
+ if (
!(cbuf = new_array(char, MAX_DATA_COUNT))
+ ||
!(dbuf = new_array(char, AVAIL_OUT_SIZE(CHUNK_SIZE)))
)
out_of_memory("recv_deflated_token");
init_done = 1;
} else {
out_of_memory("recv_deflated_token");
init_done = 1;
} else {