diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-26 02:27:48 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-26 02:27:48 -0500 |
| commit | e9f3f8b6f4141dae526e9792ba6dede7aa038622 (patch) | |
| tree | e4d1b8abaaef180f844b1d0f57afbc87e4c4f677 /vcs-svn/line_buffer.h | |
| parent | c19d653c4fcdc93169507c09f8f66ebffbdbb9a5 (diff) | |
| parent | c846e4107876936bed7177a811559bd74a72dcd8 (diff) | |
| download | git-e9f3f8b6f4141dae526e9792ba6dede7aa038622.tar.gz | |
Merge branch 'db/delta-applier' into db/text-delta
* db/delta-applier:
vcs-svn: let deltas use data from preimage
vcs-svn: let deltas use data from postimage
vcs-svn: verify that deltas consume all inline data
vcs-svn: implement copyfrom_data delta instruction
vcs-svn: read instructions from deltas
vcs-svn: read inline data from deltas
vcs-svn: read the preimage when applying deltas
vcs-svn: parse svndiff0 window header
vcs-svn: skeleton of an svn delta parser
vcs-svn: make buffer_read_binary API more convenient
vcs-svn: learn to maintain a sliding view of a file
Makefile: list one vcs-svn/xdiff object or header per line
Conflicts:
Makefile
vcs-svn/LICENSE
Diffstat (limited to 'vcs-svn/line_buffer.h')
| -rw-r--r-- | vcs-svn/line_buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h index d0b22dda76..8901f214ba 100644 --- a/vcs-svn/line_buffer.h +++ b/vcs-svn/line_buffer.h @@ -23,7 +23,7 @@ long buffer_tmpfile_prepare_to_read(struct line_buffer *buf); int buffer_ferror(struct line_buffer *buf); char *buffer_read_line(struct line_buffer *buf); int buffer_read_char(struct line_buffer *buf); -void buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, uint32_t len); +size_t buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, size_t len); /* Returns number of bytes read (not necessarily written). */ off_t buffer_copy_bytes(struct line_buffer *buf, off_t len); off_t buffer_skip_bytes(struct line_buffer *buf, off_t len); |