diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-21 12:05:07 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-21 12:05:07 +0000 |
| commit | 49d8fa1058aaf23c29e074b2314492ae40d2f557 (patch) | |
| tree | 393f884d5a99f984e992a0f35f1b02ac43536217 /src/libstddjb/iobufferk_fill.c | |
| parent | fdffefb8032922ce7ffe4c00816072a8ff2148fc (diff) | |
| download | skalibs-49d8fa1058aaf23c29e074b2314492ae40d2f557.tar.xz | |
Types change: big pass on libstddjb and libunixonacid
libdatastruct still missing, library still not functional
Diffstat (limited to 'src/libstddjb/iobufferk_fill.c')
| -rw-r--r-- | src/libstddjb/iobufferk_fill.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/libstddjb/iobufferk_fill.c b/src/libstddjb/iobufferk_fill.c index c811c24..0ae8763 100644 --- a/src/libstddjb/iobufferk_fill.c +++ b/src/libstddjb/iobufferk_fill.c @@ -9,30 +9,30 @@ #include <errno.h> #include <skalibs/iobuffer.h> -static int iobufferk_tee (iobufferk *k) +static ssize_t iobufferk_tee (iobufferk *k) { - register int r = tee(k->fd[0], k->fd[1], IOBUFFERK_SIZE - k->n, k->nb & 1 ? SPLICE_F_NONBLOCK : 0) ; + ssize_t r = tee(k->fd[0], k->fd[1], IOBUFFERK_SIZE - k->n, k->nb & 1 ? SPLICE_F_NONBLOCK : 0) ; if (r > 0) k->n += r ; return r ; } -static int iobufferk_splice (iobufferk *k) +static ssize_t iobufferk_splice (iobufferk *k) { - register int r = splice(k->fd[0], 0, k->fd[1], 0, IOBUFFERK_SIZE, k->nb ? SPLICE_F_NONBLOCK : 0) ; + ssize_t r = splice(k->fd[0], 0, k->fd[1], 0, IOBUFFERK_SIZE, k->nb ? SPLICE_F_NONBLOCK : 0) ; if (r > 0) k->n += r ; if ((r < 0) && (errno == EINVAL)) errno = ENOSYS ; return r ; } -static int iobufferk_fill_3 (iobufferk *k) +static ssize_t iobufferk_fill_3 (iobufferk *k) { - register int r = splice(k->fd[0], 0, k->p[1], 0, IOBUFFERK_SIZE - k->n, k->nb & 1 ? SPLICE_F_NONBLOCK : 0) ; + ssize_t r = splice(k->fd[0], 0, k->p[1], 0, IOBUFFERK_SIZE - k->n, k->nb & 1 ? SPLICE_F_NONBLOCK : 0) ; if (r > 0) k->n += r ; if ((r < 0) && (errno == EINVAL)) errno = ENOSYS ; return r ; } -iobufferk_io_func_t_ref const iobufferk_fill_f[4] = +iobufferk_input_func_t_ref const iobufferk_fill_f[4] = { &iobufferk_tee, &iobufferk_splice, &iobufferk_splice, &iobufferk_fill_3 } ; @@ -41,9 +41,15 @@ iobufferk_io_func_t_ref const iobufferk_fill_f[4] = #include <skalibs/iobuffer.h> -iobufferk_io_func_t_ref const iobufferk_fill_f[4] = +static ssize_t iobufferk_inosys (iobufferk *k) { - &iobufferk_nosys, &iobufferk_nosys, &iobufferk_nosys, &iobufferk_nosys + (void)k ; + return (errno = ENOSYS, -1) ; +} + +iobufferk_input_func_t_ref const iobufferk_fill_f[4] = +{ + &iobufferk_inosys, &iobufferk_inosys, &iobufferk_inosys, &iobufferk_inosys } ; #endif |