3 files changed, 16 insertions, 11 deletions

diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 6647cbf..e400d8d 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -474,7 +474,7 @@ test_decode_integer_end_of_input (xd3_stream *stream, int unused)
     { \
       const uint8_t *max; \
       const uint8_t *inp; \
-      TYPE val; \
+      TYPE val;                 \
  \
       DOT (); \
       rbuf->next = 0; \
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index b047a3c..1800c90 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -1760,7 +1760,7 @@ xd3_emit_bytes (xd3_stream     *stream,
 #define DECODE_INTEGER_TYPE(PART,OFLOW)                                \
   while (stream->avail_in != 0)                                        \
     {                                                                  \
-      usize_t next = stream->next_in[0];                                  \
+      usize_t next = stream->next_in[0];                               \
                                                                        \
       DECODE_INPUT(1);                                                 \
                                                                        \
@@ -1786,7 +1786,7 @@ xd3_emit_bytes (xd3_stream     *stream,
 #define READ_INTEGER_TYPE(TYPE, OFLOW)                                 \
   TYPE val = 0;                                                        \
   const uint8_t *inp = (*inpp);                                        \
-  usize_t next;                                                           \
+  usize_t next;                                                        \
                                                                        \
   do                                                                   \
     {                                                                  \
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 0d18c93..4d04b49 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -550,8 +550,8 @@ struct _xd3_dinst
 struct _xd3_hinst
 {
   uint8_t     type;
-  usize_t     size;
-  usize_t     addr;
+  uint32_t    size;  /* TODO: why decode breaks if this is usize_t? */
+  uint32_t    addr;  /* TODO: why decode breaks if this is usize_t? */
 };
 
 /* the form of a whole-file instruction */
@@ -577,7 +577,7 @@ struct _xd3_desect
 {
   const uint8_t *buf;
   const uint8_t *buf_max;
-  usize_t       size;
+  uint32_t       size;  /* TODO: why decode breaks if this is usize_t? */
   usize_t        pos;
 
   /* used in xdelta3-decode.h */
@@ -857,11 +857,13 @@ struct _xd3_stream
 
   usize_t           dec_secondid;     /* Optional secondary compressor ID. */
 
-  usize_t           dec_codetblsz;    /* Optional code table: length. */
+  /* TODO: why decode breaks if this is usize_t? */
+  uint32_t          dec_codetblsz;    /* Optional code table: length. */
   uint8_t          *dec_codetbl;      /* Optional code table: storage. */
   usize_t           dec_codetblbytes; /* Optional code table: position. */
 
-  usize_t          dec_appheadsz;    /* Optional application header:
+  /* TODO: why decode breaks if this is usize_t? */
+  uint32_t          dec_appheadsz;    /* Optional application header:
                                          size. */
   uint8_t          *dec_appheader;    /* Optional application header:
                                          storage */
@@ -872,12 +874,15 @@ struct _xd3_stream
   uint8_t           dec_cksum[4];     /* Optional checksum: storage. */
   uint32_t          dec_adler32;      /* Optional checksum: value. */
 
-  usize_t           dec_cpylen;       /* length of copy window
+  /* TODO: why decode breaks if this is usize_t? */
+  uint32_t           dec_cpylen;       /* length of copy window
                                           (VCD_SOURCE or VCD_TARGET) */
   xoff_t             dec_cpyoff;       /* offset of copy window
                                           (VCD_SOURCE or VCD_TARGET) */
-  usize_t           dec_enclen;       /* length of delta encoding */
-  usize_t           dec_tgtlen;       /* length of target window */
+  /* TODO: why decode breaks if this is usize_t? */
+  uint32_t           dec_enclen;       /* length of delta encoding */
+  /* TODO: why decode breaks if this is usize_t? */
+  uint32_t           dec_tgtlen;       /* length of target window */
 
 #if USE_UINT64
   uint64_t          dec_64part;       /* part of a decoded uint64_t */