aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-26 00:26:02 -0700
committerPaul Eggert2011-04-26 00:26:02 -0700
commit8d4c39551793f003936e4d5da9839ab250358da1 (patch)
tree4cad8126ecb45aaede87530dc6432b1b20cbb3b6 /src
parent7754e1516fdb6ddf8f43f0977cfea8407e5093fa (diff)
downloademacs-8d4c39551793f003936e4d5da9839ab250358da1.tar.gz
emacs-8d4c39551793f003936e4d5da9839ab250358da1.zip
* gnutls.c: Remove unused local.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/gnutls.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 70438c72f09..aea040263bd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,7 @@
7 (emacs_gnutls_read): Do that check. This is the other caller. 7 (emacs_gnutls_read): Do that check. This is the other caller.
8 (emacs_gnutls_handle_error): Remove unused local. 8 (emacs_gnutls_handle_error): Remove unused local.
9 (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *. 9 (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *.
10 Remove unused local.
10 11
11 lisp.h: Fix a problem with aliasing and vector headers. 12 lisp.h: Fix a problem with aliasing and vector headers.
12 GCC 4.6.0 optimizes based on type-based alias analysis. For 13 GCC 4.6.0 optimizes based on type-based alias analysis. For
diff --git a/src/gnutls.c b/src/gnutls.c
index 9b8e501b1fd..c0e078151a2 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -474,7 +474,7 @@ one trustfile (usually a CA bundle). */)
474 Lisp_Object loglevel; 474 Lisp_Object loglevel;
475 Lisp_Object hostname; 475 Lisp_Object hostname;
476 Lisp_Object verify_flags; 476 Lisp_Object verify_flags;
477 Lisp_Object verify_error; 477 /* Lisp_Object verify_error; */
478 Lisp_Object verify_hostname_error; 478 Lisp_Object verify_hostname_error;
479 479
480 CHECK_PROCESS (proc); 480 CHECK_PROCESS (proc);
@@ -488,7 +488,7 @@ one trustfile (usually a CA bundle). */)
488 /* callbacks = Fplist_get (proplist, Qgnutls_bootprop_callbacks); */ 488 /* callbacks = Fplist_get (proplist, Qgnutls_bootprop_callbacks); */
489 loglevel = Fplist_get (proplist, Qgnutls_bootprop_loglevel); 489 loglevel = Fplist_get (proplist, Qgnutls_bootprop_loglevel);
490 verify_flags = Fplist_get (proplist, Qgnutls_bootprop_verify_flags); 490 verify_flags = Fplist_get (proplist, Qgnutls_bootprop_verify_flags);
491 verify_error = Fplist_get (proplist, Qgnutls_bootprop_verify_error); 491 /* verify_error = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */
492 verify_hostname_error = Fplist_get (proplist, Qgnutls_bootprop_verify_hostname_error); 492 verify_hostname_error = Fplist_get (proplist, Qgnutls_bootprop_verify_hostname_error);
493 493
494 if (!STRINGP (hostname)) 494 if (!STRINGP (hostname))