From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 Apr 2011 19:16:40 +0000 (-0400)
Subject: Fix argument to `error' in `gnutls-boot'.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~269
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4354cb4f4a3982331180439120ca72734d49cc5;p=emacs.git

Fix argument to `error' in `gnutls-boot'.

 src/gnutls.c (Fgnutls_boot): Don't pass Lisp_Object to `error'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e8b82ec3be3..d9f764cde85 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-16  Eli Zaretskii  <eliz@gnu.org>
 
+	* gnutls.c (Fgnutls_boot): Don't pass Lisp_Object to `error'.
+
 	Fix regex.c, syntax.c and friends for buffers > 2GB.
 	* syntax.h (struct gl_state_s): Declare character position members
 	EMACS_INT.
diff --git a/src/gnutls.c b/src/gnutls.c
index d7328e114c7..f4f2b9bbd35 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -456,7 +456,7 @@ one trustfile (usually a CA bundle).  */)
           else
             {
               error ("Sorry, GnuTLS can't use non-string trustfile %s",
-                     trustfile);
+                     SDATA (trustfile));
             }
         }
 
@@ -478,7 +478,7 @@ one trustfile (usually a CA bundle).  */)
           else
             {
               error ("Sorry, GnuTLS can't use non-string keyfile %s",
-                     keyfile);
+                     SDATA (keyfile));
             }
         }
     }