[Emacs-diffs] /srv/bzr/emacs/trunk r104109: src/gnutls.c: Remove unused parameter `fildes'.

[Juanma Barranquero]

------------------------------------------------------------
revno: 104109
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-05 01:56:09 +0200
message:
  src/gnutls.c: Remove unused parameter `fildes'.
  
  * 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.
modified:
  src/ChangeLog
  src/gnutls.c
  src/gnutls.h
  src/process.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-04 20:03:07 +0000
+++ b/src/ChangeLog     2011-05-04 23:56:09 +0000
@@ -1,5 +1,12 @@
 2011-05-04  Juanma Barranquero  <address@hidden>
 
+       * 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  <address@hidden>
+
        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".

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2011-05-04 14:03:16 +0000
+++ b/src/gnutls.c      2011-05-04 23:56:09 +0000
@@ -319,8 +319,7 @@
 }
 
 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_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;

=== modified file 'src/gnutls.h'
--- a/src/gnutls.h      2011-05-04 14:03:16 +0000
+++ b/src/gnutls.h      2011-05-04 23:56:09 +0000
@@ -54,11 +54,9 @@
 #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);

=== modified file 'src/process.c'
--- a/src/process.c     2011-05-04 14:03:16 +0000
+++ b/src/process.c     2011-05-04 23:56:09 +0000
@@ -4952,7 +4952,7 @@
        }
 #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 @@
                {
 #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);