From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 24 Oct 2014 09:12:10 +0000 (+0200)
Subject: corrected likely macro usage
X-Git-Tag: gnutls_3_4_0~744
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8872c849b9e6eecfb6b7db274a397ed45cd8d9f1;p=thirdparty%2Fgnutls.git

corrected likely macro usage

Spotted by Manuel Pégourié-Gonnard.
---

diff --git a/lib/ext/ext_master_secret.c b/lib/ext/ext_master_secret.c
index 9c071515e2..16cd33f60d 100644
--- a/lib/ext/ext_master_secret.c
+++ b/lib/ext/ext_master_secret.c
@@ -69,7 +69,7 @@ _gnutls_ext_master_secret_recv_params(gnutls_session_t session,
 	if (session->security_parameters.entity == GNUTLS_CLIENT) {
 		const version_entry_st *ver = get_version(session);
 
-		if (likely(ver == NULL))
+		if (unlikely(ver == NULL))
 			return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 		if (ver->id != GNUTLS_SSL3)
@@ -100,7 +100,7 @@ _gnutls_ext_master_secret_send_params(gnutls_session_t session,
 		return GNUTLS_E_INT_RET_0;
 	} else { /* server side */
 		const version_entry_st *ver = get_version(session);
-		if (likely(ver == NULL))
+		if (unlikely(ver == NULL))
 			return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 		if (ver->id != GNUTLS_SSL3 && session->security_parameters.ext_master_secret != 0)