Make sure printf formats and arguments are consistent for size_t

5 files changed, 10 insertions, 10 deletions

diff --git a/delta.c b/delta.c
index 0a134b1..f50762b 100644
--- a/delta.c
+++ b/delta.c
@@ -340,7 +340,7 @@ inline rs_result rs_appendflush(rs_job_t *job)
         return rs_processmatch(job);
     /* else if last is a miss, emit and process it*/
     } else if (job->scoop_pos) {
-        rs_trace("got %d bytes of literal data", job->scoop_pos);
+        rs_trace("got %ld bytes of literal data", (long) job->scoop_pos);
         rs_emit_literal_cmd(job, job->scoop_pos);
         return rs_processmiss(job);
     }
diff --git a/mksum.c b/mksum.c
index 81ae05e..b6cac1f 100644
--- a/mksum.c
+++ b/mksum.c
@@ -131,7 +131,7 @@ rs_sig_s_generate(rs_job_t *job)
         return result;
     }
 
-    rs_trace("got %d byte block", len);
+    rs_trace("got %ld byte block", (long) len);
 
     return rs_sig_do_block(job, block, len);
 }
diff --git a/rdiff.c b/rdiff.c
index 7fde1f7..249494a 100644
--- a/rdiff.c
+++ b/rdiff.c
@@ -181,14 +181,14 @@ static void rdiff_show_version(void)
     printf("rdiff (%s) [%s]\n"
            "Copyright (C) 1997-2001 by Martin Pool, Andrew Tridgell and others.\n"
            "http://rproxy.samba.org/\n"
-           "Capabilities: %d bit files%s%s%s\n"
+           "Capabilities: %ld bit files%s%s%s\n"
            "\n"
            "librsync comes with NO WARRANTY, to the extent permitted by law.\n"
            "You may redistribute copies of librsync under the terms of the GNU\n"
            "Lesser General Public License.  For more information about these\n"
            "matters, see the files named COPYING.\n",
            rs_librsync_version, RS_CANONICAL_HOST,
-           8 * sizeof(rs_long_t), zlib, bzlib, trace);
+           (long) (8 * sizeof(rs_long_t)), zlib, bzlib, trace);
 }
 
 
diff --git a/scoop.c b/scoop.c
index 56430b3..5baf87a 100644
--- a/scoop.c
+++ b/scoop.c
@@ -136,12 +136,12 @@ void rs_scoop_advance(rs_job_t *job, size_t len)
      * at them all at the same time. */
     if (job->scoop_avail) {
         /* reading from the scoop buffer */
-         rs_trace("advance over %d bytes from scoop", len); 
+         rs_trace("advance over %ld bytes from scoop", (long) len); 
         assert(len <= job->scoop_avail);
         job->scoop_avail -= len;
         job->scoop_next += len;
     } else {
-         rs_trace("advance over %d bytes from input buffer", len); 
+         rs_trace("advance over %ld bytes from input buffer", (long) len); 
         assert(len <= stream->avail_in);
         stream->avail_in -= len;
         stream->next_in += len;
diff --git a/stream.c b/stream.c
index da08eba..23cef6b 100644
--- a/stream.c
+++ b/stream.c
@@ -116,15 +116,15 @@ int rs_buffers_copy(rs_buffers_t *stream, int max_len)
     assert(len > 0);
 
     if ((unsigned) len > stream->avail_in) {
-        rs_trace("copy limited to %d available input bytes",
-                 stream->avail_in);
+        rs_trace("copy limited to %ld available input bytes",
+                 (long) stream->avail_in);
         len = stream->avail_in;
     }
 
 
     if ((unsigned) len > stream->avail_out) {
-        rs_trace("copy limited to %d available output bytes",
-                 stream->avail_out);
+        rs_trace("copy limited to %ld available output bytes",
+                 (long) stream->avail_out);
         len = stream->avail_out;
     }