[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/27] audio/mixeng: use g_new0() instead of audio_calloc()
From: |
marcandre . lureau |
Subject: |
[PULL 06/27] audio/mixeng: use g_new0() instead of audio_calloc() |
Date: |
Mon, 6 Mar 2023 10:51:41 +0400 |
From: Volker Rümelin <vr_qemu@t-online.de>
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>
---
audio/audio_template.h | 6 +-----
audio/audio.c | 5 -----
audio/mixeng.c | 7 +------
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 33af42ed8b..dfa440f778 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -141,11 +141,7 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW
*sw)
#else
sw->rate = st_rate_start (sw->hw->info.freq, sw->info.freq);
#endif
- if (!sw->rate) {
- g_free (sw->buf);
- sw->buf = NULL;
- return -1;
- }
+
return 0;
}
diff --git a/audio/audio.c b/audio/audio.c
index 81f5c0bb1e..012d10996b 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -509,11 +509,6 @@ static int audio_attach_capture (HWVoiceOut *hw)
sw->ratio = ((int64_t) hw_cap->info.freq << 32) / sw->info.freq;
sw->vol = nominal_volume;
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_head, sc, entries);
#ifdef DEBUG_CAPTURE
diff --git a/audio/mixeng.c b/audio/mixeng.c
index 100a306d6f..fe454e0725 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -414,12 +414,7 @@ struct rate {
*/
void *st_rate_start (int inrate, int outrate)
{
- struct rate *rate = audio_calloc(__func__, 1, sizeof(*rate));
-
- if (!rate) {
- dolog ("Could not allocate resampler (%zu bytes)\n", sizeof (*rate));
- return NULL;
- }
+ struct rate *rate = g_new0(struct rate, 1);
rate->opos = 0;
--
2.39.2
- [PULL 00/27] Audio patches, marcandre . lureau, 2023/03/06
- [PULL 03/27] audio: don't show unnecessary error messages, marcandre . lureau, 2023/03/06
- [PULL 02/27] audio: log unimplemented audio device sample rates, marcandre . lureau, 2023/03/06
- [PULL 01/27] MAINTAINERS: add myself to ui/ and audio/, marcandre . lureau, 2023/03/06
- [PULL 04/27] audio: rename hardware store to backend, marcandre . lureau, 2023/03/06
- [PULL 05/27] audio: remove unused #define AUDIO_STRINGIFY, marcandre . lureau, 2023/03/06
- [PULL 06/27] audio/mixeng: use g_new0() instead of audio_calloc(),
marcandre . lureau <=
- [PULL 09/27] audio/audio_template: use g_new0() to replace audio_calloc(), marcandre . lureau, 2023/03/06
- [PULL 07/27] audio/alsaaudio: use g_new0() instead of audio_calloc(), marcandre . lureau, 2023/03/06
- [PULL 10/27] audio: remove audio_calloc() function, marcandre . lureau, 2023/03/06
- [PULL 08/27] audio/audio_template: use g_malloc0() to replace audio_calloc(), marcandre . lureau, 2023/03/06
- [PULL 11/27] alsaaudio: change default playback settings, marcandre . lureau, 2023/03/06
- [PULL 12/27] alsaaudio: reintroduce default recording settings, marcandre . lureau, 2023/03/06
- [PULL 13/27] audio: change type of mix_buf and conv_buf, marcandre . lureau, 2023/03/06
- [PULL 14/27] audio: change type and name of the resample buffer, marcandre . lureau, 2023/03/06
- [PULL 15/27] audio: make the resampling code greedy, marcandre . lureau, 2023/03/06
- [PULL 16/27] audio: replace the resampling loop in audio_pcm_sw_write(), marcandre . lureau, 2023/03/06