diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-26 17:49:17 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-26 18:09:08 +0200 |
| commit | 417f8c8ebfa32823b23fed957dcbc7108cb77dea (patch) | |
| tree | 21f0b43e953f2346fc31e0ea2b3a7d394a2b436d | |
| parent | d79b9202e45711e37e5ba5b3fbfccb4b9fff78a1 (diff) | |
| download | qemu-417f8c8ebfa32823b23fed957dcbc7108cb77dea.zip qemu-417f8c8ebfa32823b23fed957dcbc7108cb77dea.tar.gz qemu-417f8c8ebfa32823b23fed957dcbc7108cb77dea.tar.bz2 | |
audio: remove shadowed locals
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | audio/audio.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/audio/audio.c b/audio/audio.c index 90c7c49..2f47965 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1706,7 +1706,7 @@ static AudioState *audio_init(Audiodev *dev, const char *name) size_t i; int done = 0; const char *drvname = NULL; - VMChangeStateEntry *e; + VMChangeStateEntry *vmse; AudioState *s; struct audio_driver *driver; /* silence gcc warning about uninitialized variable */ @@ -1824,8 +1824,8 @@ static AudioState *audio_init(Audiodev *dev, const char *name) s->period_ticks = dev->timer_period * (int64_t)SCALE_US; } - e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s); - if (!e) { + vmse = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s); + if (!vmse) { dolog ("warning: Could not register change state handler\n" "(Audio can continue looping even after stopping the VM)\n"); } @@ -1900,10 +1900,8 @@ CaptureVoiceOut *AUD_add_capture( cap = audio_pcm_capture_find_specific(s, as); if (cap) { QLIST_INSERT_HEAD (&cap->cb_head, cb, entries); - return cap; } else { HWVoiceOut *hw; - CaptureVoiceOut *cap; cap = g_malloc0(sizeof(*cap)); @@ -1937,8 +1935,9 @@ CaptureVoiceOut *AUD_add_capture( QLIST_FOREACH(hw, &s->hw_head_out, entries) { audio_attach_capture (hw); } - return cap; } + + return cap; } void AUD_del_capture (CaptureVoiceOut *cap, void *cb_opaque) |