From b5e039d536cbf750269eb5811076f613e9ee5980 Mon Sep 17 00:00:00 2001 From: Josh MacDonald Date: Sat, 26 Dec 2015 21:49:49 -0800 Subject: Unused did_seek var --- xdelta3/xdelta3-blkcache.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xdelta3/xdelta3-blkcache.h b/xdelta3/xdelta3-blkcache.h index 2102a58..f8fa8e2 100644 --- a/xdelta3/xdelta3-blkcache.h +++ b/xdelta3/xdelta3-blkcache.h @@ -471,7 +471,6 @@ main_getblk_func (xd3_stream *stream, main_file *sfile = (main_file*) source->ioh; main_blklru *blru; int is_new; - int did_seek = 0; size_t nread = 0; if (allow_fake_source) @@ -508,10 +507,6 @@ main_getblk_func (xd3_stream *stream, { return ret; } - - /* Indicates that another call to main_getblk_lru() may be - * needed */ - did_seek = 1; } XD3_ASSERT (sfile->source_position == pos); -- cgit v1.2.3 From 9a76ffd0fa6041a28a17748614d01dcd392a8de7 Mon Sep 17 00:00:00 2001 From: Josh MacDonald Date: Sat, 26 Dec 2015 22:00:07 -0800 Subject: Restore 2 block advancement (arbitrary) --- xdelta3/xdelta3.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c index adb1507..976b219 100644 --- a/xdelta3/xdelta3.c +++ b/xdelta3/xdelta3.c @@ -4398,11 +4398,10 @@ xd3_srcwin_move_point (xd3_stream *stream, usize_t *next_move_point) /* TODO: The addition of 2 blocks here is arbitrary. Do a * better job of stream alignment based on observed source copy * addresses, and when both input sizes are known, the - * difference in size. - */ + * difference in size. */ target_cksum_pos = absolute_input_pos + stream->src->max_winsize / 2 + - /*stream->src->blksize * 2*/; + stream->src->blksize * 2; target_cksum_pos &= ~stream->src->maskby; } -- cgit v1.2.3