From a66fe88a3436104905357ef191265a00fcd6ce50 Mon Sep 17 00:00:00 2001 From: Markus Seeber Date: Sun, 30 Nov 2014 17:40:53 +0100 Subject: [PATCH 1/2] fix warning about unused label on non win32 build - moved platform dependend code into scope its respective #ifdef - killed one useless 'goto' with great pleasure - introduced duplicate code to preserve behavior (fallthrough case) --- common/JackMessageBuffer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/JackMessageBuffer.cpp b/common/JackMessageBuffer.cpp index 934442bb..62d62427 100644 --- a/common/JackMessageBuffer.cpp +++ b/common/JackMessageBuffer.cpp @@ -189,13 +189,12 @@ int JackMessageBuffer::SetInitCallback(JackThreadInitCallback callback, void *ar fGuard.Signal(); JackSleep(1000); } - if (count == 1000) goto error; + if (count == 1000) + jack_error("JackMessageBuffer::SetInitCallback : callback cannot be executed"); + return -1; #endif - return 0; } - -error: jack_error("JackMessageBuffer::SetInitCallback : callback cannot be executed"); return -1; } From 1f1478c2633ee6c8d952c9eb9df95d2260e4204d Mon Sep 17 00:00:00 2001 From: Markus Seeber Date: Sun, 30 Nov 2014 18:55:39 +0100 Subject: [PATCH 2/2] better error messages - separated two causes of an error - gave the win32 "lost signal" case a more descriptive message --- common/JackMessageBuffer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/JackMessageBuffer.cpp b/common/JackMessageBuffer.cpp index 62d62427..14ed959b 100644 --- a/common/JackMessageBuffer.cpp +++ b/common/JackMessageBuffer.cpp @@ -190,12 +190,12 @@ int JackMessageBuffer::SetInitCallback(JackThreadInitCallback callback, void *ar JackSleep(1000); } if (count == 1000) - jack_error("JackMessageBuffer::SetInitCallback : callback cannot be executed"); + jack_error("JackMessageBuffer::SetInitCallback : signal lost"); return -1; #endif return 0; } - jack_error("JackMessageBuffer::SetInitCallback : callback cannot be executed"); + jack_error("JackMessageBuffer::SetInitCallback : callback could not be executed"); return -1; }