X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b8d4524b4f8c0080ed34b59d90d8345d5c84916b..7796395a0aaa485ef4aa6e2dea1023ee3a273d36:/token.c

diff --git a/token.c b/token.c
index 38bedd61..29978ce8 100644
--- 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)
 {
-  static int residue = 0;
-  static char *buf = NULL;
+  static int residue;
+  static char *buf;
   int n;
 
   if (!buf) {
@@ -99,7 +99,7 @@ static int last_run_end;
 static z_stream tx_strm;
 
 /* Output buffer */
-static char *obuf = NULL;
+static char *obuf;
 
 /* Send a deflated token */
 static void
@@ -157,13 +157,13 @@ send_deflated_token(int f, int token,
 	    if (tx_strm.avail_in == 0 && nb != 0) {
 		/* give it some more input */
 		n = MIN(nb, CHUNK_SIZE);
-		tx_strm.next_in = map_ptr(buf, offset, n);
+		tx_strm.next_in = (Bytef *)map_ptr(buf, offset, n);
 		tx_strm.avail_in = n;
 		nb -= n;
 		offset += n;
 	    }
 	    if (tx_strm.avail_out == 0) {
-		tx_strm.next_out = obuf + 2;
+		tx_strm.next_out = (Bytef *)(obuf + 2);
 		tx_strm.avail_out = MAX_DATA_COUNT;
 	    }
 	    r = deflate(&tx_strm, nb? Z_NO_FLUSH: Z_PACKET_FLUSH);
@@ -185,7 +185,7 @@ send_deflated_token(int f, int token,
     if (token != -1) {
 	/* add the data in the current block to the compressor's
 	   history and hash table */
-	tx_strm.next_in = map_ptr(buf, offset, toklen);
+	tx_strm.next_in = (Bytef *)map_ptr(buf, offset, toklen);
 	tx_strm.avail_in = toklen;
 	tx_strm.next_out = NULL;
 	tx_strm.avail_out = 2 * toklen;
@@ -220,8 +220,8 @@ static int
 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) {
@@ -255,7 +255,7 @@ recv_deflated_token(int f, char **data)
 	    if ((flag & 0xC0) == DEFLATED_DATA) {
 		n = ((flag & 0x3f) << 8) + read_byte(f);
 		read_buf(f, cbuf, n);
-		rx_strm.next_in = cbuf;
+		rx_strm.next_in = (Bytef *)cbuf;
 		rx_strm.avail_in = n;
 		recv_state = r_inflating;
 		break;
@@ -263,7 +263,7 @@ recv_deflated_token(int f, char **data)
 	    if (recv_state == r_inflated) {
 		/* check previous inflated stuff ended correctly */
 		rx_strm.avail_in = 0;
-		rx_strm.next_out = dbuf;
+		rx_strm.next_out = (Bytef *)dbuf;
 		rx_strm.avail_out = CHUNK_SIZE;
 		r = inflate(&rx_strm, Z_PACKET_FLUSH);
 		n = CHUNK_SIZE - rx_strm.avail_out;
@@ -303,7 +303,7 @@ recv_deflated_token(int f, char **data)
 	    return -1 - rx_token;
 
 	case r_inflating:
-	    rx_strm.next_out = dbuf;
+	    rx_strm.next_out = (Bytef *)dbuf;
 	    rx_strm.avail_out = CHUNK_SIZE;
 	    r = inflate(&rx_strm, Z_NO_FLUSH);
 	    n = CHUNK_SIZE - rx_strm.avail_out;
@@ -337,7 +337,7 @@ see_deflate_token(char *buf, int len)
 {
     int r;
 
-    rx_strm.next_in = buf;
+    rx_strm.next_in = (Bytef *)buf;
     rx_strm.avail_in = len;
     r = inflateIncomp(&rx_strm);
     if (r != Z_OK) {