diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-18 21:04:55 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-18 21:04:55 +0100 |
| commit | d4bf43b39b37af9ec22a72de2da95c101fc460bb (patch) | |
| tree | 2a75b9b7b5b1f0c2cfcf3e4251ff7b5c4b60e8be /src | |
| parent | 03829d385e84676debb6f64d6fd79969b3a5b6b5 (diff) | |
| download | xine-lib-d4bf43b39b37af9ec22a72de2da95c101fc460bb.tar.gz xine-lib-d4bf43b39b37af9ec22a72de2da95c101fc460bb.tar.bz2 | |
As the error codepath is going to assert out anyway, don't do the extra malloc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_out/audio_oss_out.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index b22f3344b..5b4faada5 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.c @@ -1041,11 +1041,8 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da asprintf(&this->mixer.name, "%smixer", mixer_name); else asprintf(&this->mixer.name, "%smixer%d", mixer_name, mixer_num); - } else { - this->mixer.name = (char *)malloc(1); - this->mixer.name[0] = '\0'; } - _x_assert(this->mixer.name[0] != '\0'); + _x_assert(this->mixer.name); this->mixer.fd = open(this->mixer.name, O_RDONLY); |