oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder: eliminate gotos in decodeStart()

Browse Source 
http://xkcd.com/292/
This commit is contained in:
Max Kellermann
2008-10-31 16:29:45 +01:00
parent a1ca32168c
commit f098db149e
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/decoder_thread.c
View File

@@ -59,19 +59,25 @@ static void decodeStart(void)
will be available then */ will be available then */
while (!inStream.ready) { while (!inStream.ready) {
if (dc.command != DECODE_COMMAND_NONE) if (dc.command != DECODE_COMMAND_NONE) {
goto stop; input_stream_close(&inStream);
return;
}
ret = input_stream_buffer(&inStream); ret = input_stream_buffer(&inStream);
if (ret < 0) if (ret < 0) {
goto stop; input_stream_close(&inStream);
return;
}
} }
/* for http streams, seekable is determined in input_stream_buffer */ /* for http streams, seekable is determined in input_stream_buffer */
dc.seekable = inStream.seekable; dc.seekable = inStream.seekable;
if (dc.command == DECODE_COMMAND_STOP) if (dc.command == DECODE_COMMAND_STOP) {
goto stop; input_stream_close(&inStream);
return;
}
ret = false; ret = false;
if (!song_is_file(song)) { if (!song_is_file(song)) {
@@ -156,7 +162,6 @@ static void decodeStart(void)
: DECODE_ERROR_FILE; : DECODE_ERROR_FILE;
} }
stop:
if (close_instream) if (close_instream)
input_stream_close(&inStream); input_stream_close(&inStream);
} }