diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/gnutls.c | 15 | ||||
| -rw-r--r-- | src/gnutls.h | 12 | ||||
| -rw-r--r-- | src/process.c | 4 |
4 files changed, 26 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a1a5abe87c3..3eaf1e326b5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2011-04-10 Jim Meyering <meyering@redhat.com> + + use ssize_t and size_t for read- and write-like emacs_gnutls_* functions + * gnutls.c (emacs_gnutls_read): Adjust signature to be more read-like: + return ssize_t not "int", and use size_t as the buffer length. + (emacs_gnutls_write): Likewise, and make the buffer pointer "const". + * gnutls.h: Update declarations. + * process.c (read_process_output): Use ssize_t, to match. + (send_process): Likewise. + 2011-04-09 Chong Yidong <cyd@stupidchicken.com> * image.c (Fimagemagick_types): Doc fix, and comment cleanup. diff --git a/src/gnutls.c b/src/gnutls.c index 3a461891e2e..d9e4dcec15a 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -70,11 +70,12 @@ emacs_gnutls_handshake (struct Lisp_Process *proc) } } -int -emacs_gnutls_write (int fildes, struct Lisp_Process *proc, char *buf, - unsigned int nbyte) +ssize_t +emacs_gnutls_write (int fildes, struct Lisp_Process *proc, const char *buf, + size_t nbyte) { - register int rtnval, bytes_written; + ssize_t rtnval; + size_t bytes_written; gnutls_session_t state = proc->gnutls_state; if (proc->gnutls_initstage != GNUTLS_STAGE_READY) { @@ -109,11 +110,11 @@ emacs_gnutls_write (int fildes, struct Lisp_Process *proc, char *buf, return (bytes_written); } -int +ssize_t emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf, - unsigned int nbyte) + size_t nbyte) { - register int rtnval; + ssize_t rtnval; gnutls_session_t state = proc->gnutls_state; if (proc->gnutls_initstage != GNUTLS_STAGE_READY) diff --git a/src/gnutls.h b/src/gnutls.h index 43a9eefce1b..b39131b6236 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -50,15 +50,15 @@ typedef enum #define GNUTLS_LOG2(level, max, string, extra) if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } -int -emacs_gnutls_write (int fildes, struct Lisp_Process *proc, char *buf, - unsigned int nbyte); -int +ssize_t +emacs_gnutls_write (int fildes, struct Lisp_Process *proc, const char *buf, + size_t nbyte); +ssize_t emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf, - unsigned int nbyte); + size_t nbyte); extern void syms_of_gnutls (void); -#endif +#endif #endif diff --git a/src/process.c b/src/process.c index 6cddbf6d1a9..624610069d8 100644 --- a/src/process.c +++ b/src/process.c @@ -4898,7 +4898,7 @@ read_process_output_error_handler (Lisp_Object error_val) static int read_process_output (Lisp_Object proc, register int channel) { - register int nbytes; + register ssize_t nbytes; char *chars; register Lisp_Object outstream; register struct Lisp_Process *p = XPROCESS (proc); @@ -5243,7 +5243,7 @@ send_process (volatile Lisp_Object proc, const char *volatile buf, { /* Use volatile to protect variables from being clobbered by longjmp. */ struct Lisp_Process *p = XPROCESS (proc); - EMACS_INT rv; + ssize_t rv; struct coding_system *coding; struct gcpro gcpro1; void (*volatile old_sigpipe) (int); |