From c5fd3412b6294cb94eee4e20b3a819f53f3623bb Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 6 Jun 2013 20:39:50 +0200 Subject: stream: reset buffer even on EOF/error This probably didn't matter anywhere, but it's more proper. --- stream/stream.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'stream') diff --git a/stream/stream.c b/stream/stream.c index eea9e604f8..cc45164b62 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -428,11 +428,9 @@ void stream_unread_buffer(stream_t *s, void *buffer, size_t buffer_size) int stream_fill_buffer(stream_t *s) { int len = stream_read_unbuffered(s, s->buffer, STREAM_BUFFER_SIZE); - if (len <= 0) - return 0; s->buf_pos = 0; - s->buf_len = len; - return len; + s->buf_len = len < 0 ? 0 : len; + return s->buf_len; } // Read between 1..buf_size bytes of data, return how much data has been read. -- cgit v1.2.3