diff -r 25c8e8021156 -r 83560f32e7d5 src/server/util/io.c --- a/src/server/util/io.c Sat Nov 12 17:34:58 2022 +0100 +++ b/src/server/util/io.c Sat Nov 12 20:50:45 2022 +0100 @@ -107,31 +107,31 @@ /* - * Sycx_stream implementation + * Sysstream implementation */ -IOStream* sycx_stream_new(pool_handle_t *pool, SYS_SOCKET fd) { - Sycx_stream *st = pool_malloc(pool, sizeof(Sycx_stream)); +IOStream* Sysstream_new(pool_handle_t *pool, SYS_SOCKET fd) { + Sysstream *st = pool_malloc(pool, sizeof(Sysstream)); st->st = native_io_funcs; st->fd = fd; return (IOStream*)st; } #ifdef XP_UNIX -ssize_t net_sys_write(Sycx_stream *st, void *buf, size_t nbytes) { +ssize_t net_sys_write(Sysstream *st, void *buf, size_t nbytes) { return write(st->fd, buf, nbytes); } -ssize_t net_sys_writev(Sycx_stream *st, struct iovec *iovec, int iovcnt) { +ssize_t net_sys_writev(Sysstream *st, struct iovec *iovec, int iovcnt) { return writev(st->fd, iovec, iovcnt); } -ssize_t net_sys_read(Sycx_stream *st, void *buf, size_t nbytes) { +ssize_t net_sys_read(Sysstream *st, void *buf, size_t nbytes) { return read(st->fd, buf, nbytes); } #ifdef WS_SENDFILE -ssize_t net_sys_sendfile(Sycx_stream *st, sendfiledata *sfd) { +ssize_t net_sys_sendfile(Sysstream *st, sendfiledata *sfd) { ssize_t ret = 0; off_t fileoffset = sfd->offset; if(sfd->fd->fd != -1) { @@ -178,11 +178,11 @@ } #endif -void net_sys_close(Sycx_stream *st) { +void net_sys_close(Sysstream *st) { system_close(st->fd); } -void net_sys_setmode(Sycx_stream *st, int mode) { +void net_sys_setmode(Sysstream *st, int mode) { int flags; if (-1 == (flags = fcntl(st->fd, F_GETFL, 0))) { flags = 0; @@ -200,7 +200,7 @@ } } -int net_sys_poll(Sycx_stream *st, EventHandler *ev, int events, Event *cb) { +int net_sys_poll(Sysstream *st, EventHandler *ev, int events, Event *cb) { switch(events) { default: return -1; case IO_POLL_NONE: return ev_remove_poll(ev, st->fd); @@ -212,7 +212,7 @@ #elif defined(XP_WIN32) -ssize_t net_sys_write(Sycx_stream *st, void *buf, size_t nbytes) { +ssize_t net_sys_write(Sysstream *st, void *buf, size_t nbytes) { int ret = send(st->fd, buf, nbytes, 0); if(ret == SOCKET_ERROR) { return IO_ERROR; @@ -220,11 +220,11 @@ return ret; } -ssize_t net_sys_writev(Sycx_stream *st, struct iovec *iovec, int iovcnt) { +ssize_t net_sys_writev(Sysstream *st, struct iovec *iovec, int iovcnt) { // TODO } -ssize_t net_sys_read(Sycx_stream *st, void *buf, size_t nbytes) { +ssize_t net_sys_read(Sysstream *st, void *buf, size_t nbytes) { int ret = recv(st->fd, buf, nbytes, 0); if(ret == SOCKET_ERROR) { return IO_ERROR; @@ -232,11 +232,11 @@ return ret; } -ssize_t net_sys_sendfile(Sycx_stream *st, sendfiledata *sfd) { +ssize_t net_sys_sendfile(Sysstream *st, sendfiledata *sfd) { // TODO } -void net_sys_close(Sycx_stream *st) { +void net_sys_close(Sysstream *st) { closesocket(st->fd); }