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
Changed various token variables from "int"s to "int32"s.
[rsync/rsync.git]
/
token.c
diff --git
a/token.c
b/token.c
index
c7e898c
..
2c660c7
100644
(file)
--- a/
token.c
+++ b/
token.c
@@
-65,11
+65,11
@@
void set_compression(char *fname)
}
/* non-compressing recv token */
}
/* non-compressing recv token */
-static int
simple_recv_token(int f,
char **data)
+static int
32 simple_recv_token(int f,
char **data)
{
{
- static int residue;
+ static int
32
residue;
static char *buf;
static char *buf;
- int n;
+ int
32
n;
if (!buf) {
buf = new_array(char, CHUNK_SIZE);
if (!buf) {
buf = new_array(char, CHUNK_SIZE);
@@
-78,7
+78,7
@@
static int simple_recv_token(int f,char **data)
}
if (residue == 0) {
}
if (residue == 0) {
- int i = read_int(f);
+ int
32
i = read_int(f);
if (i <= 0)
return i;
residue = i;
if (i <= 0)
return i;
residue = i;
@@
-93,22
+93,21
@@
static int simple_recv_token(int f,char **data)
/* non-compressing send token */
/* non-compressing send token */
-static void simple_send_token(int f,
int token
,
-
struct map_struct *buf,OFF_T offset,int
n)
+static void simple_send_token(int f,
int32 token, struct map_struct *buf
,
+
OFF_T offset, int32
n)
{
if (n > 0) {
{
if (n > 0) {
- int
l
= 0;
- while (l < n) {
- int
n1 = MIN(CHUNK_SIZE,n-l
);
- write_int(f,n1);
- write_buf(f,
map_ptr(buf,offset+l,n1),
n1);
- l += n1;
+ int
32 len
= 0;
+ while (l
en
< n) {
+ int
32 n1 = MIN(CHUNK_SIZE, n-len
);
+ write_int(f,
n1);
+ write_buf(f,
map_ptr(buf, offset+len, n1),
n1);
+ l
en
+= n1;
}
}
/* a -2 token means to send data only and no token */
}
}
/* a -2 token means to send data only and no token */
- if (token != -2) {
- write_int(f,-(token+1));
- }
+ if (token != -2)
+ write_int(f, -(token+1));
}
}
@@
-129,9
+128,9
@@
static void simple_send_token(int f,int token,
#define AVAIL_OUT_SIZE(avail_in_size) ((avail_in_size)*1001/1000+16)
/* For coding runs of tokens */
#define AVAIL_OUT_SIZE(avail_in_size) ((avail_in_size)*1001/1000+16)
/* For coding runs of tokens */
-static int last_token = -1;
-static int run_start;
-static int last_run_end;
+static int
32
last_token = -1;
+static int
32
run_start;
+static int
32
last_run_end;
/* Deflation state */
static z_stream tx_strm;
/* Deflation state */
static z_stream tx_strm;
@@
-149,10
+148,10
@@
static char *obuf;
/* Send a deflated token */
static void
/* Send a deflated token */
static void
-send_deflated_token(int f, int
token
,
-
struct map_struct *buf, OFF_T offset, int nb, int
toklen)
+send_deflated_token(int f, int
32 token, struct map_struct *buf, OFF_T offset
,
+
int32 nb, int32
toklen)
{
{
- int n, r;
+ int
32
n, r;
static int init_done, flush_pending;
if (last_token == -1) {
static int init_done, flush_pending;
if (last_token == -1) {
@@
-261,8
+260,8
@@
send_deflated_token(int f, int token,
/* end of file - clean up */
write_byte(f, END_FLAG);
} else if (token != -2) {
/* end of file - clean up */
write_byte(f, END_FLAG);
} else if (token != -2) {
- /*
a
dd the data in the current block to the compressor's
-
history and hash table
*/
+ /*
A
dd the data in the current block to the compressor's
+
* history and hash table.
*/
tx_strm.next_in = (Bytef *) map_ptr(buf, offset, toklen);
tx_strm.avail_in = toklen;
tx_strm.next_out = (Bytef *) obuf;
tx_strm.next_in = (Bytef *) map_ptr(buf, offset, toklen);
tx_strm.avail_in = toklen;
tx_strm.next_out = (Bytef *) obuf;
@@
-286,16
+285,16
@@
static char *cbuf;
static char *dbuf;
/* for decoding runs of tokens */
static char *dbuf;
/* for decoding runs of tokens */
-static int rx_token;
-static int rx_run;
+static int
32
rx_token;
+static int
32
rx_run;
/* Receive a deflated token and inflate it */
/* Receive a deflated token and inflate it */
-static int
-recv_deflated_token(int f, char **data)
+static int32 recv_deflated_token(int f, char **data)
{
{
- int n, r, flag;
static int init_done;
static int init_done;
- static int saved_flag;
+ static int32 saved_flag;
+ int32 n, flag;
+ int r;
for (;;) {
switch (recv_state) {
for (;;) {
switch (recv_state) {
@@
-422,9
+421,10
@@
recv_deflated_token(int f, char **data)
* put the data corresponding to a token that we've just returned
* from recv_deflated_token into the decompressor's history buffer.
*/
* put the data corresponding to a token that we've just returned
* from recv_deflated_token into the decompressor's history buffer.
*/
-static void see_deflate_token(char *buf, int len)
+static void see_deflate_token(char *buf, int
32
len)
{
{
- int r, blklen;
+ int r;
+ int32 blklen;
unsigned char hdr[5];
rx_strm.avail_in = 0;
unsigned char hdr[5];
rx_strm.avail_in = 0;
@@
-465,14
+465,13
@@
static void see_deflate_token(char *buf, int len)
* If token == -1 then we have reached EOF
* If n == 0 then don't send a buffer
*/
* If token == -1 then we have reached EOF
* If n == 0 then don't send a buffer
*/
-void send_token(int f,
int token,struct map_struct *buf,
OFF_T offset,
- int
n,int
toklen)
+void send_token(int f,
int32 token, struct map_struct *buf,
OFF_T offset,
+ int
32 n, int32
toklen)
{
{
- if (!do_compression)
{
- simple_send_token(f,
token,buf,offset,
n);
- } else {
+ if (!do_compression)
+ simple_send_token(f,
token, buf, offset,
n);
+ else
send_deflated_token(f, token, buf, offset, n, toklen);
send_deflated_token(f, token, buf, offset, n, toklen);
- }
}
}
@@
-482,7
+481,7
@@
void send_token(int f,int token,struct map_struct *buf,OFF_T offset,
* if the return value is -i then it represents token i-1
* if the return value is 0 then the end has been reached
*/
* if the return value is -i then it represents token i-1
* if the return value is 0 then the end has been reached
*/
-int
recv_token(int f,
char **data)
+int
32 recv_token(int f,
char **data)
{
int tok;
{
int tok;
@@
-497,7
+496,7
@@
int recv_token(int f,char **data)
/*
* look at the data corresponding to a token, if necessary
*/
/*
* look at the data corresponding to a token, if necessary
*/
-void see_token(char *data, int toklen)
+void see_token(char *data, int
32
toklen)
{
if (do_compression)
see_deflate_token(data, toklen);
{
if (do_compression)
see_deflate_token(data, toklen);