[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101664: * src/gnutls.c (Fgnutls_boot
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101664: * src/gnutls.c (Fgnutls_boot): Remove unused vars `data' and `srp_cred'. |
Date: |
Tue, 28 Sep 2010 23:55:34 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101664
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2010-09-28 23:55:34 +0200
message:
* src/gnutls.c (Fgnutls_boot): Remove unused vars `data' and `srp_cred'.
(Fgnutls_boot): Use SDATA.
(Fgnutls_handshake): Remove unused var `max_log_level'.
modified:
src/ChangeLog
src/gnutls.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-09-27 23:25:27 +0000
+++ b/src/ChangeLog 2010-09-28 21:55:34 +0000
@@ -1,3 +1,9 @@
+2010-09-28 Stefan Monnier <address@hidden>
+
+ * 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 <address@hidden>
* dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
=== modified file 'src/gnutls.c'
--- a/src/gnutls.c 2010-09-27 16:44:31 +0000
+++ b/src/gnutls.c 2010-09-28 21:55:34 +0000
@@ -265,8 +265,6 @@
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 @@
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 @@
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 @@
{
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 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101664: * src/gnutls.c (Fgnutls_boot): Remove unused vars `data' and `srp_cred'.,
Stefan Monnier <=