From: Jonathan Nieder Date: Mon, 11 Oct 2010 02:46:24 +0000 (-0500) Subject: vcs-svn: improve support for reading large files X-Git-Tag: v1.7.5-rc0~46^2~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/93b709c79eea6231b7d75a6817245a416b4f8fb5 vcs-svn: improve support for reading large files Move from uint32_t to off_t as the fundamental unit of length used by the line_buffer library. Performance would get worse if anything but I think it's worth it for support of deltas that need to skip large pieces (> 4 GiB). Exception: buffer_read_string still takes a uint32_t, since it keeps its result in an in-core obj_pool. Callers still have to be updated to take advantage of this. Signed-off-by: Jonathan Nieder Signed-off-by: David Barr Signed-off-by: Jonathan Nieder --- diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c index eb8a6a7f7b..747de07e6b 100644 --- a/vcs-svn/line_buffer.c +++ b/vcs-svn/line_buffer.c @@ -104,7 +104,7 @@ void buffer_read_binary(struct line_buffer *buf, strbuf_fread(sb, size, buf->infile); } -void buffer_copy_bytes(struct line_buffer *buf, uint32_t len) +void buffer_copy_bytes(struct line_buffer *buf, off_t len) { char byte_buffer[COPY_BUFFER_LEN]; uint32_t in; @@ -120,7 +120,7 @@ void buffer_copy_bytes(struct line_buffer *buf, uint32_t len) } } -void buffer_skip_bytes(struct line_buffer *buf, uint32_t len) +void buffer_skip_bytes(struct line_buffer *buf, off_t len) { char byte_buffer[COPY_BUFFER_LEN]; uint32_t in; diff --git a/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h index 3c9629e09d..a090dd6874 100644 --- a/vcs-svn/line_buffer.h +++ b/vcs-svn/line_buffer.h @@ -26,7 +26,7 @@ char *buffer_read_line(struct line_buffer *buf); char *buffer_read_string(struct line_buffer *buf, uint32_t len); int buffer_read_char(struct line_buffer *buf); void buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, uint32_t len); -void buffer_copy_bytes(struct line_buffer *buf, uint32_t len); -void buffer_skip_bytes(struct line_buffer *buf, uint32_t len); +void buffer_copy_bytes(struct line_buffer *buf, off_t len); +void buffer_skip_bytes(struct line_buffer *buf, off_t len); #endif