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

sndio: Eliminate remaining goto usage to conform to MPD style

This commit is contained in:
Dimitris Papastamos 2016-06-22 14:52:40 +01:00 committed by Max Kellermann
parent d4f801a8e9
commit 26c0924461
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/output/plugins/SndioOutputPlugin.cxx
View File

@ -143,7 +143,8 @@ SndioOutput::Open(AudioFormat &audio_format, gcc_unused Error &error)
!sio_getpar(sio_hdl, &par)) { !sio_getpar(sio_hdl, &par)) {
error.Format(sndio_output_domain, -1, error.Format(sndio_output_domain, -1,
"Failed to set/get audio params"); "Failed to set/get audio params");
goto err; sio_close(sio_hdl);
return false;
} }
if (par.bits != bits || if (par.bits != bits ||
@ -154,19 +155,18 @@ SndioOutput::Open(AudioFormat &audio_format, gcc_unused Error &error)
par.le != SIO_LE_NATIVE) { par.le != SIO_LE_NATIVE) {
error.Format(sndio_output_domain, -1, error.Format(sndio_output_domain, -1,
"Requested audio params cannot be satisfied"); "Requested audio params cannot be satisfied");
goto err; sio_close(sio_hdl);
return false;
} }
if (!sio_start(sio_hdl)) { if (!sio_start(sio_hdl)) {
error.Format(sndio_output_domain, -1, error.Format(sndio_output_domain, -1,
"Failed to start audio device"); "Failed to start audio device");
goto err; sio_close(sio_hdl);
return false;
} }
return true; return true;
err:
sio_close(sio_hdl);
return false;
} }
void void