1 files changed, 9 insertions, 8 deletions

diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h
index bce5956..4e33189 100644
--- a/xdelta3/xdelta3-decode.h
+++ b/xdelta3/xdelta3-decode.h
@@ -162,7 +162,7 @@ xd3_decode_allocate (xd3_stream  *stream,
                      uint8_t    **buf_ptr,
                      usize_t      *buf_alloc)
 {
-  IF_DEBUG2 (DP(RINT "[xd3_decode_allocate] size %u alloc %u\n",
+  IF_DEBUG2 (DP(RINT "[xd3_decode_allocate] size %"W"u alloc %"W"u\n",
                 size, *buf_alloc));
   
   if (*buf_ptr != NULL && *buf_alloc < size)
@@ -207,7 +207,7 @@ xd3_decode_section (xd3_stream *stream,
           /* No allocation/copy needed */
           section->buf = stream->next_in;
           sect_take    = section->size;
-          IF_DEBUG1 (DP(RINT "[xd3_decode_section] zerocopy %u @ %u avail %u\n",
+          IF_DEBUG1 (DP(RINT "[xd3_decode_section] zerocopy %"W"u @ %"W"u avail %"W"u\n",
                         sect_take, section->pos, stream->avail_in));
         }
       else
@@ -232,7 +232,7 @@ xd3_decode_section (xd3_stream *stream,
               section->buf = section->copied1;
             }
 
-          IF_DEBUG2 (DP(RINT "[xd3_decode_section] take %u @ %u [need %u] avail %u\n",
+          IF_DEBUG2 (DP(RINT "[xd3_decode_section] take %"W"u @ %"W"u [need %"W"u] avail %"W"u\n",
                         sect_take, section->pos, sect_need, stream->avail_in));
           XD3_ASSERT (section->pos + sect_take <= section->alloc1);
 
@@ -250,7 +250,8 @@ xd3_decode_section (xd3_stream *stream,
 
   if (section->pos < section->size)
     {
-      IF_DEBUG1 (DP(RINT "[xd3_decode_section] further input required %u\n", section->size - section->pos));
+      IF_DEBUG1 (DP(RINT "[xd3_decode_section] further input required %"W"u\n",
+                    section->size - section->pos));
       stream->msg = "further input required";
       return XD3_INPUT;
     }
@@ -772,7 +773,7 @@ xd3_decode_emit (xd3_stream *stream)
 
   if (stream->avail_out != stream->dec_tgtlen)
     {
-      IF_DEBUG2 (DP(RINT "AVAIL_OUT(%d) != DEC_TGTLEN(%d)\n",
+      IF_DEBUG2 (DP(RINT "AVAIL_OUT(%"W"u) != DEC_TGTLEN(%"W"u)\n",
                     stream->avail_out, stream->dec_tgtlen));
       stream->msg = "wrong window length";
       return XD3_INVALID_INPUT;
@@ -1009,7 +1010,7 @@ xd3_decode_input (xd3_stream *stream)
 
         stream->dec_state = DEC_CPYLEN;
 
-        IF_DEBUG2 (DP(RINT "--------- TARGET WINDOW %"Q" -----------\n",
+        IF_DEBUG2 (DP(RINT "--------- TARGET WINDOW %"Q"u -----------\n",
                       stream->current_window));
       }
 
@@ -1168,8 +1169,8 @@ xd3_decode_input (xd3_stream *stream)
           IF_DEBUG2(DP(RINT
                        "[decode_cpyoff] %"Q"u "
                        "cpyblkno %"Q"u "
-                       "cpyblkoff %u "
-                       "blksize %u\n",
+                       "cpyblkoff %"W"u "
+                       "blksize %"W"u\n",
                        stream->dec_cpyoff,
                        src->cpyoff_blocks,
                        src->cpyoff_blkoff,