[pkg-opensc-commit] [libp11] 12/67: Clear the error queue

[Eric Dorland]

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

eric pushed a commit to branch master
in repository libp11.

commit 031def8fa17458160f7f33cf56b88fe790ced094
Author: Michal Trojnara <Michal.Trojnara at mirt.net>
Date:   Thu Dec 10 22:00:58 2015 +0100

    Clear the error queue
---
 src/libp11-int.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/libp11-int.h b/src/libp11-int.h
index 973b1bd..344e7f1 100644
--- a/src/libp11-int.h
+++ b/src/libp11-int.h
@@ -162,10 +162,13 @@ typedef struct pkcs11_cert_private {
  * Internal functions
  */
 #define CRYPTOKI_checkerr(f, rv) \
-	do { if (rv) { \
-		PKCS11err(f, pkcs11_map_err(rv)); \
-		return -1; \
-	} } while (0)
+	do { \
+		if (rv) { \
+			PKCS11err(f, pkcs11_map_err(rv)); \
+			return -1; \
+		} \
+		ERR_clear_error(); \
+	} while (0)
 #define CRYPTOKI_call(ctx, func_and_args) \
 	PRIVCTX(ctx)->method->func_and_args
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git