diff options
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/include/violite.h b/include/violite.h index 7b57667541a..d49d0302b5e 100644 --- a/include/violite.h +++ b/include/violite.h @@ -51,8 +51,8 @@ Vio* vio_new_win32shared_memory(NET *net,HANDLE handle_file_map, HANDLE event_client_wrote, HANDLE event_client_read, HANDLE event_conn_closed); -int vio_read_pipe(Vio *vio, gptr buf, int size); -int vio_write_pipe(Vio *vio, const gptr buf, int size); +size_t vio_read_pipe(Vio *vio, uchar * buf, size_t size); +size_t vio_write_pipe(Vio *vio, const uchar * buf, size_t size); int vio_close_pipe(Vio * vio); #else #define HANDLE void * @@ -62,9 +62,9 @@ void vio_delete(Vio* vio); int vio_close(Vio* vio); void vio_reset(Vio* vio, enum enum_vio_type type, my_socket sd, HANDLE hPipe, uint flags); -int vio_read(Vio *vio, gptr buf, int size); -int vio_read_buff(Vio *vio, gptr buf, int size); -int vio_write(Vio *vio, const gptr buf, int size); +size_t vio_read(Vio *vio, uchar * buf, size_t size); +size_t vio_read_buff(Vio *vio, uchar * buf, size_t size); +size_t vio_write(Vio *vio, const uchar * buf, size_t size); int vio_blocking(Vio *vio, my_bool onoff, my_bool *old_mode); my_bool vio_is_blocking(Vio *vio); /* setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible */ @@ -125,11 +125,12 @@ struct st_VioSSLFd *new_VioSSLAcceptorFd(const char *key_file, const char *cert_file, const char *ca_file,const char *ca_path, const char *cipher); +void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd); #endif /* HAVE_OPENSSL */ #ifdef HAVE_SMEM -int vio_read_shared_memory(Vio *vio, gptr buf, int size); -int vio_write_shared_memory(Vio *vio, const gptr buf, int size); +size_t vio_read_shared_memory(Vio *vio, uchar * buf, size_t size); +size_t vio_write_shared_memory(Vio *vio, const uchar * buf, size_t size); int vio_close_shared_memory(Vio * vio); #endif @@ -187,8 +188,8 @@ struct st_vio /* function pointers. They are similar for socket/SSL/whatever */ void (*viodelete)(Vio*); int (*vioerrno)(Vio*); - int (*read)(Vio*, gptr, int); - int (*write)(Vio*, const gptr, int); + size_t (*read)(Vio*, uchar *, size_t); + size_t (*write)(Vio*, const uchar *, size_t); int (*vioblocking)(Vio*, my_bool, my_bool *); my_bool (*is_blocking)(Vio*); int (*viokeepalive)(Vio*, my_bool); @@ -210,7 +211,7 @@ struct st_vio HANDLE event_client_wrote; HANDLE event_client_read; HANDLE event_conn_closed; - long shared_memory_remain; + size_t shared_memory_remain; char *shared_memory_pos; NET *net; #endif /* HAVE_SMEM */ |