remove superfluous free() checks

free() correctly handles NULL pointers, so we can omit explicit checks
for that condition.
This commit is contained in:
Clemens Ladisch 2006-02-27 09:58:32 +00:00
parent 45850439b3
commit 4433248bf3
33 changed files with 108 additions and 205 deletions

View file

@ -607,10 +607,8 @@ int snd_mixer_close(snd_mixer_t *mixer)
}
assert(list_empty(&mixer->elems));
assert(mixer->count == 0);
if (mixer->pelems) {
free(mixer->pelems);
mixer->pelems = NULL;
}
free(mixer->pelems);
mixer->pelems = NULL;
while (!list_empty(&mixer->slaves)) {
int err;
snd_mixer_slave_t *s;

View file

@ -182,8 +182,7 @@ static void private_free(snd_mixer_class_t *class)
snd_hctl_close(priv->hctl);
} else if (priv->ctl)
snd_ctl_close(priv->ctl);
if (priv->device)
free(priv->device);
free(priv->device);
free(priv);
}

View file

@ -1388,8 +1388,7 @@ int snd_mixer_simple_none_register(snd_mixer_t *mixer,
snd_mixer_class_set_compare(class, snd_mixer_selem_compare);
err = snd_mixer_class_register(class, mixer);
if (err < 0) {
if (class)
free(class);
free(class);
return err;
}
if (classp)