motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

audio/mixeng: use g_new0() instead of audio_calloc()

Browse source 
Replace audio_calloc() with the equivalent g_new0().

With a n_structs argument of 1, g_new0() never returns NULL.
Also remove the unnecessary NULL checks.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230121094735.11644-5-vr_qemu@t-online.de>
This commit is contained in:
Volker Rümelin 2023-01-21 10:47:29 +01:00 • committed by Marc-André Lureau
parent f8f8a8ac57
commit 25bf0c2d35
3 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
audio/audio.c
View file

@ -509,11 +509,6 @@ static int audio_attach_capture (HWVoiceOut *hw)
sw->ratio = ((int64_t) hw_cap->info.freq << 32) / sw->info.freq; sw->ratio = ((int64_t) hw_cap->info.freq << 32) / sw->info.freq;
sw->vol = nominal_volume; sw->vol = nominal_volume;
sw->rate = st_rate_start (sw->info.freq, hw_cap->info.freq); sw->rate = st_rate_start (sw->info.freq, hw_cap->info.freq);
if (!sw->rate) {
dolog ("Could not start rate conversion for `%s'\n", SW_NAME (sw));
g_free (sw);
return -1;
}
QLIST_INSERT_HEAD (&hw_cap->sw_head, sw, entries); QLIST_INSERT_HEAD (&hw_cap->sw_head, sw, entries);
QLIST_INSERT_HEAD (&hw->cap_head, sc, entries); QLIST_INSERT_HEAD (&hw->cap_head, sc, entries);
#ifdef DEBUG_CAPTURE #ifdef DEBUG_CAPTURE

6
audio/audio_template.h
View file

@ -141,11 +141,7 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw)
#else #else
sw->rate = st_rate_start (sw->hw->info.freq, sw->info.freq); sw->rate = st_rate_start (sw->hw->info.freq, sw->info.freq);
#endif #endif
if (!sw->rate) {
g_free (sw->buf);
sw->buf = NULL;
return -1;
}
return 0; return 0;
} }

7
audio/mixeng.c
View file

@ -414,12 +414,7 @@ struct rate {
*/ */
void *st_rate_start (int inrate, int outrate) void *st_rate_start (int inrate, int outrate)
{ {
struct rate *rate = audio_calloc(__func__, 1, sizeof(*rate)); struct rate *rate = g_new0(struct rate, 1);
if (!rate) {
dolog ("Could not allocate resampler (%zu bytes)\n", sizeof (*rate));
return NULL;
}
rate->opos = 0; rate->opos = 0;