s6rc_repo_nlto0 replaced with string_index in skalibs

5 files changed, 6 insertions, 37 deletions

diff --git a/src/repo/deps-lib/s6rcrepo b/src/repo/deps-lib/s6rcrepo
index a3afeb5..7014ea1 100644
--- a/src/repo/deps-lib/s6rcrepo
+++ b/src/repo/deps-lib/s6rcrepo
@@ -20,7 +20,6 @@ s6rc_repo_makestores.o
 s6rc_repo_makesvlist.o
 s6rc_repo_makesvlist_byname.o
 s6rc_repo_moveservices.o
-s6rc_repo_nlto0.o
 s6rc_repo_setcompile.o
 s6rc_repo_setuptodate.o
 s6rc_repo_subnames.o
diff --git a/src/repo/s6rc_repo_flattenservices.c b/src/repo/s6rc_repo_flattenservices.c
index 5693129..cf3dc55 100644
--- a/src/repo/s6rc_repo_flattenservices.c
+++ b/src/repo/s6rc_repo_flattenservices.c
@@ -12,6 +12,7 @@
 #include <skalibs/genalloc.h>
 #include <skalibs/cspawn.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/skamisc.h>
 
 #include <s6-rc/config.h>
 #include <s6-rc/repo.h>
@@ -60,7 +61,7 @@ int s6rc_repo_flattenservices (char const *repo, char const *const *services, ui
     if (WEXITSTATUS(wstat)) return WEXITSTATUS(wstat) ;
   }
 
-  if (!s6rc_repo_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
+  if (!string_index(storage->s + sabase, sabase, storage->len, '\n', indices)) goto err ;
   return 0 ;
 
  err:
diff --git a/src/repo/s6rc_repo_listcontents.c b/src/repo/s6rc_repo_listcontents.c
index e3ffc84..bcfc946 100644
--- a/src/repo/s6rc_repo_listcontents.c
+++ b/src/repo/s6rc_repo_listcontents.c
@@ -12,6 +12,7 @@
 #include <skalibs/genalloc.h>
 #include <skalibs/cspawn.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/skamisc.h>
 
 #include <s6-rc/config.h>
 #include <s6-rc/repo.h>
@@ -55,7 +56,7 @@ int s6rc_repo_listcontents (char const *repo, char const *bundle, stralloc *stor
     return (WEXITSTATUS(wstat) < 99) - 1 ;
   }
 
- if (!s6rc_repo_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
+ if (!string_index(storage->s + sabase, sabase, storage->len, '\n', indices)) goto err ;
  return 1 ;
 
  err:
diff --git a/src/repo/s6rc_repo_listdeps_internal.c b/src/repo/s6rc_repo_listdeps_internal.c
index 6d66796..5af879a 100644
--- a/src/repo/s6rc_repo_listdeps_internal.c
+++ b/src/repo/s6rc_repo_listdeps_internal.c
@@ -12,6 +12,7 @@
 #include <skalibs/genalloc.h>
 #include <skalibs/cspawn.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/skamisc.h>
 
 #include <s6-rc/config.h>
 #include <s6-rc/repo.h>
@@ -61,7 +62,7 @@ int s6rc_repo_listdeps_internal (char const *repo, char const *const *services,
     if (WEXITSTATUS(wstat)) return wait_estatus(wstat) ;
   }
 
- if (!s6rc_repo_nlto0(storage->s + sabase, sabase, storage->len, indices)) goto err ;
+ if (!string_index(storage->s + sabase, sabase, storage->len, '\n', indices)) goto err ;
  return 0 ;
 
  err:
diff --git a/src/repo/s6rc_repo_nlto0.c b/src/repo/s6rc_repo_nlto0.c
deleted file mode 100644
index 9076bd3..0000000
--- a/src/repo/s6rc_repo_nlto0.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ISC license. */
-
-#include <stdint.h>
-
-#include <skalibs/genalloc.h>
-
-#include <s6-rc/repo.h>
-
-int s6rc_repo_nlto0 (char *s, size_t start, size_t len, genalloc *indices)
-{
-  size_t origlen = genalloc_len(size_t, indices) ;
-  size_t pos = start ;
-  int wasnull = !indices->s ;
-  int inword = 0 ;
-
-  for (size_t i = start ; i < len ; i++)
-  {
-    if (s[i] == '\n')
-    {
-      s[i] = 0 ;
-      if (!genalloc_append(size_t, indices, &pos)) goto err ;
-      inword = 0 ;
-    }
-    else if (!inword) { pos = i ; inword = 1 ; }
-  }
-  if (inword) goto err ;
-  return 1 ;
-
- err:
-  if (wasnull) genalloc_free(size_t, indices) ;
-  else genalloc_setlen(size_t, indices, origlen) ;
-  return 0 ;
-}