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
rpm is fussy about changelog formats
[rsync/rsync.git]
/
token.c
diff --git
a/token.c
b/token.c
index
1aa107c
..
a377b29
100644
(file)
--- a/
token.c
+++ b/
token.c
@@
-26,8
+26,8
@@
extern int do_compression;
/* non-compressing recv token */
static int simple_recv_token(int f,char **data)
{
/* non-compressing recv token */
static int simple_recv_token(int f,char **data)
{
- static int residue
= 0
;
- static char *buf
= NULL
;
+ static int residue;
+ static char *buf;
int n;
if (!buf) {
int n;
if (!buf) {
@@
-99,7
+99,7
@@
static int last_run_end;
static z_stream tx_strm;
/* Output buffer */
static z_stream tx_strm;
/* Output buffer */
-static char *obuf
= NULL
;
+static char *obuf;
/* Send a deflated token */
static void
/* Send a deflated token */
static void
@@
-117,7
+117,7
@@
send_deflated_token(int f, int token,
tx_strm.zfree = z_free;
if (deflateInit2(&tx_strm, Z_DEFAULT_COMPRESSION, 8,
-15, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
tx_strm.zfree = z_free;
if (deflateInit2(&tx_strm, Z_DEFAULT_COMPRESSION, 8,
-15, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
-
f
printf(FERROR, "compression init failed\n");
+
r
printf(FERROR, "compression init failed\n");
exit_cleanup(1);
}
if ((obuf = malloc(MAX_DATA_COUNT+2)) == NULL)
exit_cleanup(1);
}
if ((obuf = malloc(MAX_DATA_COUNT+2)) == NULL)
@@
-168,7
+168,7
@@
send_deflated_token(int f, int token,
}
r = deflate(&tx_strm, nb? Z_NO_FLUSH: Z_PACKET_FLUSH);
if (r != Z_OK) {
}
r = deflate(&tx_strm, nb? Z_NO_FLUSH: Z_PACKET_FLUSH);
if (r != Z_OK) {
-
f
printf(FERROR, "deflate returned %d\n", r);
+
r
printf(FERROR, "deflate returned %d\n", r);
exit_cleanup(1);
}
if (nb == 0 || tx_strm.avail_out == 0) {
exit_cleanup(1);
}
if (nb == 0 || tx_strm.avail_out == 0) {
@@
-191,7
+191,7
@@
send_deflated_token(int f, int token,
tx_strm.avail_out = 2 * toklen;
r = deflate(&tx_strm, Z_INSERT_ONLY);
if (r != Z_OK || tx_strm.avail_in != 0) {
tx_strm.avail_out = 2 * toklen;
r = deflate(&tx_strm, Z_INSERT_ONLY);
if (r != Z_OK || tx_strm.avail_in != 0) {
-
f
printf(FERROR, "deflate on token returned %d (%d bytes left)\n",
+
r
printf(FERROR, "deflate on token returned %d (%d bytes left)\n",
r, tx_strm.avail_in);
exit_cleanup(1);
}
r, tx_strm.avail_in);
exit_cleanup(1);
}
@@
-220,8
+220,8
@@
static int
recv_deflated_token(int f, char **data)
{
int n, r, flag;
recv_deflated_token(int f, char **data)
{
int n, r, flag;
- static int init_done
= 0
;
- static int saved_flag
= 0
;
+ static int init_done;
+ static int saved_flag;
for (;;) {
switch (recv_state) {
for (;;) {
switch (recv_state) {
@@
-231,7
+231,7
@@
recv_deflated_token(int f, char **data)
rx_strm.zalloc = z_alloc;
rx_strm.zfree = z_free;
if (inflateInit2(&rx_strm, -15) != Z_OK) {
rx_strm.zalloc = z_alloc;
rx_strm.zfree = z_free;
if (inflateInit2(&rx_strm, -15) != Z_OK) {
-
f
printf(FERROR, "inflate init failed\n");
+
r
printf(FERROR, "inflate init failed\n");
exit_cleanup(1);
}
if ((cbuf = malloc(MAX_DATA_COUNT)) == NULL
exit_cleanup(1);
}
if ((cbuf = malloc(MAX_DATA_COUNT)) == NULL
@@
-268,7
+268,7
@@
recv_deflated_token(int f, char **data)
r = inflate(&rx_strm, Z_PACKET_FLUSH);
n = CHUNK_SIZE - rx_strm.avail_out;
if (r != Z_OK) {
r = inflate(&rx_strm, Z_PACKET_FLUSH);
n = CHUNK_SIZE - rx_strm.avail_out;
if (r != Z_OK) {
-
f
printf(FERROR, "inflate flush returned %d (%d bytes)\n",
+
r
printf(FERROR, "inflate flush returned %d (%d bytes)\n",
r, n);
exit_cleanup(1);
}
r, n);
exit_cleanup(1);
}
@@
-308,7
+308,7
@@
recv_deflated_token(int f, char **data)
r = inflate(&rx_strm, Z_NO_FLUSH);
n = CHUNK_SIZE - rx_strm.avail_out;
if (r != Z_OK) {
r = inflate(&rx_strm, Z_NO_FLUSH);
n = CHUNK_SIZE - rx_strm.avail_out;
if (r != Z_OK) {
-
f
printf(FERROR, "inflate returned %d (%d bytes)\n", r, n);
+
r
printf(FERROR, "inflate returned %d (%d bytes)\n", r, n);
exit_cleanup(1);
}
if (rx_strm.avail_in == 0)
exit_cleanup(1);
}
if (rx_strm.avail_in == 0)
@@
-341,7
+341,7
@@
see_deflate_token(char *buf, int len)
rx_strm.avail_in = len;
r = inflateIncomp(&rx_strm);
if (r != Z_OK) {
rx_strm.avail_in = len;
r = inflateIncomp(&rx_strm);
if (r != Z_OK) {
-
f
printf(FERROR, "inflateIncomp returned %d\n", r);
+
r
printf(FERROR, "inflateIncomp returned %d\n", r);
exit_cleanup(1);
}
}
exit_cleanup(1);
}
}