But this day is not today, so screw it. We gotta keep em separated

3 files changed, 0 insertions, 53 deletions

diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index c16ccdf..f1a8370 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -4,7 +4,6 @@ s6rc_db_check_revdeps.o
 s6rc_db_read.o
 s6rc_db_read_sizes.o
 s6rc_db_read_uint32.o
-s6rc_get_major.o
 s6rc_graph_closure.o
 s6rc_graph_clean.o
 s6rc_live_state_size.o
@@ -14,7 +13,6 @@ s6rc_livedir_create.o
 s6rc_livedir_prefix.o
 s6rc_livedir_prefixsize.o
 s6rc_lock.o
-s6rc_read_major.o
 s6rc_read_uint.o
 s6rc_sanitize_dir.o
 s6rc_servicedir_internal.o
diff --git a/src/libs6rc/s6rc_get_major.c b/src/libs6rc/s6rc_get_major.c
deleted file mode 100644
index 3bb9fb1..0000000
--- a/src/libs6rc/s6rc_get_major.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ISC license. */
-
-#include <stdint.h>
-
-#include <skalibs/uint16.h>
-
-#include <s6-rc/s6rc-utils.h>
-
-uint32_t s6rc_get_major (char const *s)
-{
-  size_t len = 0, l ;
-  uint32_t acc = 0 ;
-  uint16_t u ;
-  l = uint16_scan(s + len, &u) ;
-  if (!l || s[len + l++] != '.') return 0 ;
-  len += l ; acc = acc << 16 | u ;
-  l = uint16_scan(s + len, &u) ;
-  if (!l || s[len + l++] != '.') return 0 ;
-  len += l ; acc = acc << 16 | u ;
-  return acc ;
-}
diff --git a/src/libs6rc/s6rc_read_major.c b/src/libs6rc/s6rc_read_major.c
deleted file mode 100644
index 2be5121..0000000
--- a/src/libs6rc/s6rc_read_major.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* ISC license. */
-
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-
-#include <skalibs/uint32.h>
-#include <skalibs/djbunix.h>
-
-#include <s6-rc/s6rc-utils.h>
-
-#include <skalibs/posixishard.h>
-
-uint32_t s6rc_read_major (char const *compiled)
-{
-  size_t clen = strlen(compiled) ;
-  ssize_t r ;
-  uint32_t res ;
-  char tmp[UINT32_FMT] ;
-  char fn[clen + 7] ;
-  memcpy(fn, compiled, clen) ;
-  memcpy(fn + clen, "/major", 7) ;
-  r = openreadnclose(fn, tmp, UINT32_FMT) ;
-  if (r == -1) return errno == ENOENT ? 7 : 0 ; /* up to 0.7.0.0 doesn't have db/major */
-  if (!r) return 0 ;
-  if (tmp[r] != '\n') return (errno = EPROTO, 0) ;
-  tmp[r] = 0 ;
-  if (uint320_scan(tmp, &res) != r) return (errno = EPROTO, 0) ;
-  return res ;
-}