Adapt to skalibs-2.13.0.0

Signed-off-by: Laurent Bercot <ska@appnovation.com>

41 files changed, 41 insertions, 41 deletions

diff --git a/src/skaembutils/s6-basename.c b/src/skaembutils/s6-basename.c
index 445c7b9..aca585c 100644
--- a/src/skaembutils/s6-basename.c
+++ b/src/skaembutils/s6-basename.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/skaembutils/s6-cat.c b/src/skaembutils/s6-cat.c
index 094342c..8ff5a47 100644
--- a/src/skaembutils/s6-cat.c
+++ b/src/skaembutils/s6-cat.c
@@ -1,6 +1,6 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 int main (void)
diff --git a/src/skaembutils/s6-chmod.c b/src/skaembutils/s6-chmod.c
index 6e05b53..90500b0 100644
--- a/src/skaembutils/s6-chmod.c
+++ b/src/skaembutils/s6-chmod.c
@@ -2,7 +2,7 @@
 
 #include <sys/stat.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-chmod mode file"
 
diff --git a/src/skaembutils/s6-chown.c b/src/skaembutils/s6-chown.c
index 510aadc..33d6e20 100644
--- a/src/skaembutils/s6-chown.c
+++ b/src/skaembutils/s6-chown.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 #define USAGE "s6-chown [ -U ] [ -u uid ] [ -g gid ] file"
diff --git a/src/skaembutils/s6-clock.c b/src/skaembutils/s6-clock.c
index 0ef5e82..20f943a 100644
--- a/src/skaembutils/s6-clock.c
+++ b/src/skaembutils/s6-clock.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/tai.h>
 
 #define USAGE "s6-clock [ tai64nlabel ]"
diff --git a/src/skaembutils/s6-cut.c b/src/skaembutils/s6-cut.c
index a56d402..d111ecd 100644
--- a/src/skaembutils/s6-cut.c
+++ b/src/skaembutils/s6-cut.c
@@ -7,7 +7,7 @@
 #include <skalibs/types.h>
 #include <skalibs/disize.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/djbunix.h>
diff --git a/src/skaembutils/s6-dirname.c b/src/skaembutils/s6-dirname.c
index 7433413..e76f4cc 100644
--- a/src/skaembutils/s6-dirname.c
+++ b/src/skaembutils/s6-dirname.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/skaembutils/s6-dumpenv.c b/src/skaembutils/s6-dumpenv.c
index 53d9f84..4b79170 100644
--- a/src/skaembutils/s6-dumpenv.c
+++ b/src/skaembutils/s6-dumpenv.c
@@ -8,7 +8,7 @@
 #include <skalibs/types.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 #define USAGE "s6-dumpenv [ -N | -n ] [ -m mode ] envdir"
diff --git a/src/skaembutils/s6-echo.c b/src/skaembutils/s6-echo.c
index 87e9321..11427d2 100644
--- a/src/skaembutils/s6-echo.c
+++ b/src/skaembutils/s6-echo.c
@@ -2,7 +2,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-echo [ -n ] [ -s sep ] args..."
 
diff --git a/src/skaembutils/s6-env.c b/src/skaembutils/s6-env.c
index 77858cd..01479ce 100644
--- a/src/skaembutils/s6-env.c
+++ b/src/skaembutils/s6-env.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/env.h>
 #include <skalibs/exec.h>
 
diff --git a/src/skaembutils/s6-expr.c b/src/skaembutils/s6-expr.c
index a36f422..ac5321b 100644
--- a/src/skaembutils/s6-expr.c
+++ b/src/skaembutils/s6-expr.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-expr arithmetic expression"
 #define bail() strerr_dief1x(2, "invalid expression")
diff --git a/src/skaembutils/s6-format-filter.c b/src/skaembutils/s6-format-filter.c
index afe6a21..3d02fc1 100644
--- a/src/skaembutils/s6-format-filter.c
+++ b/src/skaembutils/s6-format-filter.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <errno.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
diff --git a/src/skaembutils/s6-grep.c b/src/skaembutils/s6-grep.c
index 7abdb76..3529977 100644
--- a/src/skaembutils/s6-grep.c
+++ b/src/skaembutils/s6-grep.c
@@ -10,7 +10,7 @@
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
 
diff --git a/src/skaembutils/s6-head.c b/src/skaembutils/s6-head.c
index 217880b..a8eebf3 100644
--- a/src/skaembutils/s6-head.c
+++ b/src/skaembutils/s6-head.c
@@ -10,7 +10,7 @@
 #include <skalibs/types.h>
 #include <skalibs/buffer.h>
 #include <skalibs/siovec.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 #define USAGE "s6-head [ -S ] [ -1..9 | -n lines | -c chars ] [ file... ]"
diff --git a/src/skaembutils/s6-hiercopy.c b/src/skaembutils/s6-hiercopy.c
index 9ba3fd5..f9cb8e5 100644
--- a/src/skaembutils/s6-hiercopy.c
+++ b/src/skaembutils/s6-hiercopy.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <sys/stat.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 #define USAGE "s6-hiercopy src dst"
diff --git a/src/skaembutils/s6-linkname.c b/src/skaembutils/s6-linkname.c
index 329d3c7..8d0865a 100644
--- a/src/skaembutils/s6-linkname.c
+++ b/src/skaembutils/s6-linkname.c
@@ -2,7 +2,7 @@
 
 #include <skalibs/buffer.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/skaembutils/s6-ln.c b/src/skaembutils/s6-ln.c
index 6fab547..f4ce8b4 100644
--- a/src/skaembutils/s6-ln.c
+++ b/src/skaembutils/s6-ln.c
@@ -15,7 +15,7 @@
 
 #include <skalibs/posixplz.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/skamisc.h>
diff --git a/src/skaembutils/s6-ls.c b/src/skaembutils/s6-ls.c
index 9b5ca7e..f6410bd 100644
--- a/src/skaembutils/s6-ls.c
+++ b/src/skaembutils/s6-ls.c
@@ -4,7 +4,7 @@
 #include <skalibs/sgetopt.h>
 #include <skalibs/direntry.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-ls [ -0 ] [ -a | -A ] [ -x exclude ] dir"
 
diff --git a/src/skaembutils/s6-maximumtime.c b/src/skaembutils/s6-maximumtime.c
index f66c32a..6b2621c 100644
--- a/src/skaembutils/s6-maximumtime.c
+++ b/src/skaembutils/s6-maximumtime.c
@@ -11,7 +11,7 @@
 #include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 #include <skalibs/selfpipe.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 #define USAGE "s6-maximumtime [ -0 | -a | -b | -i | -k | -q | -t | -x | -1 | -2 ] milliseconds prog..."
diff --git a/src/skaembutils/s6-mkdir.c b/src/skaembutils/s6-mkdir.c
index 14b6773..3985b5a 100644
--- a/src/skaembutils/s6-mkdir.c
+++ b/src/skaembutils/s6-mkdir.c
@@ -7,7 +7,7 @@
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-mkdir [ -p ] [ -v ] [ -m mode ] dir"
 #define dieusage() strerr_dieusage(100, USAGE)
diff --git a/src/skaembutils/s6-mkfifo.c b/src/skaembutils/s6-mkfifo.c
index 5afff9a..e77028a 100644
--- a/src/skaembutils/s6-mkfifo.c
+++ b/src/skaembutils/s6-mkfifo.c
@@ -3,7 +3,7 @@
 #include <sys/stat.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 #define USAGE "s6-mkfifo [ -m mode ] fifo..."
diff --git a/src/skaembutils/s6-nice.c b/src/skaembutils/s6-nice.c
index 897097a..38017f6 100644
--- a/src/skaembutils/s6-nice.c
+++ b/src/skaembutils/s6-nice.c
@@ -5,7 +5,7 @@
 
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #define USAGE "s6-nice [ -I | -i ] [ -n value ] prog..."
diff --git a/src/skaembutils/s6-nuke.c b/src/skaembutils/s6-nuke.c
index 6b5c12c..361cefc 100644
--- a/src/skaembutils/s6-nuke.c
+++ b/src/skaembutils/s6-nuke.c
@@ -3,7 +3,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sig.h>
 
 #define USAGE "s6-nuke [ -h | -t | -k ]"
diff --git a/src/skaembutils/s6-pause.c b/src/skaembutils/s6-pause.c
index 1895d6a..466eff6 100644
--- a/src/skaembutils/s6-pause.c
+++ b/src/skaembutils/s6-pause.c
@@ -4,7 +4,7 @@
 #include <signal.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sig.h>
 
 #define USAGE "s6-pause [ -t ] [ -h ] [ -a ] [ -q ] [ -b ] [ -i ] [ -p signal,signal... ]"
diff --git a/src/skaembutils/s6-printenv.c b/src/skaembutils/s6-printenv.c
index b96c5d4..f23df4f 100644
--- a/src/skaembutils/s6-printenv.c
+++ b/src/skaembutils/s6-printenv.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/netstring.h>
 
 #define USAGE "s6-printenv [ -n ] [ -0 | -d delimchar ]"
diff --git a/src/skaembutils/s6-quote-filter.c b/src/skaembutils/s6-quote-filter.c
index 226e26b..8319f38 100644
--- a/src/skaembutils/s6-quote-filter.c
+++ b/src/skaembutils/s6-quote-filter.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <errno.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
diff --git a/src/skaembutils/s6-quote.c b/src/skaembutils/s6-quote.c
index 986439e..e9799eb 100644
--- a/src/skaembutils/s6-quote.c
+++ b/src/skaembutils/s6-quote.c
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
diff --git a/src/skaembutils/s6-rename.c b/src/skaembutils/s6-rename.c
index 19fd7e0..48eb42e 100644
--- a/src/skaembutils/s6-rename.c
+++ b/src/skaembutils/s6-rename.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <stdio.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-rename old new"
 
diff --git a/src/skaembutils/s6-rmrf.c b/src/skaembutils/s6-rmrf.c
index 4d57530..ebbf9a0 100644
--- a/src/skaembutils/s6-rmrf.c
+++ b/src/skaembutils/s6-rmrf.c
@@ -1,6 +1,6 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 #define USAGE "s6-rmrf file ..."
diff --git a/src/skaembutils/s6-seq.c b/src/skaembutils/s6-seq.c
index f66cb0e..f0ac49c 100644
--- a/src/skaembutils/s6-seq.c
+++ b/src/skaembutils/s6-seq.c
@@ -4,7 +4,7 @@
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-seq [ -w ] [ -s separator ] limits"
 #define dieusage() strerr_dieusage(100, USAGE)
diff --git a/src/skaembutils/s6-sleep.c b/src/skaembutils/s6-sleep.c
index 8f48679..c5a05b4 100644
--- a/src/skaembutils/s6-sleep.c
+++ b/src/skaembutils/s6-sleep.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/types.h>
 #include <skalibs/tai.h>
 #include <skalibs/iopause.h>
diff --git a/src/skaembutils/s6-sort.c b/src/skaembutils/s6-sort.c
index c44f1a2..f7a7721 100644
--- a/src/skaembutils/s6-sort.c
+++ b/src/skaembutils/s6-sort.c
@@ -7,7 +7,7 @@
 #include <skalibs/allreadwrite.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/djbunix.h>
diff --git a/src/skaembutils/s6-tai64ndiff.c b/src/skaembutils/s6-tai64ndiff.c
index ac6ff68..cb35b4e 100644
--- a/src/skaembutils/s6-tai64ndiff.c
+++ b/src/skaembutils/s6-tai64ndiff.c
@@ -7,7 +7,7 @@
 #include <skalibs/uint32.h>
 #include <skalibs/uint64.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/tai.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
diff --git a/src/skaembutils/s6-tail.c b/src/skaembutils/s6-tail.c
index 68764f5..bee40d1 100644
--- a/src/skaembutils/s6-tail.c
+++ b/src/skaembutils/s6-tail.c
@@ -7,7 +7,7 @@
 #include <skalibs/allreadwrite.h>
 #include <skalibs/types.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/skamisc.h>
 #include <skalibs/siovec.h>
diff --git a/src/skaembutils/s6-test.c b/src/skaembutils/s6-test.c
index d9b74e1..1853fb9 100644
--- a/src/skaembutils/s6-test.c
+++ b/src/skaembutils/s6-test.c
@@ -8,7 +8,7 @@
 
 #include <skalibs/posixplz.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 
 #define USAGE "s6-test expression...  or  [ expression... ]"
diff --git a/src/skaembutils/s6-touch.c b/src/skaembutils/s6-touch.c
index 6aefc43..7c2c156 100644
--- a/src/skaembutils/s6-touch.c
+++ b/src/skaembutils/s6-touch.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/posixplz.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-touch file ..."
 
diff --git a/src/skaembutils/s6-uniquename.c b/src/skaembutils/s6-uniquename.c
index 988179e..479c50d 100644
--- a/src/skaembutils/s6-uniquename.c
+++ b/src/skaembutils/s6-uniquename.c
@@ -3,7 +3,7 @@
 #include <skalibs/allreadwrite.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
 #include <skalibs/random.h>
diff --git a/src/skaembutils/s6-unquote-filter.c b/src/skaembutils/s6-unquote-filter.c
index 0f467eb..d7f340e 100644
--- a/src/skaembutils/s6-unquote-filter.c
+++ b/src/skaembutils/s6-unquote-filter.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
diff --git a/src/skaembutils/s6-unquote.c b/src/skaembutils/s6-unquote.c
index d69d63c..a1df8fa 100644
--- a/src/skaembutils/s6-unquote.c
+++ b/src/skaembutils/s6-unquote.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/skamisc.h>
 
diff --git a/src/skaembutils/s6-update-symlinks.c b/src/skaembutils/s6-update-symlinks.c
index 770827e..87783de 100644
--- a/src/skaembutils/s6-update-symlinks.c
+++ b/src/skaembutils/s6-update-symlinks.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #include <skalibs/direntry.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/random.h>
diff --git a/src/skaembutils/seekablepipe.c b/src/skaembutils/seekablepipe.c
index f6c4059..d3030cd 100644
--- a/src/skaembutils/seekablepipe.c
+++ b/src/skaembutils/seekablepipe.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 
 #include <skalibs/posixplz.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/exec.h>