From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 25 Nov 2014 17:22:21 +0000 (-0800)
Subject: Fix gnutls problems caught by static checking.
X-Git-Tag: emacs-25.0.90~2635^2~322
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92f6486a11e01dcac0a83ab5fc0aefb68068159f;p=emacs.git

Fix gnutls problems caught by static checking.

* gnutls.c (Fgnutls_boot): Remove unused local.
(Fgnutls_boot): Fix pointer signedness.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a515080e85f..da8746c3ff8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix gnutls problems caught by static checking.
+	* gnutls.c (Fgnutls_boot): Remove unused local.
+	(Fgnutls_boot): Fix pointer signedness.
+
 2014-11-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnutls.c (gnutls_certificate_details): Don't include certain
diff --git a/src/gnutls.c b/src/gnutls.c
index 3c067418952..baadaaf29b2 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1185,7 +1185,6 @@ one trustfile (usually a CA bundle).  */)
   Lisp_Object verify_error;
   Lisp_Object prime_bits;
   Lisp_Object warnings;
-  Lisp_Object warning;
 
   CHECK_PROCESS (proc);
   CHECK_SYMBOL (type);
@@ -1441,7 +1440,7 @@ one trustfile (usually a CA bundle).  */)
           Lisp_Object warning = XCAR (tail);
           Lisp_Object message = Fgnutls_peer_status_warning_describe (warning);
           if (!NILP (message))
-            GNUTLS_LOG2 (1, max_log_level, "verification:", SDATA (message));
+            GNUTLS_LOG2 (1, max_log_level, "verification:", SSDATA (message));
         }
     }