From 42df0cd80d936fd8b6b8207df08ef321412d7633 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 20 Feb 2019 11:40:19 +0000
Subject:  Adapt to skalibs/posixishard.h

---
 src/clock/s6-sntpclock.c                       | 4 ++--
 src/clock/s6-taiclock.c                        | 3 ++-
 src/libs6net/s6net_ident_reply_get.c           | 4 +++-
 src/libs6net/s6net_ident_reply_parse.c         | 4 +++-
 src/sbearssl/sbearssl_pem_decode_from_buffer.c | 5 ++++-
 src/sbearssl/sbearssl_pem_decode_from_string.c | 5 ++++-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/clock/s6-sntpclock.c b/src/clock/s6-sntpclock.c
index 1044be5..a171dc4 100644
--- a/src/clock/s6-sntpclock.c
+++ b/src/clock/s6-sntpclock.c
@@ -4,12 +4,12 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <errno.h>
-#include <skalibs/error.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/uint64.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/error.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
diff --git a/src/clock/s6-taiclock.c b/src/clock/s6-taiclock.c
index 8ea58c1..f36a047 100644
--- a/src/clock/s6-taiclock.c
+++ b/src/clock/s6-taiclock.c
@@ -4,7 +4,8 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <errno.h>
-#include <skalibs/error.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/allreadwrite.h>
diff --git a/src/libs6net/s6net_ident_reply_get.c b/src/libs6net/s6net_ident_reply_get.c
index f4d2b01..0dc7130 100644
--- a/src/libs6net/s6net_ident_reply_get.c
+++ b/src/libs6net/s6net_ident_reply_get.c
@@ -1,13 +1,15 @@
 /* ISC license. */
 
 #include <errno.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/uint16.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/buffer.h>
-#include <skalibs/error.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/ip46.h>
 #include <skalibs/unix-timed.h>
+
 #include <s6-networking/ident.h>
 
 ssize_t s6net_ident_reply_get (char *s, ip46_t const *remoteip, uint16_t remoteport, ip46_t const *localip, uint16_t localport, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libs6net/s6net_ident_reply_parse.c b/src/libs6net/s6net_ident_reply_parse.c
index 7f2daab..b55793d 100644
--- a/src/libs6net/s6net_ident_reply_parse.c
+++ b/src/libs6net/s6net_ident_reply_parse.c
@@ -2,9 +2,11 @@
 
 #include <string.h>
 #include <errno.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/uint16.h>
 #include <skalibs/bytestr.h>
-#include <skalibs/error.h>
+
 #include <s6-networking/ident.h>
 
 static size_t skipspace (char const *s)
diff --git a/src/sbearssl/sbearssl_pem_decode_from_buffer.c b/src/sbearssl/sbearssl_pem_decode_from_buffer.c
index cacabd9..feed155 100644
--- a/src/sbearssl/sbearssl_pem_decode_from_buffer.c
+++ b/src/sbearssl/sbearssl_pem_decode_from_buffer.c
@@ -2,11 +2,14 @@
 
 #include <sys/uio.h>
 #include <errno.h>
+
 #include <bearssl.h>
-#include <skalibs/error.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/buffer.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
+
 #include <s6-networking/sbearssl.h>
 #include "sbearssl-internal.h"
 
diff --git a/src/sbearssl/sbearssl_pem_decode_from_string.c b/src/sbearssl/sbearssl_pem_decode_from_string.c
index b9f7f15..10819d8 100644
--- a/src/sbearssl/sbearssl_pem_decode_from_string.c
+++ b/src/sbearssl/sbearssl_pem_decode_from_string.c
@@ -1,10 +1,13 @@
 /* ISC license. */
 
 #include <errno.h>
+
 #include <bearssl.h>
-#include <skalibs/error.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
+
 #include <s6-networking/sbearssl.h>
 #include "sbearssl-internal.h"
 
-- 
cgit v1.2.3