[mpd-devel] [PATCH] sndio: Eliminate remaining goto usage to conform to MPD style

[Dimitris Papastamos]

From b91a1d0cbf446fedb9507d28ed8273ac04a66119 Mon Sep 17 00:00:00 2001
From: Dimitris Papastamos <s...@2f30.org>
Date: Wed, 22 Jun 2016 14:50:35 +0100
Subject: [PATCH] sndio: Eliminate remaining goto usage to conform to MPD style

---
 src/output/plugins/SndioOutputPlugin.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

_______________________________________________
mpd-devel mailing list
mpd-devel@musicpd.org
http://mailman.blarg.de/listinfo/mpd-devel