From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 24 Sep 2010 18:30:23 +0000 (+0200)
Subject: IMED_RET parameters are easier to grasp.
X-Git-Tag: gnutls_2_11_3~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b8ddb27e3c8f7ee04c337a440bb729704f49e43;p=thirdparty%2Fgnutls.git

IMED_RET parameters are easier to grasp.
---

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index cf3b32fc4d..3cd0dc4aff 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2665,13 +2665,13 @@ gnutls_handshake (gnutls_session_t session)
 }
 
 
-#define IMED_RET( str, ret, check_fatal) do { \
+#define IMED_RET( str, ret, allow_alert) do { \
 	if (ret < 0) { \
 		/* EAGAIN and INTERRUPTED are always non-fatal */ \
 		if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) \
 			return ret; \
                 /* a warning alert might interrupt handshake */ \
-		if (check_fatal != 0 && ret==GNUTLS_E_WARNING_ALERT_RECEIVED) return ret; \
+		if (allow_alert != 0 && ret==GNUTLS_E_WARNING_ALERT_RECEIVED) return ret; \
 		gnutls_assert(); \
 		ERR( str, ret); \
 		_gnutls_handshake_hash_buffers_clear(session); \