procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/gnutls.c: Remove unused parameter `fildes'.

Browse source 
* 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.
This commit is contained in:
Juanma Barranquero 2011-05-05 01:56:09 +02:00
parent 84d358f0d5
commit e968f4f300
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
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.

6
src/gnutls.c
View file

@ -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;

6
src/gnutls.h
View file

@ -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);

7
src/process.c
View file

@ -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);