diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-06 17:51:14 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-06 17:51:14 +0000 |
commit | 6319ac5225aec738f134f338f68109822581bff1 (patch) | |
tree | 17e827cff6841eaae0de6b0b733ee2e8958cc9e0 /src/libunixonacid/unixmessage_receiver_init.c | |
parent | 5d6810d9eb833f923f1543fbb369823f7cd289df (diff) | |
download | skalibs-6319ac5225aec738f134f338f68109822581bff1.tar.xz |
Rewrite unixmessage_receiver without buffer, only cbuffer
Diffstat (limited to 'src/libunixonacid/unixmessage_receiver_init.c')
-rw-r--r-- | src/libunixonacid/unixmessage_receiver_init.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libunixonacid/unixmessage_receiver_init.c b/src/libunixonacid/unixmessage_receiver_init.c index 982547c..5f702cf 100644 --- a/src/libunixonacid/unixmessage_receiver_init.c +++ b/src/libunixonacid/unixmessage_receiver_init.c @@ -1,17 +1,17 @@ /* ISC license. */ #include <errno.h> -#include <skalibs/buffer.h> #include <skalibs/cbuffer.h> #include <skalibs/stralloc.h> #include <skalibs/unixmessage.h> int unixmessage_receiver_init (unixmessage_receiver_t *b, int fd, char *mainbuf, unsigned int mainlen, char *auxbuf, unsigned int auxlen) { - if (mainlen < 9 || auxlen < UNIXMESSAGE_MAXFDS * sizeof(int) + 1) return (errno = EINVAL, 0) ; - if (!cbuffer_init(&b->auxb, auxbuf, auxlen)) return 0 ; - if (!buffer_init_aux(&b->mainb, &unixmessage_read, fd, mainbuf, mainlen, &b->auxb)) return 0 ; - b->mainlen = b->auxlen = b->auxw = 0 ; - b->data = stralloc_zero ; + if (!cbuffer_init(&b->mainb, mainbuf, mainlen) + || !cbuffer_init(&b->auxb, auxbuf, auxlen)) return 0 ; + b->fd = fd ; + b->mainlen = b->auxlen = 0 ; + b->maindata = stralloc_zero ; + b->auxdata = stralloc_zero ; return 1 ; } |