1 files changed, 11 insertions, 8 deletions

diff --git a/xdelta3/xdelta3-blkcache.h b/xdelta3/xdelta3-blkcache.h
index f8fa8e2..20a2a4a 100644
--- a/xdelta3/xdelta3-blkcache.h
+++ b/xdelta3/xdelta3-blkcache.h
@@ -26,6 +26,9 @@
 typedef struct _main_blklru      main_blklru;
 typedef struct _main_blklru_list main_blklru_list;
 
+
+#define XD3_INVALID_OFFSET XOFF_T_MAX
+
 struct _main_blklru_list
 {
   main_blklru_list  *next;
@@ -125,7 +128,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
   /* Note: The API requires a power-of-two blocksize and srcwinsz
    * (-B).  The logic here will use a single block if the entire file
    * is known to fit into srcwinsz. */
-  option_srcwinsz = xd3_pow2_roundup (option_srcwinsz);
+  option_srcwinsz = xd3_xoff_roundup (option_srcwinsz);
 
   /* Though called "lru", it is not LRU-specific.  We always allocate
    * a maximum number of source block buffers.  If the entire file
@@ -153,7 +156,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
    * is the point at which external decompression may begin.  Set the
    * system for a single block. */
   lru_size = 1;
-  lru[0].blkno = (xoff_t) -1;
+  lru[0].blkno = XD3_INVALID_OFFSET;
   blksize = option_srcwinsz;
   main_blklru_list_push_back (& lru_list, & lru[0]);
   XD3_ASSERT (blksize != 0);
@@ -162,7 +165,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
   source->blksize  = blksize;
   source->name     = sfile->filename;
   source->ioh      = sfile;
-  source->curblkno = (xoff_t) -1;
+  source->curblkno = XD3_INVALID_OFFSET;
   source->curblk   = NULL;
   source->max_winsize = option_srcwinsz;
 
@@ -258,7 +261,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
 
       if (option_verbose > 1)
         {
-          short_sprintf (nbufs, " #bufs %u", lru_size);
+          short_sprintf (nbufs, " #bufs %"W"u", lru_size);
         }
 
       XPR(NT "source %s %s blksize %s window %s%s%s\n",
@@ -293,7 +296,7 @@ main_getblk_lru (xd3_source *source, xoff_t blkno,
           return 0;
         }
       /* No going backwards in a sequential scan. */
-      if (blru->blkno != (xoff_t) -1 && blru->blkno > blkno)
+      if (blru->blkno != XD3_INVALID_OFFSET && blru->blkno > blkno)
         {
           return XD3_TOOFARBACK;
         }
@@ -333,7 +336,7 @@ main_getblk_lru (xd3_source *source, xoff_t blkno,
   lru_filled += 1;
   (*is_new) = 1;
   (*blrup) = blru;
-  blru->blkno = -1;
+  blru->blkno = XD3_INVALID_OFFSET;
   return 0;
 }
 
@@ -443,7 +446,7 @@ main_read_seek_source (xd3_stream *stream,
           sfile->source_position += nread;
           blru->size = nread;
 
-          IF_DEBUG1 (DP(RINT "[getblk] skip blkno %"Q"u size %u\n",
+          IF_DEBUG1 (DP(RINT "[getblk] skip blkno %"Q" size %u\n",
                         skip_blkno, blru->size));
 
           XD3_ASSERT (sfile->source_position <= pos);
@@ -524,7 +527,7 @@ main_getblk_func (xd3_stream *stream,
 
   if (option_verbose > 3)
     {
-      if (blru->blkno != (xoff_t)-1)
+      if (blru->blkno != XD3_INVALID_OFFSET)
         {
           if (blru->blkno != blkno)
             {