Skip to content

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

jack: eliminate superfluous freeJackData() calls

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.
parent f46de2c3
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
src/audioOutputs/audioOutput_jack.c
View file @ 23832311
...@@ -257,7 +257,6 @@ static int connect_jack(AudioOutput *audioOutput) ...@@ -257,7 +257,6 @@ static int connect_jack(AudioOutput *audioOutput)
if ( (jd->client = jack_client_new(name)) == NULL ) { if ( (jd->client = jack_client_new(name)) == NULL ) {
ERROR("jack server not running?\n"); ERROR("jack server not running?\n");
freeJackData(audioOutput);
return -1; return -1;
} }
...@@ -269,7 +268,6 @@ static int connect_jack(AudioOutput *audioOutput) ...@@ -269,7 +268,6 @@ static int connect_jack(AudioOutput *audioOutput)
if ( jack_activate(jd->client) ) { if ( jack_activate(jd->client) ) {
ERROR("cannot activate client\n"); ERROR("cannot activate client\n");
freeJackData(audioOutput);
return -1; return -1;
} }
...@@ -278,7 +276,6 @@ static int connect_jack(AudioOutput *audioOutput) ...@@ -278,7 +276,6 @@ static int connect_jack(AudioOutput *audioOutput)
JackPortIsOutput, 0); JackPortIsOutput, 0);
if ( !jd->ports[0] ) { if ( !jd->ports[0] ) {
ERROR("Cannot register left output port.\n"); ERROR("Cannot register left output port.\n");
freeJackData(audioOutput);
return -1; return -1;
} }
...@@ -287,7 +284,6 @@ static int connect_jack(AudioOutput *audioOutput) ...@@ -287,7 +284,6 @@ static int connect_jack(AudioOutput *audioOutput)
JackPortIsOutput, 0); JackPortIsOutput, 0);
if ( !jd->ports[1] ) { if ( !jd->ports[1] ) {
ERROR("Cannot register right output port.\n"); ERROR("Cannot register right output port.\n");
freeJackData(audioOutput);
return -1; return -1;
} }
...@@ -315,7 +311,6 @@ static int connect_jack(AudioOutput *audioOutput) ...@@ -315,7 +311,6 @@ static int connect_jack(AudioOutput *audioOutput)
output_ports[0])) != 0 ) { output_ports[0])) != 0 ) {
ERROR("%s is not a valid Jack Client / Port\n", ERROR("%s is not a valid Jack Client / Port\n",
output_ports[0]); output_ports[0]);
freeJackData(audioOutput);
free(port_name); free(port_name);
return -1; return -1;
} }
...@@ -324,7 +319,6 @@ static int connect_jack(AudioOutput *audioOutput) ...@@ -324,7 +319,6 @@ static int connect_jack(AudioOutput *audioOutput)
output_ports[1])) != 0 ) { output_ports[1])) != 0 ) {
ERROR("%s is not a valid Jack Client / Port\n", ERROR("%s is not a valid Jack Client / Port\n",
output_ports[1]); output_ports[1]);
freeJackData(audioOutput);
free(port_name); free(port_name);
return -1; return -1;
} }
......
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