Skip to content

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

mixer: don't check for NULL before g_free()

The g_free() function includes a NULL check. We don't have to do it twice.
parent 5ba43e4a
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 16 deletions
src/mixer/alsa_mixer.c
View file @ a0603d88
......@@ -36,10 +36,9 @@ static void
alsa_mixer_finish(struct mixer_data *data)
{
struct alsa_mixer *am = (struct alsa_mixer *)data;
if (am->device)
g_free(am->device);
if (am->control)
g_free(am->control);
g_free(am->device);
g_free(am->control);
g_free(am);
}
......@@ -53,13 +52,11 @@ alsa_mixer_configure(struct mixer_data *data, struct config_param *param)
return;
if ((bp = getBlockParam(param, "mixer_device"))) {
if (am->device)
g_free(am->device);
g_free(am->device);
am->device = g_strdup(bp->value);
}
if ((bp = getBlockParam(param, "mixer_control"))) {
if (am->control)
g_free(am->control);
g_free(am->control);
am->control = g_strdup(bp->value);
}
}
......
src/mixer/oss_mixer.c
View file @ a0603d88
......@@ -40,10 +40,9 @@ static void
oss_mixer_finish(struct mixer_data *data)
{
struct oss_mixer *om = (struct oss_mixer *) data;
if (om->device)
g_free(om->device);
if (om->control)
g_free(om->control);
g_free(om->device);
g_free(om->control);
g_free(om);
}
......@@ -58,14 +57,13 @@ oss_mixer_configure(struct mixer_data *data, struct config_param *param)
bp = getBlockParam(param, "mixer_device");
if (bp) {
if (om->device)
g_free(om->device);
g_free(om->device);
om->device = g_strdup(bp->value);
}
bp = getBlockParam(param, "mixer_control");
if (bp) {
if (om->control)
g_free(om->control);
g_free(om->control);
om->control = g_strdup(bp->value);
}
}
......
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