RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

af_ladspa: code cleanup 

Cleanup based on results from cppcheck-1.59
Reduce the scope of several variables
Fix memory leak
This commit is contained in:
eng 2013-04-14 14:40:36 -04:00 committed by wm4
parent 3b1956608d
commit 74487b8430
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
audio/filter/af_ladspa.c
View File

@ -291,7 +291,7 @@ static int af_ladspa_parse_plugin(af_ladspa_t *setup) {
static void* mydlopen(const char *filename, int flag) { static void* mydlopen(const char *filename, int flag) {
char *buf; char *buf;
const char *end, *start, *ladspapath; const char *end, *start, *ladspapath;
int endsinso, needslash; int endsinso;
size_t filenamelen; size_t filenamelen;
void *result = NULL; void *result = NULL;
@ -324,9 +324,9 @@ static void* mydlopen(const char *filename, int flag) {
ladspapath=getenv("LADSPA_PATH"); ladspapath=getenv("LADSPA_PATH");
if (ladspapath) { if (ladspapath) {
start=ladspapath; start=ladspapath;
while (*start != '\0') { while (*start != '\0') {
int needslash;
end=start; end=start;
while ( (*end != ':') && (*end != '\0') ) while ( (*end != ':') && (*end != '\0') )
end++; end++;
@ -487,7 +487,6 @@ static int af_ladspa_malloc_failed(char *myname) {
static int control(struct af_instance *af, int cmd, void *arg) { static int control(struct af_instance *af, int cmd, void *arg) {
af_ladspa_t *setup = (af_ladspa_t*) af->setup; af_ladspa_t *setup = (af_ladspa_t*) af->setup;
int i, r;
float val; float val;
switch(cmd) { switch(cmd) {
@ -536,7 +535,10 @@ static int control(struct af_instance *af, int cmd, void *arg) {
} }
line += strlen(buf); line += strlen(buf);
setup->file = strdup(buf); setup->file = strdup(buf);
if (!setup->file) return af_ladspa_malloc_failed(setup->myname); if (!setup->file) {
free(buf);
return af_ladspa_malloc_failed(setup->myname);
}
mp_msg(MSGT_AFILTER, MSGL_V, "%s: file --> %s\n", setup->myname, mp_msg(MSGT_AFILTER, MSGL_V, "%s: file --> %s\n", setup->myname,
setup->file); setup->file);
if (*line != '\0') line++; /* read ':' */ if (*line != '\0') line++; /* read ':' */
@ -552,7 +554,10 @@ static int control(struct af_instance *af, int cmd, void *arg) {
} }
line += strlen(buf); line += strlen(buf);
setup->label = strdup(buf); setup->label = strdup(buf);
if (!setup->label) return af_ladspa_malloc_failed(setup->myname); if (!setup->label) {
free(buf);
return af_ladspa_malloc_failed(setup->myname);
}
mp_msg(MSGT_AFILTER, MSGL_V, "%s: label --> %s\n", setup->myname, mp_msg(MSGT_AFILTER, MSGL_V, "%s: label --> %s\n", setup->myname,
setup->label); setup->label);
/* if (*line != '0') line++; */ /* read ':' */ /* if (*line != '0') line++; */ /* read ':' */
@ -579,15 +584,14 @@ static int control(struct af_instance *af, int cmd, void *arg) {
/* ninputcontrols is set by now, read control values from arg */ /* ninputcontrols is set by now, read control values from arg */
for(i=0; i<setup->ninputcontrols; i++) { for (int i = 0; i < setup->ninputcontrols; i++) {
if (!line || *line != ':') { if (!line || *line != ':') {
mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname, mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
_("Not enough controls specified on the command line.")); _("Not enough controls specified on the command line."));
return AF_ERROR; return AF_ERROR;
} }
line++; line++;
r = sscanf(line, "%f", &val); if (sscanf(line, "%f", &val) != 1) {
if (r!=1) {
mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname, mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
_("Not enough controls specified on the command line.")); _("Not enough controls specified on the command line."));
return AF_ERROR; return AF_ERROR;
@ -597,7 +601,7 @@ static int control(struct af_instance *af, int cmd, void *arg) {
} }
mp_msg(MSGT_AFILTER, MSGL_V, "%s: input controls: ", setup->myname); mp_msg(MSGT_AFILTER, MSGL_V, "%s: input controls: ", setup->myname);
for(i=0; i<setup->ninputcontrols; i++) { for (int i = 0; i < setup->ninputcontrols; i++) {
mp_msg(MSGT_AFILTER, MSGL_V, "%0.4f ", mp_msg(MSGT_AFILTER, MSGL_V, "%0.4f ",
setup->inputcontrols[setup->inputcontrolsmap[i]]); setup->inputcontrols[setup->inputcontrolsmap[i]]);
} }
@ -607,7 +611,7 @@ static int control(struct af_instance *af, int cmd, void *arg) {
mp_msg(MSGT_AFILTER, MSGL_V, "%s: checking boundaries of input controls\n", mp_msg(MSGT_AFILTER, MSGL_V, "%s: checking boundaries of input controls\n",
setup->myname); setup->myname);
for(i=0; i<setup->ninputcontrols; i++) { for (int i = 0; i < setup->ninputcontrols; i++) {
int p = setup->inputcontrolsmap[i]; int p = setup->inputcontrolsmap[i];
LADSPA_PortRangeHint hint = LADSPA_PortRangeHint hint =
setup->plugin_descriptor->PortRangeHints[p]; setup->plugin_descriptor->PortRangeHints[p];
@ -649,8 +653,6 @@ static int control(struct af_instance *af, int cmd, void *arg) {
*/ */
static void uninit(struct af_instance *af) { static void uninit(struct af_instance *af) {
int i;
free(af->data); free(af->data);
if (af->setup) { if (af->setup) {
af_ladspa_t *setup = (af_ladspa_t*) af->setup; af_ladspa_t *setup = (af_ladspa_t*) af->setup;
@ -662,7 +664,7 @@ static void uninit(struct af_instance *af) {
} }
if (setup->chhandles) { if (setup->chhandles) {
for(i=0; i<setup->nch; i+=setup->ninputs) { for (int i = 0; i < setup->nch; i+=setup->ninputs) {
if (pdes->deactivate) pdes->deactivate(setup->chhandles[i]); if (pdes->deactivate) pdes->deactivate(setup->chhandles[i]);
if (pdes->cleanup) pdes->cleanup(setup->chhandles[i]); if (pdes->cleanup) pdes->cleanup(setup->chhandles[i]);
} }
@ -679,13 +681,13 @@ static void uninit(struct af_instance *af) {
free(setup->outputs); free(setup->outputs);
if (setup->inbufs) { if (setup->inbufs) {
for(i=0; i<setup->nch; i++) for(int i = 0; i < setup->nch; i++)
free(setup->inbufs[i]); free(setup->inbufs[i]);
free(setup->inbufs); free(setup->inbufs);
} }
if (setup->outbufs) { if (setup->outbufs) {
for(i=0; i<setup->nch; i++) for (int i = 0; i < setup->nch; i++)
free(setup->outbufs[i]); free(setup->outbufs[i]);
free(setup->outbufs); free(setup->outbufs);
} }