Prepare for 0.1.0.3, adapt to skalibs-2.11.0.0

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

11 files changed, 19 insertions, 19 deletions

diff --git a/src/include/utmps/utmps.h b/src/include/utmps/utmps.h
index e4760f9..9894276 100644
--- a/src/include/utmps/utmps.h
+++ b/src/include/utmps/utmps.h
@@ -13,23 +13,23 @@ struct utmps_s
 } ;
 #define UTMPS_ZERO { .fd = -1 }
 
-extern int utmps_start (utmps *, char const *, tain_t const *, tain_t *) ;
+extern int utmps_start (utmps *, char const *, tain const *, tain *) ;
 #define utmps_start_g(a, s, deadline) utmps_start(a, s, (deadline), &STAMP)
 
 extern void utmps_end (utmps *) ;
 
-extern int utmps_rewind (utmps *, tain_t const *, tain_t *) ;
+extern int utmps_rewind (utmps *, tain const *, tain *) ;
 #define utmps_rewind_g (a, deadline) utmps_rewind(a, (deadline), &STAMP)
-extern int utmps_getent (utmps *, struct utmpx *, tain_t const *, tain_t *) ;
+extern int utmps_getent (utmps *, struct utmpx *, tain const *, tain *) ;
 #define utmps_getent_g (a, b, deadline) utmps_getent(a, b, (deadline), &STAMP)
-extern int utmps_getid (utmps *, unsigned short, char const *, struct utmpx *, tain_t const *, tain_t *) ;
+extern int utmps_getid (utmps *, unsigned short, char const *, struct utmpx *, tain const *, tain *) ;
 #define utmps_getid_g(a, type, id, b, deadline) utmps_getid(a, type, id, b, (deadline), &STAMP)
-extern int utmps_getline (utmps *, char const *, struct utmpx *, tain_t const *, tain_t *) ;
+extern int utmps_getline (utmps *, char const *, struct utmpx *, tain const *, tain *) ;
 #define utmps_getline_g(a, line, b, deadline) utmps_getline(a, line, b, (deadline), &STAMP)
-extern int utmps_putline (utmps *, struct utmpx const *, tain_t const *, tain_t *) ;
+extern int utmps_putline (utmps *, struct utmpx const *, tain const *, tain *) ;
 #define utmps_putline_g(a, entry, deadline) utmps_putline(a, entry, (deadine), &STAMP)
 
-extern int utmps_updwtmpx (char const *, struct utmpx const *, tain_t const *, tain_t *) ;
+extern int utmps_updwtmpx (char const *, struct utmpx const *, tain const *, tain *) ;
 #define utmps_updwtmpx_g(file, b, deadline) utmps_updwtmpx(file, b, (deadline), &STAMP)
 
 #endif
diff --git a/src/utmps/logwtmp.c b/src/utmps/logwtmp.c
index 83cd177..7294a7d 100644
--- a/src/utmps/logwtmp.c
+++ b/src/utmps/logwtmp.c
@@ -14,7 +14,7 @@ void logwtmp (char const *line, char const *name, char const *host)
   strncpy(b.ut_host, host, UTMPS_UT_HOSTSIZE - 1) ;
   b.ut_pid = getpid() ;
   {
-    tain_t now ;
+    tain now ;
     tain_wallclock_read(&now) ;
     timeval_from_tain(&b.ut_tv, &now) ;
   }
diff --git a/src/utmps/utmps-utmpd.c b/src/utmps/utmps-utmpd.c
index e40d244..ec82f2e 100644
--- a/src/utmps/utmps-utmpd.c
+++ b/src/utmps/utmps-utmpd.c
@@ -24,7 +24,7 @@ static int fd = -1 ;
 
 static void get0 (char *s, size_t n)
 {
-  tain_t deadline ;
+  tain deadline ;
   tain_ulong(&deadline, 30) ;
   tain_add_g(&deadline, &deadline) ;
   if (buffer_timed_get_g(buffer_0small, s, n, &deadline) < n)
@@ -33,7 +33,7 @@ static void get0 (char *s, size_t n)
 
 static void flush1 (void)
 {
-  tain_t deadline ;
+  tain deadline ;
   tain_ulong(&deadline, 30) ;
   tain_add_g(&deadline, &deadline) ;
   if (!buffer_timed_flush_g(buffer_1small, &deadline))
@@ -246,7 +246,7 @@ int main (void)
 
   for (;;)
   {
-    tain_t deadline ;
+    tain deadline ;
     char c ;
     tain_add_g(&deadline, &tain_infinite_relative) ;
     if (!buffer_timed_get_g(buffer_0small, &c, 1, &deadline)) break ;
diff --git a/src/utmps/utmps-wtmpd.c b/src/utmps/utmps-wtmpd.c
index b8639f8..7ca3eff 100644
--- a/src/utmps/utmps-wtmpd.c
+++ b/src/utmps/utmps-wtmpd.c
@@ -29,7 +29,7 @@ int main (void)
 {
   struct utmpx b ;
   char const *x ;
-  tain_t deadline ;
+  tain deadline ;
   size_t w ;
   uid_t uid ;
   int fd ;
diff --git a/src/utmps/utmps_getent.c b/src/utmps/utmps_getent.c
index 2b21b04..7b98c34 100644
--- a/src/utmps/utmps_getent.c
+++ b/src/utmps/utmps_getent.c
@@ -7,7 +7,7 @@
 #include <utmps/utmps.h>
 #include "utmps-internal.h"
 
-int utmps_getent (utmps *a, struct utmpx *b, tain_t const *deadline, tain_t *stamp)
+int utmps_getent (utmps *a, struct utmpx *b, tain const *deadline, tain *stamp)
 {
   ssize_t r ;
   char buf[1 + sizeof(struct utmpx)] ;
diff --git a/src/utmps/utmps_getid.c b/src/utmps/utmps_getid.c
index f347b3e..b07b989 100644
--- a/src/utmps/utmps_getid.c
+++ b/src/utmps/utmps_getid.c
@@ -9,7 +9,7 @@
 #include <utmps/utmps.h>
 #include "utmps-internal.h"
 
-int utmps_getid (utmps *a, unsigned short type, char const *id, struct utmpx *b, tain_t const *deadline, tain_t *stamp)
+int utmps_getid (utmps *a, unsigned short type, char const *id, struct utmpx *b, tain const *deadline, tain *stamp)
 {
   ssize_t r ;
   char sbuf[1 + USHORT_PACK + UTMPS_UT_IDSIZE] __attribute__ ((nonstring)) ;
diff --git a/src/utmps/utmps_getline.c b/src/utmps/utmps_getline.c
index 686782a..cb7c984 100644
--- a/src/utmps/utmps_getline.c
+++ b/src/utmps/utmps_getline.c
@@ -8,7 +8,7 @@
 #include <utmps/utmps.h>
 #include "utmps-internal.h"
 
-int utmps_getline (utmps *a, char const *line, struct utmpx *b, tain_t const *deadline, tain_t *stamp)
+int utmps_getline (utmps *a, char const *line, struct utmpx *b, tain const *deadline, tain *stamp)
 {
   ssize_t r ;
   char sbuf[1 + UTMPS_UT_LINESIZE] __attribute__ ((nonstring)) ;
diff --git a/src/utmps/utmps_putline.c b/src/utmps/utmps_putline.c
index 306fa1b..04ed540 100644
--- a/src/utmps/utmps_putline.c
+++ b/src/utmps/utmps_putline.c
@@ -8,7 +8,7 @@
 #include <utmps/utmps.h>
 #include "utmps-internal.h"
 
-int utmps_putline (utmps *a, struct utmpx const *b, tain_t const *deadline, tain_t *stamp)
+int utmps_putline (utmps *a, struct utmpx const *b, tain const *deadline, tain *stamp)
 {
   ssize_t r ;
   char buf[1 + sizeof(struct utmpx)] = "E" ;
diff --git a/src/utmps/utmps_rewind.c b/src/utmps/utmps_rewind.c
index 371cb0d..fe3c8ed 100644
--- a/src/utmps/utmps_rewind.c
+++ b/src/utmps/utmps_rewind.c
@@ -6,7 +6,7 @@
 #include <utmps/utmps.h>
 #include "utmps-internal.h"
 
-int utmps_rewind (utmps *a, tain_t const *deadline, tain_t *stamp)
+int utmps_rewind (utmps *a, tain const *deadline, tain *stamp)
 {
   ssize_t r ;
   char c ;
diff --git a/src/utmps/utmps_start.c b/src/utmps/utmps_start.c
index 1284821..3f2d8a1 100644
--- a/src/utmps/utmps_start.c
+++ b/src/utmps/utmps_start.c
@@ -4,7 +4,7 @@
 #include <skalibs/socket.h>
 #include <utmps/utmps.h>
 
-int utmps_start (utmps *a, char const *path, tain_t const *deadline, tain_t *stamp)
+int utmps_start (utmps *a, char const *path, tain const *deadline, tain *stamp)
 {
   int fd = ipc_stream_nbcoe() ;
   if (fd < 0) return 0 ;
diff --git a/src/utmps/utmps_updwtmpx.c b/src/utmps/utmps_updwtmpx.c
index 55811c4..5b0557e 100644
--- a/src/utmps/utmps_updwtmpx.c
+++ b/src/utmps/utmps_updwtmpx.c
@@ -7,7 +7,7 @@
 #include <utmps/utmps.h>
 #include "utmps-internal.h"
 
-int utmps_updwtmpx (char const *path, struct utmpx const *b, tain_t const *deadline, tain_t *stamp)
+int utmps_updwtmpx (char const *path, struct utmpx const *b, tain const *deadline, tain *stamp)
 {
   utmps a = UTMPS_ZERO ;
   ssize_t r ;