Skip to content

M
mpd
Commit 0dc1b4a4 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

modplug: removed EOF check from the while loop

EOF is checked by input_stream_read() (decoder_read() here). Don't do it twice. The check was wrong anyway, it was reversed.
parent 793934cf
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/decoder/modplug_plugin.c
View file @ 0dc1b4a4
...@@ -55,7 +55,8 @@ static GByteArray *mod_loadfile(struct decoder *decoder, struct input_stream *is ...@@ -55,7 +55,8 @@ static GByteArray *mod_loadfile(struct decoder *decoder, struct input_stream *is
} }
data = g_malloc(MODPLUG_READ_BLOCK); data = g_malloc(MODPLUG_READ_BLOCK);
do {
while (true) {
ret = decoder_read(decoder, is, data, MODPLUG_READ_BLOCK); ret = decoder_read(decoder, is, data, MODPLUG_READ_BLOCK);
if (ret == 0) { if (ret == 0) {
if (input_stream_eof(is)) if (input_stream_eof(is))
...@@ -76,7 +77,8 @@ static GByteArray *mod_loadfile(struct decoder *decoder, struct input_stream *is ...@@ -76,7 +77,8 @@ static GByteArray *mod_loadfile(struct decoder *decoder, struct input_stream *is
} }
g_byte_array_append(bdatas, data, ret); g_byte_array_append(bdatas, data, ret);
} while (input_stream_eof(is)); }
g_free(data); g_free(data);
return bdatas; return bdatas;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment