connect_jack() invokes freeJackData() in every error handler, although
its caller also invokes this function after a failure. We can save a
lot of lines in connect_jack() by removing these redundant
freeJackData() invocations.
---
src/audioOutputs/audioOutput_jack.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/audioOutputs/audioOutput_jack.c
b/src/audioOutputs/audioOutput_jack.c
index c8aa4dc..a62c0a0 100644
--- a/src/audioOutputs/audioOutput_jack.c
+++ b/src/audioOutputs/audioOutput_jack.c
@@ -257,7 +257,6 @@ static int connect_jack(AudioOutput *audioOutput)
if ( (jd->client = jack_client_new(name)) == NULL ) {
ERROR("jack server not running?\n");
- freeJackData(audioOutput);
return -1;
}
@@ -269,7 +268,6 @@ static int connect_jack(AudioOutput *audioOutput)
if ( jack_activate(jd->client) ) {
ERROR("cannot activate client\n");
- freeJackData(audioOutput);
return -1;
}
@@ -278,7 +276,6 @@ static int connect_jack(AudioOutput *audioOutput)
JackPortIsOutput, 0);
if ( !jd->ports[0] ) {
ERROR("Cannot register left output port.\n");
- freeJackData(audioOutput);
return -1;
}
@@ -287,7 +284,6 @@ static int connect_jack(AudioOutput *audioOutput)
JackPortIsOutput, 0);
if ( !jd->ports[1] ) {
ERROR("Cannot register right output port.\n");
- freeJackData(audioOutput);
return -1;
}
@@ -315,7 +311,6 @@ static int connect_jack(AudioOutput *audioOutput)
output_ports[0])) != 0 ) {
ERROR("%s is not a valid Jack Client / Port\n",
output_ports[0]);
- freeJackData(audioOutput);
free(port_name);
return -1;
}
@@ -324,7 +319,6 @@ static int connect_jack(AudioOutput *audioOutput)
output_ports[1])) != 0 ) {
ERROR("%s is not a valid Jack Client / Port\n",
output_ports[1]);
- freeJackData(audioOutput);
free(port_name);
return -1;
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
