X-Git-Url: http://git.madism.org/?p=apps%2Fpfixtools.git;a=blobdiff_plain;f=common%2Fbuffer.c;h=0ef465cef79979144f831e1d71f974a850dc5a3b;hp=bfd8ba0c5518ba6f8748beee97788f6e739f5e8a;hb=59b8220d0227fe68537a563b3e5fa2e63e26bc0d;hpb=d55fa4e011ac7d3cfc6348cea4e06f1a8c807613 diff --git a/common/buffer.c b/common/buffer.c index bfd8ba0..0ef465c 100644 --- a/common/buffer.c +++ b/common/buffer.c @@ -40,9 +40,9 @@ #include "mem.h" #include "buffer.h" -ssize_t buffer_addvf(buffer_t *buf, const char *fmt, va_list ap) +int buffer_addvf(buffer_t *buf, const char *fmt, va_list ap) { - ssize_t len, avail = buf->size - buf->len; + int len, avail = buf->size - buf->len; va_list ap2; va_copy(ap2, ap); @@ -59,12 +59,12 @@ ssize_t buffer_addvf(buffer_t *buf, const char *fmt, va_list ap) return len; } -void buffer_consume(buffer_t *buf, ssize_t len) +void buffer_consume(buffer_t *buf, int len) { if (len <= 0) return; - if (len >= (ssize_t)buf->len) { + if (len >= (int)buf->len) { buffer_reset(buf); return; } @@ -73,9 +73,9 @@ void buffer_consume(buffer_t *buf, ssize_t len) buf->len -= len; } -ssize_t buffer_read(buffer_t *buf, int fd, ssize_t count) +int buffer_read(buffer_t *buf, int fd, int count) { - ssize_t res; + int res; if (count < 0) count = BUFSIZ; @@ -92,9 +92,9 @@ ssize_t buffer_read(buffer_t *buf, int fd, ssize_t count) return res; } -ssize_t buffer_write(buffer_t *buf, int fd) +int buffer_write(buffer_t *buf, int fd) { - ssize_t res = write(fd, buf->data, buf->len); + int res = write(fd, buf->data, buf->len); if (res < 0) { return errno == EINTR || errno == EAGAIN ? 0 : -1; }