From b75662dde8a6d3e808c9c8d440a67df4e0899495 Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Sat, 6 Dec 2008 15:12:34 +0000
Subject: Change how the tests are logged and failed.

---
 src/msg.c | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'src/msg.c')

diff --git a/src/msg.c b/src/msg.c
index dc7d2a4..6ad4fa3 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -108,7 +108,7 @@ p11t_msg_rv(CK_RV rv)
 	CT(CKR_VENDOR_DEFINED)
 	#undef CT
 	default:
-		p11t_msg_print("unknown or invalid CK_RV value: 0x%08X", rv);
+		p11t_check_warn("unknown or invalid CK_RV value encountered: 0x%08X", rv);
 		return "";
 	}
 }
@@ -164,36 +164,44 @@ p11t_msg_va(const char *message, va_list va)
 }
 
 void
-p11t_msg_print(const char *message, ...)
+p11t_msg_code(const char *code, const char *message, va_list va)
 {
-	va_list va;
-	va_start(va, message);
-	p11t_msg_va(message, va);
-	va_end(va);
+	size_t len;
+
+	fprintf(stdout, "%s: ", code);
+	if(the_prefix)
+		fprintf(stdout, "%s: ", the_prefix);
+	vfprintf(stdout, message, va);
+	len = strlen(message);
+	if(len && message[len - 1] != '\n')
+		fputc('\n', stdout);
+	fflush(stdout);
 }
 
+
 void
-p11t_msg_fatal(const char *message, ...)
+p11t_msg_print(const char *message, ...)
 {
 	va_list va;
 	va_start(va, message);
 	p11t_msg_va(message, va);
 	va_end(va);
-	exit(1);
 }
 
 void
-p11t_msg_exit(int code, const char *message, ...)
+p11t_msg_fatal(const char *message, ...)
 {
 	va_list va;
 	va_start(va, message);
 	p11t_msg_va(message, va);
 	va_end(va);
-	exit(code);
+	exit(1);
 }
 
-void
+const char*
 p11t_msg_prefix(const char *prefix)
 {
+	const char *old = the_prefix;
 	the_prefix = prefix;
+	return old;
 }
-- 
cgit v1.2.3