diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/gnutls.c | 6 | ||||
| -rw-r--r-- | src/gnutls.h | 6 | ||||
| -rw-r--r-- | src/process.c | 7 |
4 files changed, 14 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9ec8931822d..7e58ef705bd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2011-05-04 Juanma Barranquero <lekktu@gmail.com> + * gnutls.h (emacs_gnutls_write, emacs_gnutls_read): + * gnutls.c (emacs_gnutls_write, emacs_gnutls_read): + Remove unused parameter `fildes'. + * process.c (read_process_output, send_process): Don't pass it. + +2011-05-04 Juanma Barranquero <lekktu@gmail.com> + Fix previous change: the library cache is defined in w32.c. * image.c (CACHE_IMAGE_TYPE) [!HAVE_NTGUI]: Define to noop. (Finit_image_library): Wrap Vlibrary_cache on "#ifdef HAVE_NTGUI". diff --git a/src/gnutls.c b/src/gnutls.c index 7e821ccd41d..6fede1804dc 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -319,8 +319,7 @@ emacs_gnutls_transport_set_errno (gnutls_session_t state, int err) } EMACS_INT -emacs_gnutls_write (int fildes, struct Lisp_Process *proc, const char *buf, - EMACS_INT nbyte) +emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT nbyte) { ssize_t rtnval = 0; EMACS_INT bytes_written; @@ -360,8 +359,7 @@ emacs_gnutls_write (int fildes, struct Lisp_Process *proc, const char *buf, } EMACS_INT -emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf, - EMACS_INT nbyte) +emacs_gnutls_read (struct Lisp_Process *proc, char *buf, EMACS_INT nbyte) { ssize_t rtnval; gnutls_session_t state = proc->gnutls_state; diff --git a/src/gnutls.h b/src/gnutls.h index afe6337fac2..e2a9bc9eaea 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -54,11 +54,9 @@ typedef enum #define GNUTLS_LOG2(level, max, string, extra) if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } extern EMACS_INT -emacs_gnutls_write (int fildes, struct Lisp_Process *proc, const char *buf, - EMACS_INT nbyte); +emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT nbyte); extern EMACS_INT -emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf, - EMACS_INT nbyte); +emacs_gnutls_read (struct Lisp_Process *proc, char *buf, EMACS_INT nbyte); extern int emacs_gnutls_record_check_pending (gnutls_session_t state); extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err); diff --git a/src/process.c b/src/process.c index 454f7d8a9aa..75dd7efd581 100644 --- a/src/process.c +++ b/src/process.c @@ -4952,7 +4952,7 @@ read_process_output (Lisp_Object proc, register int channel) } #ifdef HAVE_GNUTLS if (XPROCESS (proc)->gnutls_p) - nbytes = emacs_gnutls_read (channel, XPROCESS (proc), + nbytes = emacs_gnutls_read (XPROCESS (proc), chars + carryover + buffered, readmax - buffered); else @@ -5415,9 +5415,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf, { #ifdef HAVE_GNUTLS if (XPROCESS (proc)->gnutls_p) - written = emacs_gnutls_write (outfd, - XPROCESS (proc), - buf, this); + written = emacs_gnutls_write (XPROCESS (proc), + buf, this); else #endif written = emacs_write (outfd, buf, this); |