Jelajahi Sumber

size_t fix (malc)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1617 c046a42c-6fe2-441c-8c8c-71466251a162
bellard 20 tahun lalu
induk
melakukan
e7cad33853
2 mengubah file dengan 3 tambahan dan 2 penghapusan
  1. 2 1
      audio/audio_template.h
  2. 1 1
      audio/mixeng.c

+ 2 - 1
audio/audio_template.h

@@ -131,6 +131,7 @@ static HW *glue (audio_pcm_hw_find_any_passive_, TYPE) (AudioState *s)
         if (!hw) {
         if (!hw) {
             dolog ("Can not allocate voice `%s' size %d\n",
             dolog ("Can not allocate voice `%s' size %d\n",
                    drv->name, glue (drv->voice_size_, TYPE));
                    drv->name, glue (drv->voice_size_, TYPE));
+            return NULL;
         }
         }
 
 
         LIST_INSERT_HEAD (&s->glue (hw_head_, TYPE), hw, entries);
         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));
     sw = audio_calloc (AUDIO_FUNC, 1, sizeof (*sw));
     if (!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));
                sw_name ? sw_name : "unknown", sizeof (*sw));
         goto err1;
         goto err1;
     }
     }

+ 1 - 1
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));
     struct rate *rate = audio_calloc (AUDIO_FUNC, 1, sizeof (*rate));
 
 
     if (!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;
         return NULL;
     }
     }