Remove mentions to s6lock from doc and code.

s6lock has been deleted in the previous major update. There were
still traces of it in the doc, and lock.h still existed, although
non-functional. Clean all that up.

6 files changed, 0 insertions, 89 deletions

diff --git a/.gitignore b/.gitignore
index 0a6a9c1..6070361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,6 @@
 /s6-ftrig-listen
 /s6-ftrig-notify
 /s6-ftrig-wait
-/s6lockd
-/s6lockd-helper
 /s6-cleanfifodir
 /s6-mkfifodir
 /s6-svscan
diff --git a/doc/index.html b/doc/index.html
index feb99e9..1baa6ab 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -309,7 +309,6 @@ synchronization</a>.
 <li><a href="libs6/"><tt>s6/s6.h</tt>, the main entry point</a></li>
 <li><a href="libs6/ftrigw.html">The <tt>ftrigw</tt> library interface</a></li>
 <li><a href="libs6/ftrigr.html">The <tt>ftrigr</tt> library interface</a></li>
-<li><a href="libs6/lock.html">The <tt>s6lock</tt> library interface</a></li>
 <li><a href="libs6/accessrules.html">The <tt>accessrules</tt> library interface</a></li>
 <li><a href="libs6/fdholder.html">The <tt>s6-fdholder</tt> library interface</a></li>
 </ul>
diff --git a/package/deps.mak b/package/deps.mak
index 9a44562..732a35c 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -4,7 +4,6 @@
 
 src/include/s6/compat.h: src/include/s6/config.h
 src/include/s6/ftrigr.h: src/include/s6/config.h
-src/include/s6/lock.h: src/include/s6/config.h
 src/include/s6/s6.h: src/include/s6/accessrules.h src/include/s6/auto.h src/include/s6/compat.h src/include/s6/ftrigr.h src/include/s6/ftrigw.h src/include/s6/lock.h src/include/s6/supervise.h
 src/supervision/s6-svlisten.h: src/include/s6/ftrigr.h
 src/alias/s6-alias-chpst.o src/alias/s6-alias-chpst.lo: src/alias/s6-alias-chpst.c src/include/s6/config.h
@@ -256,10 +255,6 @@ libs6auto.dylib.xyzzy: EXTRA_LIBS := -lexecline -lskarnet
 libs6auto.dylib.xyzzy:src/libs6/s6_auto_write_logger.lo src/libs6/s6_auto_write_logger_tmp.lo src/libs6/s6_auto_write_logrun.lo src/libs6/s6_auto_write_logrun_tmp.lo src/libs6/s6_auto_write_service.lo
 s6-ftrigrd: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
 s6-ftrigrd: src/libs6/s6-ftrigrd.o src/libs6/ftrig1_free.o src/libs6/ftrig1_make.o -lskarnet
-s6lockd: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6lockd: src/libs6/s6lockd.o -lskarnet
-s6lockd-helper: EXTRA_LIBS :=
-s6lockd-helper: src/libs6/s6lockd-helper.o libs6lockd.a.xyzzy -lskarnet
 s6-cleanfifodir: EXTRA_LIBS :=
 s6-cleanfifodir: src/pipe-tools/s6-cleanfifodir.o ${LIBS6} -lskarnet
 s6-ftrig-listen: EXTRA_LIBS := ${EXECLINE_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
diff --git a/src/include/s6/lock.h b/src/include/s6/lock.h
deleted file mode 100644
index 766a0a1..0000000
--- a/src/include/s6/lock.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ISC license. */
-
-#ifndef S6_LOCK_H
-#define S6_LOCK_H
-
-#include <stdint.h>
-
-#include <skalibs/tai.h>
-#include <skalibs/genalloc.h>
-#include <skalibs/gensetdyn.h>
-#include <skalibs/textclient.h>
-
-#include <s6/config.h>
-
-
- /* Constants */
-
-#define S6LOCKD_PROG S6_EXTBINPREFIX "s6lockd"
-#define S6LOCKD_HELPER_PROG S6_LIBEXECPREFIX "s6lockd-helper"
-
-#define S6LOCK_BANNER1 "s6lock v1.0 (b)\n"
-#define S6LOCK_BANNER1_LEN (sizeof S6LOCK_BANNER1 - 1)
-#define S6LOCK_BANNER2 "s6lock v1.0 (a)\n"
-#define S6LOCK_BANNER2_LEN (sizeof S6LOCK_BANNER2 - 1)
-
-
- /* The client handle */
-
-typedef struct s6lock_s s6lock_t, *s6lock_t_ref ;
-struct s6lock_s
-{
-  textclient connection ;
-  genalloc list ; /* array of uint16_t */
-  gensetdyn data ; /* set of unsigned char */
-} ;
-#define S6LOCK_ZERO { .connection = TEXTCLIENT_ZERO, .list = GENALLOC_ZERO, .data = GENSETDYN_INIT(int, 2, 0, 1) }
-extern s6lock_t const s6lock_zero ;
-
-
- /* Starting and ending a session */
-
-extern int s6lock_start (s6lock_t *, char const *, tain const *, tain *) ;
-#define s6lock_start_g(a, ipcpath, deadline) s6lock_start(a, ipcpath, (deadline), &STAMP)
-extern int s6lock_startf (s6lock_t *, char const *, tain const *, tain *) ;
-#define s6lock_startf_g(a, lockdir, deadline) s6lock_startf(a, lockdir, (deadline), &STAMP)
-extern void s6lock_end (s6lock_t *) ;
-                    
-
- /* Asynchronous primitives */
-
-#define s6lock_fd(a) textclient_fd(&(a)->connection)
-extern int s6lock_update (s6lock_t *) ;
-extern int s6lock_check (s6lock_t *, uint16_t) ;
-
-
- /* Synchronous functions */
-
-#define S6LOCK_OPTIONS_SH 0x0000U
-#define S6LOCK_OPTIONS_EX 0x0001U
-
-extern int s6lock_acquire (s6lock_t *, uint16_t *, char const *, uint32_t, tain const *, tain const *, tain *) ;
-#define s6lock_acquire_g(a, id, path, options, limit, deadline) s6lock_acquire(a, id, path, options, limit, (deadline), &STAMP)
-#define s6lock_acquire_sh(a, id, path, limit, deadline, stamp) s6lock_aquire(a, id, path, S6LOCK_OPTIONS_SH, limit, deadline, stamp)
-#define s6lock_acquire_ex(a, id, path, limit, deadline, stamp) s6lock_aquire(a, id, path, S6LOCK_OPTIONS_EX, limit, deadline, stamp)
-#define s6lock_acquire_sh_g(a, id, path, limit, deadline) s6lock_acquire_sh(a, id, path, limit, (deadline), &STAMP)
-#define s6lock_acquire_ex_g(a, id, path, limit, deadline) s6lock_acquire_ex(a, id, path, limit, (deadline), &STAMP)
-extern int s6lock_release (s6lock_t *, uint16_t, tain const *, tain *) ;
-#define s6lock_release_g(a, id, deadline) s6lock_release(a, id, (deadline), &STAMP)
-
-extern int s6lock_wait_and (s6lock_t *, uint16_t const *, unsigned int, tain const *, tain *) ;
-#define s6lock_wait_and_g(a, list, len, deadline) s6lock_wait_and(a, list, len, (deadline), &STAMP)
-extern int s6lock_wait_or  (s6lock_t *, uint16_t const *, unsigned int, tain const *, tain *) ;
-#define s6lock_wait_or_g(a, list, len, deadline) s6lock_wait_or(a, list, len, (deadline), &STAMP)
-
-#endif
diff --git a/src/libs6/deps-exe/s6lockd b/src/libs6/deps-exe/s6lockd
deleted file mode 100755
index 50e2fd6..0000000
--- a/src/libs6/deps-exe/s6lockd
+++ /dev/null
@@ -1,4 +0,0 @@
--lskarnet
-${SOCKET_LIB}
-${SYSCLOCK_LIB}
-${SPAWN_LIB}
diff --git a/src/libs6/deps-exe/s6lockd-helper b/src/libs6/deps-exe/s6lockd-helper
deleted file mode 100755
index 0176a41..0000000
--- a/src/libs6/deps-exe/s6lockd-helper
+++ /dev/null
@@ -1,2 +0,0 @@
-libs6lockd.a.xyzzy
--lskarnet