From 1d74a029a228be228b6d852d9eff028d709e1384 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 2 Aug 2019 22:20:55 +0200 Subject: [PATCH] decoder/mad: simplify variable initialization in FillBuffer() --- src/decoder/plugins/MadDecoderPlugin.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index 0facfc0ec..7d25121cc 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -223,18 +223,14 @@ MadDecoder::Seek(long offset) inline bool MadDecoder::FillBuffer() { - size_t remaining, length; - unsigned char *dest; + size_t remaining = 0, length = READ_BUFFER_SIZE; + unsigned char *dest = input_buffer; if (stream.next_frame != nullptr) { remaining = stream.bufend - stream.next_frame; memmove(input_buffer, stream.next_frame, remaining); - dest = input_buffer + remaining; - length = READ_BUFFER_SIZE - remaining; - } else { - remaining = 0; - length = READ_BUFFER_SIZE; - dest = input_buffer; + dest += remaining; + length -= remaining; } /* we've exhausted the read buffer, so give up!, these potential