[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/11] audio/audio_template: use g_new0() to replace audio_calloc
From: |
Volker Rümelin |
Subject: |
[PATCH 08/11] audio/audio_template: use g_new0() to replace audio_calloc() |
Date: |
Sun, 18 Dec 2022 18:15:36 +0100 |
Replace audio_calloc() with the equivalent g_new0().
With a n_structs argument >= 1, g_new0() never returns NULL.
Also remove the unnecessary NULL checks.
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/audio_template.h | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 5f51ef26b2..9c600448fb 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -129,12 +129,7 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW
*sw)
return -1;
}
- sw->buf = audio_calloc(__func__, samples, sizeof(struct st_sample));
- if (!sw->buf) {
- dolog ("Could not allocate buffer for `%s' (%d samples)\n",
- SW_NAME (sw), samples);
- return -1;
- }
+ sw->buf = g_new0(st_sample, samples);
#ifdef DAC
sw->rate = st_rate_start (sw->info.freq, sw->hw->info.freq);
@@ -407,34 +402,28 @@ static SW *glue(audio_pcm_create_voice_pair_, TYPE)(
hw_as = *as;
}
- sw = audio_calloc(__func__, 1, sizeof(*sw));
- if (!sw) {
- dolog ("Could not allocate soft voice `%s' (%zu bytes)\n",
- sw_name ? sw_name : "unknown", sizeof (*sw));
- goto err1;
- }
+ sw = g_new0(SW, 1);
sw->s = s;
hw = glue(audio_pcm_hw_add_, TYPE)(s, &hw_as);
if (!hw) {
dolog("Could not create a backend for voice `%s'\n", sw_name);
- goto err2;
+ goto err1;
}
glue (audio_pcm_hw_add_sw_, TYPE) (hw, sw);
if (glue (audio_pcm_sw_init_, TYPE) (sw, hw, sw_name, as)) {
- goto err3;
+ goto err2;
}
return sw;
-err3:
+err2:
glue (audio_pcm_hw_del_sw_, TYPE) (sw);
glue (audio_pcm_hw_gc_, TYPE) (&hw);
-err2:
- g_free (sw);
err1:
+ g_free(sw);
return NULL;
}
--
2.35.3
- Re: [PATCH 07/11] audio/audio_template: use g_malloc0() to replace audio_calloc(), (continued)
[PATCH 02/11] audio: don't show unnecessary error messages, Volker Rümelin, 2022/12/18
[PATCH 03/11] audio: rename hardware store to backend, Volker Rümelin, 2022/12/18
[PATCH 06/11] audio/alsaaudio: use g_new0() instead of audio_calloc(), Volker Rümelin, 2022/12/18
[PATCH 11/11] alsaaudio: reintroduce default recording settings, Volker Rümelin, 2022/12/18
[PATCH 08/11] audio/audio_template: use g_new0() to replace audio_calloc(),
Volker Rümelin <=
[PATCH 04/11] audio: remove unused #define AUDIO_STRINGIFY, Volker Rümelin, 2022/12/18
[PATCH 10/11] alsaaudio: change default playback settings, Volker Rümelin, 2022/12/18