diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-05 14:46:57 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-05 14:46:57 +0000 |
commit | d75b3c29729522e0698ed17be2079465c0c72da5 (patch) | |
tree | 1122f776c869192e5f39787831a2eb985aba78ca /src/libstddjb/skagetln.c | |
parent | 520488b020d41b97b45465c0d86740c0354b996e (diff) | |
download | skalibs-d75b3c29729522e0698ed17be2079465c0c72da5.tar.xz |
Add skagetln_nofill
Diffstat (limited to 'src/libstddjb/skagetln.c')
-rw-r--r-- | src/libstddjb/skagetln.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/libstddjb/skagetln.c b/src/libstddjb/skagetln.c index 056cc38..05775f6 100644 --- a/src/libstddjb/skagetln.c +++ b/src/libstddjb/skagetln.c @@ -2,7 +2,6 @@ #include <errno.h> #include <skalibs/buffer.h> -#include <skalibs/siovec.h> #include <skalibs/stralloc.h> #include <skalibs/skamisc.h> @@ -11,15 +10,8 @@ int skagetln (buffer *b, stralloc *sa, char sep) unsigned int start = sa->len ; for (;;) { - siovec_t v[2] ; - unsigned int pos ; - int r ; - buffer_rpeek(b, v) ; - pos = siovec_bytechr(v, 2, sep) ; - r = pos < buffer_len(b) ; pos += r ; - if (!stralloc_readyplus(sa, pos)) return -1 ; - buffer_getnofill(b, sa->s + sa->len, pos) ; sa->len += pos ; - if (r) return 1 ; + register int r = skagetln_nofill(b, sa, sep) ; + if (r) return r ; r = buffer_fill(b) ; if (r < 0) return r ; if (!r) return (sa->s && (sa->len > start)) ? (errno = EPIPE, -1) : 0 ; |