Imported Upstream version 2.28.0

[platform/upstream/git.git] / vcs-svn / sliding_window.c

diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
index ec2707c..06d273c 100644 (file)
--- a/vcs-svn/sliding_window.c
+++ b/vcs-svn/sliding_window.c
@@ -12,7 +12,7 @@ static int input_error(struct line_buffer *file)
 {
        if (!buffer_ferror(file))
                return error("delta preimage ends early");
-       return error("cannot read delta preimage: %s", strerror(errno));
+       return error_errno("cannot read delta preimage");
 }
 
 static int skip_or_whine(struct line_buffer *file, off_t gap)
@@ -54,7 +54,7 @@ int move_window(struct sliding_view *view, off_t off, size_t width)
                return -1;
        if (off < view->off || off + width < view->off + view->width)
                return error("invalid delta: window slides left");
-       if (view->max_off >= 0 && view->max_off < off + width)
+       if (view->max_off >= 0 && view->max_off < off + (off_t) width)
                return error("delta preimage ends early");
 
        file_offset = view->off + view->buf.len;