From a6f3211f1090a904aaa81c388fbae7b560794432 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 28 Sep 2010 23:55:34 +0200 Subject: [PATCH] * src/gnutls.c (Fgnutls_boot): Remove unused vars `data' and `srp_cred'. (Fgnutls_boot): Use SDATA. (Fgnutls_handshake): Remove unused var `max_log_level'. --- src/ChangeLog | 6 ++++++ src/gnutls.c | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a378097d7fd..269483f1625 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-09-28 Stefan Monnier + + * gnutls.c (Fgnutls_boot): Remove unused vars `data' and `srp_cred'. + (Fgnutls_boot): Use SDATA. + (Fgnutls_handshake): Remove unused var `max_log_level'. + 2010-09-27 Michael Albinus * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0". diff --git a/src/gnutls.c b/src/gnutls.c index c2d664ff97e..4b8016aab37 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -265,8 +265,6 @@ KEYFILE and optionally CALLBACK. */) gnutls_session_t state; gnutls_certificate_credentials_t x509_cred; gnutls_anon_client_credentials_t anon_cred; - gnutls_srp_client_credentials_t srp_cred; - gnutls_datum_t data; Lisp_Object global_init; CHECK_PROCESS (proc); @@ -355,7 +353,7 @@ KEYFILE and optionally CALLBACK. */) GNUTLS_LOG (1, max_log_level, "setting the trustfile"); ret = gnutls_certificate_set_x509_trust_file (x509_cred, - XSTRING (trustfile)->data, + SDATA (trustfile), file_format); if (ret < GNUTLS_E_SUCCESS) @@ -367,7 +365,7 @@ KEYFILE and optionally CALLBACK. */) GNUTLS_LOG (1, max_log_level, "setting the keyfile"); ret = gnutls_certificate_set_x509_crl_file (x509_cred, - XSTRING (keyfile)->data, + SDATA (keyfile), file_format); if (ret < GNUTLS_E_SUCCESS) @@ -478,7 +476,6 @@ or `gnutls-e-interrupted'. In that case you may resume the handshake { gnutls_session_t state; int ret; - int max_log_level = XPROCESS (proc)->gnutls_log_level; CHECK_PROCESS (proc); state = XPROCESS (proc)->gnutls_state; @@ -494,6 +491,8 @@ or `gnutls-e-interrupted'. In that case you may resume the handshake message ("gnutls: handshake: setting the transport pointers to %d/%d", XPROCESS (proc)->infd, XPROCESS (proc)->outfd); + /* FIXME: This can't be right: infd and outfd are integers (file handles) + whereas the function expects args of type gnutls_transport_ptr_t. */ gnutls_transport_set_ptr2 (state, XPROCESS (proc)->infd, XPROCESS (proc)->outfd); -- 2.11.4.GIT