summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2011-04-16 15:16:40 -0400
committerEli Zaretskii <eliz@gnu.org>2011-04-16 15:16:40 -0400
commitc4354cb4f4a3982331180439120ca72734d49cc5 (patch)
treef049af3297aef4df7971d3973de3ec7cd96f5c95
parentd1dfb56cc84a6d70262d979face230a71e98d479 (diff)
downloademacs-c4354cb4f4a3982331180439120ca72734d49cc5.tar.gz
Fix argument to `error' in `gnutls-boot'.
src/gnutls.c (Fgnutls_boot): Don't pass Lisp_Object to `error'.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gnutls.c4
2 files changed, 4 insertions, 2 deletions
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));
}
}
}