Merge branch 'mz/maint-rename-unmerged'

diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c
index 33e733a04c2b694a7dce80c8404edd464fe1a6b7..c39038723ed4a90f99f70a694eae58ba488556b6 100644 (file)
--- a/vcs-svn/line_buffer.c
+++ b/vcs-svn/line_buffer.c
@@ -91,13 +91,6 @@ char *buffer_read_line(struct line_buffer *buf)
        return buf->line_buffer;
 }
 
-char *buffer_read_string(struct line_buffer *buf, uint32_t len)
-{
-       strbuf_reset(&buf->blob_buffer);
-       strbuf_fread(&buf->blob_buffer, len, buf->infile);
-       return ferror(buf->infile) ? NULL : buf->blob_buffer.buf;
-}
-
 void buffer_read_binary(struct line_buffer *buf,
                                struct strbuf *sb, uint32_t size)
 {
@@ -134,5 +127,4 @@ off_t buffer_skip_bytes(struct line_buffer *buf, off_t nbytes)
 
 void buffer_reset(struct line_buffer *buf)
 {
-       strbuf_release(&buf->blob_buffer);
 }