diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 16:19:18 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 16:19:18 +0100 |
| commit | 7fa124b273acd22a808e742ead78c065ccd9b4c4 (patch) | |
| tree | 60fc0c2deebaa7cef45b35f123986eed40f3ba3f /audio | |
| parent | fd2590bccc0bd63833813592a3e193686cf1c623 (diff) | |
| parent | daa76aa416b1e18ab1fac650ff53d966d8f21f68 (diff) | |
| download | qemu-7fa124b273acd22a808e742ead78c065ccd9b4c4.tar.gz | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-06-20' into staging
Error reporting patches for 2016-06-20
# gpg: Signature made Mon 20 Jun 2016 15:56:15 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-error-2016-06-20:
log: Fix qemu_set_log_filename() error handling
log: Fix qemu_set_dfilter_ranges() error reporting
log: Plug memory leak on multiple -dfilter
coccinelle: Remove unnecessary variables for function return value
error: Remove unnecessary local_err variables
error: Remove NULL checks on error_propagate() calls
vl: Error messages need to go to stderr, fix some
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/audio/audio.c b/audio/audio.c index e60c124de8..9d4dcc72dd 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1131,8 +1131,6 @@ static void audio_timer (void *opaque) */ int AUD_write (SWVoiceOut *sw, void *buf, int size) { - int bytes; - if (!sw) { /* XXX: Consider options */ return size; @@ -1143,14 +1141,11 @@ int AUD_write (SWVoiceOut *sw, void *buf, int size) return 0; } - bytes = sw->hw->pcm_ops->write (sw, buf, size); - return bytes; + return sw->hw->pcm_ops->write(sw, buf, size); } int AUD_read (SWVoiceIn *sw, void *buf, int size) { - int bytes; - if (!sw) { /* XXX: Consider options */ return size; @@ -1161,8 +1156,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, int size) return 0; } - bytes = sw->hw->pcm_ops->read (sw, buf, size); - return bytes; + return sw->hw->pcm_ops->read(sw, buf, size); } int AUD_get_buffer_size_out (SWVoiceOut *sw) |