Commit 368f4090 authored by Jim Meyering's avatar Jim Meyering

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.
parent a32d4040
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.
......
......@@ -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)
......
......@@ -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
......@@ -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);
......
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