OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

audio/audio_template: use g_malloc0() to replace audio_calloc() 

Use g_malloc0() as a direct replacement for audio_calloc().

Since the type of the parameter n_bytes of the function g_malloc0()
is unsigned, the type of the variables voice_size_out and
voice_size_in has been changed to size_t. This means that the
function argument no longer has to be checked for negative values.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230121094735.11644-7-vr_qemu@t-online.de>
This commit is contained in:
Volker Rümelin 2023-01-21 10:47:31 +01:00 committed by Marc-André Lureau
parent d1def19fa3
commit 3724ab3b34
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/audio_int.h
View File

@ -151,8 +151,8 @@ struct audio_driver {
int can_be_default; int can_be_default;
int max_voices_out; int max_voices_out;
int max_voices_in; int max_voices_in;
int voice_size_out; size_t voice_size_out;
int voice_size_in; size_t voice_size_in;
QLIST_ENTRY(audio_driver) next; QLIST_ENTRY(audio_driver) next;
}; };

18
audio/audio_template.h
View File

@ -40,7 +40,7 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioState *s,
struct audio_driver *drv) struct audio_driver *drv)
{ {
int max_voices = glue (drv->max_voices_, TYPE); int max_voices = glue (drv->max_voices_, TYPE);
int voice_size = glue (drv->voice_size_, TYPE); size_t voice_size = glue(drv->voice_size_, TYPE);
if (glue (s->nb_hw_voices_, TYPE) > max_voices) { if (glue (s->nb_hw_voices_, TYPE) > max_voices) {
if (!max_voices) { if (!max_voices) {
@ -63,8 +63,8 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioState *s,
} }
if (audio_bug(__func__, voice_size && !max_voices)) { if (audio_bug(__func__, voice_size && !max_voices)) {
dolog ("drv=`%s' voice_size=%d max_voices=0\n", dolog("drv=`%s' voice_size=%zu max_voices=0\n",
drv->name, voice_size); drv->name, voice_size);
} }
} }
@ -273,13 +273,11 @@ static HW *glue(audio_pcm_hw_add_new_, TYPE)(AudioState *s,
return NULL; return NULL;
} }
hw = audio_calloc(__func__, 1, glue(drv->voice_size_, TYPE)); /*
if (!hw) { * Since glue(s->nb_hw_voices_, TYPE) is != 0, glue(drv->voice_size_, TYPE)
dolog ("Can not allocate voice `%s' size %d\n", * is guaranteed to be != 0. See the audio_init_nb_voices_* functions.
drv->name, glue (drv->voice_size_, TYPE)); */
return NULL; hw = g_malloc0(glue(drv->voice_size_, TYPE));
}
hw->s = s; hw->s = s;
hw->pcm_ops = drv->pcm_ops; hw->pcm_ops = drv->pcm_ops;