Eliminates xd3_source->size, which is an _API Change_. Adds a new requirement, that

source->blocksize be a power-of-2.  DOES NOT PASS ALL TESTS.

1 files changed, 9 insertions, 38 deletions

diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 9ee90d6..15b53a6 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -341,9 +341,8 @@ typedef enum {
   XD3_INTERNAL   = -17710, /* internal error */
   XD3_INVALID    = -17711, /* invalid config */
   XD3_INVALID_INPUT = -17712, /* invalid input/decoder error */
-  XD3_NOSECOND  = -17713, /* when secondary compression finds no
-                             improvement. */
-
+  XD3_NOSECOND    = -17713, /* when secondary compression finds no
+                               improvement. */
 } xd3_rvalues;
 
 /* special values in config->flags */
@@ -717,7 +716,6 @@ struct _xd3_config
 struct _xd3_source
 {
   /* you set */
-  xoff_t              size;          /* size of this source */
   usize_t             blksize;       /* block size */
   const char         *name;          /* its name, for debug/print
                                         purposes */
@@ -727,8 +725,8 @@ struct _xd3_source
   xoff_t              curblkno;      /* current block number: client
                                         sets after getblk request */
   usize_t             onblk;         /* number of bytes on current
-                                        block: client sets, xd3
-                                        verifies */
+                                        block: client sets,  must be >= 0
+                                        and <= blksize */
   const uint8_t      *curblk;        /* current block array: client
                                         sets after getblk request */
 
@@ -736,9 +734,6 @@ struct _xd3_source
   usize_t             srclen;        /* length of this source window */
   xoff_t              srcbase;       /* offset of this source window
                                         in the source itself */
-  xoff_t              blocks;        /* the total number of blocks in
-                                        this source */
-  usize_t             onlastblk;     /* cached size info, avoid __udivdi3 */
   int                 shiftby;       /* for power-of-two blocksizes */
   int                 maskby;        /* for power-of-two blocksizes */  
   xoff_t              cpyoff_blocks; /* offset of dec_cpyoff in blocks */
@@ -746,6 +741,11 @@ struct _xd3_source
                                         blocks, remainder */
   xoff_t              getblkno;      /* request block number: xd3 sets
                                         current getblk request */
+
+  xoff_t              max_blkno;
+  xoff_t              frontier_blkno;
+  usize_t             onlastblk;
+  int                 eof_known;
 };
 
 /* The primary xd3_stream object, used for encoding and decoding.  You
@@ -1292,33 +1292,4 @@ void xd3_blksize_div (const xoff_t offset,
     (offset - *blkno * source->blksize);
 }
 
-/* This function tells the number of bytes expected to be set in
- * source->onblk after a getblk request.  This is for convenience of
- * handling a partial last block.  Note that this is a relatively
- * expensive function for 64-bit binaries on platforms w/o native
- * 64-bit integers, so source->onlastblk is set to this value.
- * TODO: force source->blksize to a power of two? */
-static inline
-usize_t xd3_bytes_on_srcblk (xd3_source *source, xoff_t blkno)
-{
-  xoff_t s_1_div;
-  usize_t s_1_rem;
-  XD3_ASSERT (blkno < source->blocks);
-
-  if (blkno != source->blocks - 1)
-    {
-      return source->blksize;
-    }
-  xd3_blksize_div(source->size - 1, source, &s_1_div, &s_1_rem);
-  return s_1_rem + 1;
-}
-
-static inline
-usize_t xd3_bytes_on_srcblk_fast (xd3_source *source, xoff_t blkno)
-{
-  return (blkno == source->blocks - 1 ?
-          source->onlastblk :
-          source->blksize);
-}
-
 #endif /* _XDELTA3_H_ */