diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-03-26 11:35:41 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-26 11:35:41 -0700 |
commit | a080fdd1b15612f71e5cc660c108f7d6c03804dd (patch) | |
tree | a798d46c93c1df8d9197537a236f85f5be57c09f /vcs-svn/line_buffer.h | |
parent | 42f98745732c68baa6d79a50eab0d726b549025d (diff) | |
parent | 195b7ca6f229455da61f9f6b6e56a6558fb0e8ee (diff) | |
download | git-a080fdd1b15612f71e5cc660c108f7d6c03804dd.tar.gz git-a080fdd1b15612f71e5cc660c108f7d6c03804dd.tar.xz |
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
* 'svn-fe' of git://repo.or.cz/git/jrn:
vcs-svn: handle log message with embedded NUL
vcs-svn: avoid unnecessary copying of log message and author
vcs-svn: remove buffer_read_string
vcs-svn: make reading of properties binary-safe
Diffstat (limited to 'vcs-svn/line_buffer.h')
-rw-r--r-- | vcs-svn/line_buffer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h index f5c468afa..d0b22dda7 100644 --- a/vcs-svn/line_buffer.h +++ b/vcs-svn/line_buffer.h @@ -7,10 +7,9 @@ struct line_buffer { char line_buffer[LINE_BUFFER_LEN]; - struct strbuf blob_buffer; FILE *infile; }; -#define LINE_BUFFER_INIT {"", STRBUF_INIT, NULL} +#define LINE_BUFFER_INIT { "", NULL } int buffer_init(struct line_buffer *buf, const char *filename); int buffer_fdinit(struct line_buffer *buf, int fd); @@ -23,7 +22,6 @@ 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); -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); /* Returns number of bytes read (not necessarily written). */ |