skalibs

commit d75b3c29729522e0698ed17be2079465c0c72da5
parent 520488b020d41b97b45465c0d86740c0354b996e
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Fri,  5 Dec 2014 14:46:57 +0000

Add skagetln_nofill

Diffstat:
M
package/deps.mak
 | 
8
+++-----
M
src/include/skalibs/skamisc.h
 | 
1
+
M
src/libstddjb/skagetln.c
 | 
12
++----------
A
src/libstddjb/skagetln_nofill.c
 | 
19
+++++++++++++++++++

4 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/package/deps.mak b/package/deps.mak
@@ -21,7 +21,6 @@ src/include/skalibs/djbtime.h: src/include/skalibs/config.h src/include/skalibs/
 src/include/skalibs/djbunix.h: src/include/skalibs/env.h src/include/skalibs/envalloc.h src/include/skalibs/gccattributes.h src/include/skalibs/stralloc.h src/include/skalibs/uint64.h
 src/include/skalibs/env.h: src/include/skalibs/gccattributes.h src/include/skalibs/stralloc.h
 src/include/skalibs/envalloc.h: src/include/skalibs/genalloc.h
-src/include/skalibs/error.h: src/include/skalibs/gccattributes.h
 src/include/skalibs/fmtscan.h: src/include/skalibs/gccattributes.h src/include/skalibs/uint32.h
 src/include/skalibs/genalloc.h: src/include/skalibs/functypes.h src/include/skalibs/stralloc.h
 src/include/skalibs/genset.h: src/include/skalibs/functypes.h
@@ -50,9 +49,6 @@ src/include/skalibs/strerr.h: src/include/skalibs/gccattributes.h
 src/include/skalibs/strerr2.h: src/include/skalibs/strerr.h
 src/include/skalibs/surf.h: src/include/skalibs/uint32.h
 src/include/skalibs/tai.h: src/include/skalibs/gccattributes.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h
-src/include/skalibs/uint.h: src/include/skalibs/uint32.h
-src/include/skalibs/uint16.h: src/include/skalibs/uint64.h
-src/include/skalibs/uint32.h: src/include/skalibs/uint64.h
 src/include/skalibs/unirandom.h: src/include/skalibs/buffer.h src/include/skalibs/surf.h
 src/include/skalibs/unirandomdev.h: src/include/skalibs/unirandom.h
 src/include/skalibs/unirandomegd.h: src/include/skalibs/unirandom.h
@@ -493,7 +489,8 @@ src/libstddjb/siovec_gather.o src/libstddjb/siovec_gather.lo: src/libstddjb/siov
 src/libstddjb/siovec_len.o src/libstddjb/siovec_len.lo: src/libstddjb/siovec_len.c src/include/skalibs/siovec.h
 src/libstddjb/siovec_scatter.o src/libstddjb/siovec_scatter.lo: src/libstddjb/siovec_scatter.c src/include/skalibs/bytestr.h src/include/skalibs/siovec.h
 src/libstddjb/siovec_seek.o src/libstddjb/siovec_seek.lo: src/libstddjb/siovec_seek.c src/include/skalibs/bytestr.h src/include/skalibs/siovec.h
-src/libstddjb/skagetln.o src/libstddjb/skagetln.lo: src/libstddjb/skagetln.c src/include/skalibs/buffer.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h
+src/libstddjb/skagetln.o src/libstddjb/skagetln.lo: src/libstddjb/skagetln.c src/include/skalibs/buffer.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h
+src/libstddjb/skagetln_nofill.o src/libstddjb/skagetln_nofill.lo: src/libstddjb/skagetln_nofill.c src/include/skalibs/buffer.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h
 src/libstddjb/skagetlnsep.o src/libstddjb/skagetlnsep.lo: src/libstddjb/skagetlnsep.c src/include/skalibs/buffer.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h
 src/libstddjb/skasig_dfl.o src/libstddjb/skasig_dfl.lo: src/libstddjb/skasig_dfl.c src/include/skalibs/sig.h
 src/libstddjb/skasigaction.o src/libstddjb/skasigaction.lo: src/libstddjb/skasigaction.c src/include/skalibs/sig.h src/include/skalibs/sysdeps.h
@@ -619,6 +616,7 @@ src/libstddjb/tain_to_millisecs.o src/libstddjb/tain_to_millisecs.lo: src/libstd
 src/libstddjb/tain_ulong.o src/libstddjb/tain_ulong.lo: src/libstddjb/tain_ulong.c src/include/skalibs/tai.h
 src/libstddjb/tain_unpack.o src/libstddjb/tain_unpack.lo: src/libstddjb/tain_unpack.c src/include/skalibs/tai.h src/include/skalibs/uint32.h
 src/libstddjb/tain_unpack_little.o src/libstddjb/tain_unpack_little.lo: src/libstddjb/tain_unpack_little.c src/include/skalibs/tai.h src/include/skalibs/uint32.h
+src/libstddjb/tain_zero.o src/libstddjb/tain_zero.lo: src/libstddjb/tain_zero.c src/include/skalibs/tai.h
 src/libstddjb/timespec_from_tai.o src/libstddjb/timespec_from_tai.lo: src/libstddjb/timespec_from_tai.c src/include/skalibs/tai.h
 src/libstddjb/timespec_from_tai_relative.o src/libstddjb/timespec_from_tai_relative.lo: src/libstddjb/timespec_from_tai_relative.c src/include/skalibs/sysdeps.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
 src/libstddjb/timespec_from_tain.o src/libstddjb/timespec_from_tain.lo: src/libstddjb/timespec_from_tain.c src/include/skalibs/tai.h
diff --git a/src/include/skalibs/skamisc.h b/src/include/skalibs/skamisc.h
@@ -9,6 +9,7 @@
 extern stralloc satmp ;
 
 extern int skagetln (buffer *, stralloc *, char) ;
+extern int skagetln_nofill (buffer *, stralloc *, char) ;
 extern int skagetlnsep (buffer *, stralloc *, char const *, unsigned int) ;
 extern int getlnmax (buffer *, char *, unsigned int, unsigned int *, char) ;
 extern int getlnmaxsep (buffer *, char *, unsigned int, unsigned int *, char const *, unsigned int) ;
diff --git 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 ;
diff --git a/src/libstddjb/skagetln_nofill.c b/src/libstddjb/skagetln_nofill.c
@@ -0,0 +1,19 @@
+/* ISC license. */
+
+#include <skalibs/buffer.h>
+#include <skalibs/siovec.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/skamisc.h>
+
+int skagetln_nofill (buffer *b, stralloc *sa, char sep)
+{
+  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 ;
+  return r ;
+}