From e7cad33853d24c0df1f4fb566485a866a8f0e40a Mon Sep 17 00:00:00 2001 From: bellard Date: Fri, 11 Nov 2005 00:03:36 +0000 Subject: [PATCH] size_t fix (malc) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1617 c046a42c-6fe2-441c-8c8c-71466251a162 --- audio/audio_template.h | 3 ++- audio/mixeng.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/audio/audio_template.h b/audio/audio_template.h index d985c2eeff..be32c68b3b 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -131,6 +131,7 @@ static HW *glue (audio_pcm_hw_find_any_passive_, TYPE) (AudioState *s) if (!hw) { dolog ("Can not allocate voice `%s' size %d\n", drv->name, glue (drv->voice_size_, TYPE)); + return NULL; } LIST_INSERT_HEAD (&s->glue (hw_head_, TYPE), hw, entries); @@ -221,7 +222,7 @@ static SW *glue (audio_pcm_create_voice_pair_, TYPE) ( sw = audio_calloc (AUDIO_FUNC, 1, sizeof (*sw)); if (!sw) { - dolog ("Could not allocate soft voice `%s' (%d bytes)\n", + dolog ("Could not allocate soft voice `%s' (%zu bytes)\n", sw_name ? sw_name : "unknown", sizeof (*sw)); goto err1; } diff --git a/audio/mixeng.c b/audio/mixeng.c index 14e37ae16f..6308d41004 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -243,7 +243,7 @@ void *st_rate_start (int inrate, int outrate) struct rate *rate = audio_calloc (AUDIO_FUNC, 1, sizeof (*rate)); if (!rate) { - dolog ("Could not allocate resampler (%d bytes)\n", sizeof (*rate)); + dolog ("Could not allocate resampler (%zu bytes)\n", sizeof (*rate)); return NULL; }