[X2Go-Commits] [pale-moon] 118/294: Fix warnings about unreachable code in cubeb

git-admin at x2go.org git-admin at x2go.org
Sat Apr 27 08:57:57 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit cf36d986290114b6dd1fcdac6c08283178629742
Author: adeshkp <adeshkp at users.noreply.github.com>
Date:   Thu Mar 14 09:54:30 2019 -0400

    Fix warnings about unreachable code in cubeb
---
 media/libcubeb/src/cubeb.c             | 2 +-
 media/libcubeb/src/cubeb_audiounit.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c
index e0375c3..eb22a9b 100644
--- a/media/libcubeb/src/cubeb.c
+++ b/media/libcubeb/src/cubeb.c
@@ -562,7 +562,7 @@ int cubeb_set_log_callback(cubeb_log_level log_level,
 void
 cubeb_crash()
 {
-  abort();
   *((volatile int *) NULL) = 0;
+  abort();
 }
 
diff --git a/media/libcubeb/src/cubeb_audiounit.cpp b/media/libcubeb/src/cubeb_audiounit.cpp
index f24dfbf..9483c27 100644
--- a/media/libcubeb/src/cubeb_audiounit.cpp
+++ b/media/libcubeb/src/cubeb_audiounit.cpp
@@ -1443,12 +1443,12 @@ audiounit_set_buffer_size(cubeb_stream * stm, uint32_t new_size_frames, set_buff
                                                   buffer_size_changed_callback,
                                                   stm);
   if (r != noErr) {
-    return CUBEB_ERROR;
     if (set_side == INPUT) {
       PRINT_ERROR_CODE("AudioUnitAddPropertyListener/input/kAudioDevicePropertyBufferFrameSize", r);
     } else {
       PRINT_ERROR_CODE("AudioUnitAddPropertyListener/output/kAudioDevicePropertyBufferFrameSize", r);
     }
+    return CUBEB_ERROR;
   }
 
   if (!stm->buffer_size_change_state && count >= 30) {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git


More information about the x2go-commits mailing list