[vlc-commits] gnutls: remove tautology / dead code
Rémi Denis-Courmont
git at videolan.org
Sat Sep 6 16:25:56 CEST 2014
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 6 17:19:12 2014 +0300| [c04e7b41a7483d15a47e2944caf7ae1666b9eaac] | committer: Rémi Denis-Courmont
gnutls: remove tautology / dead code
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c04e7b41a7483d15a47e2944caf7ae1666b9eaac
---
modules/misc/gnutls.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index c77536c..7f40125 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -200,7 +200,6 @@ static int gnutls_SessionOpen (vlc_tls_t *tls, int type,
if (alpn != NULL)
{
-#ifdef GNUTLS_ALPN_MAND
gnutls_datum_t *protv = NULL;
unsigned protc = 0;
@@ -222,9 +221,6 @@ static int gnutls_SessionOpen (vlc_tls_t *tls, int type,
val = gnutls_alpn_set_protocols (session, protv, protc, 0);
free (protv);
-#else
- goto error;
-#endif
}
gnutls_transport_set_int (session, fd);
@@ -281,7 +277,6 @@ static int gnutls_ContinueHandshake (vlc_tls_t *tls, char **restrict alp)
done:
if (alp != NULL)
{
-#ifdef GNUTLS_ALPN_MAND
gnutls_datum_t datum;
val = gnutls_alpn_get_selected_protocol (session, &datum);
@@ -295,7 +290,6 @@ done:
return -1;
}
else
-#endif
*alp = NULL;
}
return 0;
More information about the vlc-commits
mailing list