Commit b845653d authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen
Browse files

Make emacs_gnutls_read() return the expected on errors.

Also interface cleanups.
parent 1736ad36
2010-10-09 Lars Magne Ingebrigtsen <>
* gnutls.c (syms_of_gnutls): All the bootprops are keywords.
(emacs_gnutls_write): Remove the debuggin fsync() call.
(emacs_gnutls_read): Return -1 if we got an error from
gnutls_read(). This allows us to actually read lots of data from
the GnuTLS stream.
2010-10-09 Chong Yidong <>
* xterm.c (x_draw_relief_rect): Clear corner pixels.
......@@ -98,7 +98,6 @@ emacs_gnutls_write (int fildes, struct Lisp_Process *proc, char *buf,
nbyte -= rtnval;
bytes_written += rtnval;
return (bytes_written);
......@@ -120,7 +119,7 @@ emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf,
if (rtnval >= 0)
return rtnval;
return 0;
return -1;
/* convert an integer error to a Lisp_Object; it will be either a
......@@ -578,19 +577,19 @@ syms_of_gnutls (void)
Qgnutls_x509pki = intern_c_string ("gnutls-x509pki");
staticpro (&Qgnutls_x509pki);
Qgnutls_bootprop_priority = intern_c_string ("priority");
Qgnutls_bootprop_priority = intern_c_string (":priority");
staticpro (&Qgnutls_bootprop_priority);
Qgnutls_bootprop_trustfiles = intern_c_string ("trustfiles");
Qgnutls_bootprop_trustfiles = intern_c_string (":trustfiles");
staticpro (&Qgnutls_bootprop_trustfiles);
Qgnutls_bootprop_keyfiles = intern_c_string ("keyfiles");
Qgnutls_bootprop_keyfiles = intern_c_string (":keyfiles");
staticpro (&Qgnutls_bootprop_keyfiles);
Qgnutls_bootprop_callbacks = intern_c_string ("callbacks");
Qgnutls_bootprop_callbacks = intern_c_string (":callbacks");
staticpro (&Qgnutls_bootprop_callbacks);
Qgnutls_bootprop_loglevel = intern_c_string ("loglevel");
Qgnutls_bootprop_loglevel = intern_c_string (":loglevel");
staticpro (&Qgnutls_bootprop_loglevel);
Qgnutls_e_interrupted = intern_c_string ("gnutls-e-interrupted");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment