emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103933: Fix argument to `error' in `


From: Eli Zaretskii
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103933: Fix argument to `error' in `gnutls-boot'.
Date: Sat, 16 Apr 2011 15:16:40 -0400
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 103933
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-04-16 15:16:40 -0400
message:
  Fix argument to `error' in `gnutls-boot'.
  
   src/gnutls.c (Fgnutls_boot): Don't pass Lisp_Object to `error'.
modified:
  src/ChangeLog
  src/gnutls.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-16 18:26:30 +0000
+++ b/src/ChangeLog     2011-04-16 19:16:40 +0000
@@ -1,5 +1,7 @@
 2011-04-16  Eli Zaretskii  <address@hidden>
 
+       * 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.

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2011-04-15 08:22:34 +0000
+++ b/src/gnutls.c      2011-04-16 19:16:40 +0000
@@ -456,7 +456,7 @@
           else
             {
               error ("Sorry, GnuTLS can't use non-string trustfile %s",
-                     trustfile);
+                     SDATA (trustfile));
             }
         }
 
@@ -478,7 +478,7 @@
           else
             {
               error ("Sorry, GnuTLS can't use non-string keyfile %s",
-                     keyfile);
+                     SDATA (keyfile));
             }
         }
     }


reply via email to

[Prev in Thread] Current Thread [Next in Thread]