From cc3386b4ce502e532686a6ec0c56af362cb33e86 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 14 Sep 2015 18:24:41 +0200
Subject: src: Simplify exception_handler()

---
 src/cmocka.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/cmocka.c b/src/cmocka.c
index fda3682..333a739 100644
--- a/src/cmocka.c
+++ b/src/cmocka.c
@@ -1797,11 +1797,14 @@ void _fail(const char * const file, const int line) {
 
 #ifndef _WIN32
 static void exception_handler(int sig) {
+    const char *sig_strerror = "";
+
 #ifdef HAVE_STRSIGNAL
-    cm_print_error("Test failed with exception: %s\n", strsignal(sig));
-#else
-    cm_print_error("Test failed with exception: %d\n", sig);
+    sig_strerror = strsignal(sig);
 #endif
+
+    cm_print_error("Test failed with exception: %s(%d)",
+                   sig_strerror, sig);
     exit_test(1);
 }
 
-- 
cgit v1.2.3