undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vcs-svn: make buffer_skip_bytes return length read

Browse Source 
Currently there is no way to detect when input ended if it ended
early during buffer_skip_bytes.  Tell the calling program how many
bytes were actually skipped for easier debugging.

Existing callers will still ignore early EOF.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
Jonathan Nieder 2010-10-10 21:44:21 -05:00
parent 93b709c79e
commit d234f54b2f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vcs-svn/line_buffer.c
View File

@ -120,15 +120,16 @@ void buffer_copy_bytes(struct line_buffer *buf, off_t len)
} }
} }
void buffer_skip_bytes(struct line_buffer *buf, off_t len) off_t buffer_skip_bytes(struct line_buffer *buf, off_t nbytes)
{ {
char byte_buffer[COPY_BUFFER_LEN]; char byte_buffer[COPY_BUFFER_LEN];
uint32_t in; off_t done = 0;
while (len > 0 && !feof(buf->infile) && !ferror(buf->infile)) { while (done < nbytes && !feof(buf->infile) && !ferror(buf->infile)) {
in = len < COPY_BUFFER_LEN ? len : COPY_BUFFER_LEN; off_t len = nbytes - done;
in = fread(byte_buffer, 1, in, buf->infile); size_t in = len < COPY_BUFFER_LEN ? len : COPY_BUFFER_LEN;
len -= in; done += fread(byte_buffer, 1, in, buf->infile);
} }
return done;
} }
void buffer_reset(struct line_buffer *buf) void buffer_reset(struct line_buffer *buf)

2
vcs-svn/line_buffer.h
View File

@ -27,6 +27,6 @@ char *buffer_read_string(struct line_buffer *buf, uint32_t len);
int buffer_read_char(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); void buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, uint32_t len);
void buffer_copy_bytes(struct line_buffer *buf, off_t len); void buffer_copy_bytes(struct line_buffer *buf, off_t len);
void buffer_skip_bytes(struct line_buffer *buf, off_t len); off_t buffer_skip_bytes(struct line_buffer *buf, off_t len);
#endif #endif

3
vcs-svn/line_buffer.txt
View File

@ -76,7 +76,8 @@ Functions
`buffer_skip_bytes`:: `buffer_skip_bytes`::
Discards `len` bytes from the input stream (stopping early Discards `len` bytes from the input stream (stopping early
if necessary because of an error or eof). if necessary because of an error or eof). Return value is
the number of bytes successfully read.
`buffer_reset`:: `buffer_reset`::
Deallocates non-static buffers. Deallocates non-static buffers.