Adapt to skalibs-2.11.0.0

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

17 files changed, 21 insertions, 21 deletions

diff --git a/src/libwpactrl/wpactrl-internal.h b/src/libwpactrl/wpactrl-internal.h
index 50f2fbd..07d417d 100644
--- a/src/libwpactrl/wpactrl-internal.h
+++ b/src/libwpactrl/wpactrl-internal.h
@@ -13,7 +13,7 @@
 #define WPACTRL_RECV_MAX 32
 
 extern ssize_t wpactrl_fd_recv (int, char *, size_t) ;
-extern ssize_t wpactrl_fd_timed_recv (int, char *, size_t, tain_t const *, tain_t *) ;
+extern ssize_t wpactrl_fd_timed_recv (int, char *, size_t, tain const *, tain *) ;
 extern size_t wpactrl_filter_exact_search (wpactrl_t const *, char const *) gccattr_pure ;
 
 extern size_t wpactrl_xchgset_find (wpactrl_t const *, uint32_t) ;
diff --git a/src/libwpactrl/wpactrl_addnetwork.c b/src/libwpactrl/wpactrl_addnetwork.c
index 65e5963..7dfd7a4 100644
--- a/src/libwpactrl/wpactrl_addnetwork.c
+++ b/src/libwpactrl/wpactrl_addnetwork.c
@@ -6,7 +6,7 @@
 #include <skalibs/error.h>
 #include <bcnm/wpactrl.h>
 
-int wpactrl_addnetwork (wpactrl_t *a, uint32_t *id, tain_t *stamp)
+int wpactrl_addnetwork (wpactrl_t *a, uint32_t *id, tain *stamp)
 {
   char buf[UINT32_FMT] ;
   if (wpactrl_query(a, "ADD_NETWORK", buf, UINT32_FMT, stamp) < 0) return 0 ;
diff --git a/src/libwpactrl/wpactrl_associate.c b/src/libwpactrl/wpactrl_associate.c
index 08f3656..ae82112 100644
--- a/src/libwpactrl/wpactrl_associate.c
+++ b/src/libwpactrl/wpactrl_associate.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <bcnm/wpactrl.h>
 
-int wpactrl_associate (wpactrl_t *a, char const *ssid, char const *psk, tain_t *stamp)
+int wpactrl_associate (wpactrl_t *a, char const *ssid, char const *psk, tain *stamp)
 {
   uint32_t id ;
   int r = wpactrl_findnetwork(a, ssid, &id, stamp) ;
diff --git a/src/libwpactrl/wpactrl_command.c b/src/libwpactrl/wpactrl_command.c
index d10e346..a20fe9d 100644
--- a/src/libwpactrl/wpactrl_command.c
+++ b/src/libwpactrl/wpactrl_command.c
@@ -11,7 +11,7 @@ struct wparesponse_map_s
   wparesponse_t r ;
 } ;
 
-wparesponse_t wpactrl_command (wpactrl_t *a, char const *s, tain_t *stamp)
+wparesponse_t wpactrl_command (wpactrl_t *a, char const *s, tain *stamp)
 {
   static struct wparesponse_map_s const wparesponses[] =
   {
diff --git a/src/libwpactrl/wpactrl_fd_timed_recv.c b/src/libwpactrl/wpactrl_fd_timed_recv.c
index db181c1..dc50a91 100644
--- a/src/libwpactrl/wpactrl_fd_timed_recv.c
+++ b/src/libwpactrl/wpactrl_fd_timed_recv.c
@@ -22,8 +22,8 @@ static ssize_t get (struct blah_s *blah)
   return sanitize_read(wpactrl_fd_recv(blah->fd, blah->s, blah->len)) ;
 }
 
-ssize_t wpactrl_fd_timed_recv (int fd, char *s, size_t len, tain_t const *deadline, tain_t *stamp)
+ssize_t wpactrl_fd_timed_recv (int fd, char *s, size_t len, tain const *deadline, tain *stamp)
 {
   struct blah_s blah = { .fd = fd, .s = s, .len = len } ;
-  return timed_get(&blah, (initfunc_t_ref)&getfd, (getfunc_t_ref)&get, deadline, stamp) ;
+  return timed_get(&blah, (init_func_ref)&getfd, (get_func_ref)&get, deadline, stamp) ;
 }
diff --git a/src/libwpactrl/wpactrl_findnetwork.c b/src/libwpactrl/wpactrl_findnetwork.c
index e5851d0..cb8868f 100644
--- a/src/libwpactrl/wpactrl_findnetwork.c
+++ b/src/libwpactrl/wpactrl_findnetwork.c
@@ -5,7 +5,7 @@
 #include <bcnm/wpactrl.h>
 #include "wpactrl-internal.h"
 
-int wpactrl_findnetwork (wpactrl_t *a, char const *ssid, uint32_t *id, tain_t *stamp)
+int wpactrl_findnetwork (wpactrl_t *a, char const *ssid, uint32_t *id, tain *stamp)
 {
   char buf[WPACTRL_PACKET_MAX] ;
   stralloc sa = STRALLOC_ZERO ;
diff --git a/src/libwpactrl/wpactrl_query.c b/src/libwpactrl/wpactrl_query.c
index b8b42df..0bdf388 100644
--- a/src/libwpactrl/wpactrl_query.c
+++ b/src/libwpactrl/wpactrl_query.c
@@ -5,9 +5,9 @@
 #include <bcnm/wpactrl.h>
 #include "wpactrl-internal.h"
 
-ssize_t wpactrl_query (wpactrl_t *a, char const *q, char *ans, size_t ansmax, tain_t *stamp)
+ssize_t wpactrl_query (wpactrl_t *a, char const *q, char *ans, size_t ansmax, tain *stamp)
 {
-  tain_t deadline ;
+  tain deadline ;
   tain_add(&deadline, stamp, &a->tto) ;
   if (!ipc_timed_send(a->fds, q, strlen(q), &deadline, stamp)) return WPA_ERROR ;
   return wpactrl_fd_timed_recv(a->fds, ans, ansmax, &deadline, stamp) ;
diff --git a/src/libwpactrl/wpactrl_querysa.c b/src/libwpactrl/wpactrl_querysa.c
index 8afaa92..23b3ff2 100644
--- a/src/libwpactrl/wpactrl_querysa.c
+++ b/src/libwpactrl/wpactrl_querysa.c
@@ -5,7 +5,7 @@
 #include <bcnm/wpactrl.h>
 #include "wpactrl-internal.h"
 
-int wpactrl_querysa (wpactrl_t *a, char const *s, stralloc *sa, tain_t *stamp)
+int wpactrl_querysa (wpactrl_t *a, char const *s, stralloc *sa, tain *stamp)
 {
   char buf[WPACTRL_PACKET_MAX] ;
   ssize_t r = wpactrl_query(a, s, buf, WPACTRL_PACKET_MAX, stamp) ;
diff --git a/src/libwpactrl/wpactrl_removenetwork.c b/src/libwpactrl/wpactrl_removenetwork.c
index f943b72..1c4b47d 100644
--- a/src/libwpactrl/wpactrl_removenetwork.c
+++ b/src/libwpactrl/wpactrl_removenetwork.c
@@ -3,7 +3,7 @@
 #include <skalibs/uint32.h>
 #include <bcnm/wpactrl.h>
 
-wparesponse_t wpactrl_removenetwork (wpactrl_t *a, uint32_t id, tain_t *stamp)
+wparesponse_t wpactrl_removenetwork (wpactrl_t *a, uint32_t id, tain *stamp)
 {
   char buf[15 + UINT32_FMT] = "REMOVE_NETWORK " ;
   buf[15 + uint32_fmt(buf + 15, id)] = 0 ;
diff --git a/src/libwpactrl/wpactrl_selectnetwork.c b/src/libwpactrl/wpactrl_selectnetwork.c
index 25842e4..98f9332 100644
--- a/src/libwpactrl/wpactrl_selectnetwork.c
+++ b/src/libwpactrl/wpactrl_selectnetwork.c
@@ -3,7 +3,7 @@
 #include <skalibs/uint32.h>
 #include <bcnm/wpactrl.h>
 
-wparesponse_t wpactrl_selectnetwork (wpactrl_t *a, uint32_t id, tain_t *stamp)
+wparesponse_t wpactrl_selectnetwork (wpactrl_t *a, uint32_t id, tain *stamp)
 {
   char buf[15 + UINT32_FMT] = "SELECT_NETWORK " ;
   buf[15 + uint32_fmt(buf + 15, id)] = 0 ;
diff --git a/src/libwpactrl/wpactrl_setnetworkoption.c b/src/libwpactrl/wpactrl_setnetworkoption.c
index 5b2fdca..9d7e8f8 100644
--- a/src/libwpactrl/wpactrl_setnetworkoption.c
+++ b/src/libwpactrl/wpactrl_setnetworkoption.c
@@ -4,7 +4,7 @@
 #include <skalibs/uint32.h>
 #include <bcnm/wpactrl.h>
 
-wparesponse_t wpactrl_setnetworkoption (wpactrl_t *a, uint32_t id, char const *var, char const *val, tain_t *stamp)
+wparesponse_t wpactrl_setnetworkoption (wpactrl_t *a, uint32_t id, char const *var, char const *val, tain *stamp)
 {
   size_t varlen = strlen(var) ;
   size_t vallen = strlen(val) ;
diff --git a/src/libwpactrl/wpactrl_start.c b/src/libwpactrl/wpactrl_start.c
index 420861b..77f73e8 100644
--- a/src/libwpactrl/wpactrl_start.c
+++ b/src/libwpactrl/wpactrl_start.c
@@ -14,9 +14,9 @@
 #include <bcnm/wpactrl.h>
 #include "wpactrl-internal.h"
 
-int wpactrl_start (wpactrl_t *a, char const *path, unsigned int timeout, tain_t *stamp)
+int wpactrl_start (wpactrl_t *a, char const *path, unsigned int timeout, tain *stamp)
 {
-  tain_t tto, deadline ;
+  tain tto, deadline ;
   int fda, fds ;
   stralloc sa = STRALLOC_ZERO ;
   if (timeout) tain_from_millisecs(&tto, timeout) ;
diff --git a/src/libwpactrl/wpactrl_startscan.c b/src/libwpactrl/wpactrl_startscan.c
index 7ce5f52..4de9a4d 100644
--- a/src/libwpactrl/wpactrl_startscan.c
+++ b/src/libwpactrl/wpactrl_startscan.c
@@ -4,7 +4,7 @@
 #include <bcnm/wpactrl.h>
 #include "wpactrl-internal.h"
 
-static int wpactrl_scan_cb (wpactrl_t *a, char const *s, size_t len, void *aux, tain_t *stamp)
+static int wpactrl_scan_cb (wpactrl_t *a, char const *s, size_t len, void *aux, tain *stamp)
 {
   wpactrl_xchg_cbres_t *res = aux ;
   char buf[WPACTRL_PACKET_MAX] ;
@@ -21,7 +21,7 @@ static wpactrl_xchgitem_t wpactrl_xchgitem_scan =
   .cb = &wpactrl_scan_cb
 } ;
 
-int wpactrl_startscan (wpactrl_t *a, wpactrl_xchg_t *xchg, wpactrl_xchg_cbres_t *res, tain_t const *deadline, tain_t *stamp)
+int wpactrl_startscan (wpactrl_t *a, wpactrl_xchg_t *xchg, wpactrl_xchg_cbres_t *res, tain const *deadline, tain *stamp)
 {
   wparesponse_t r = wpactrl_command(a, "SCAN", stamp) ;
   if (r != WPA_OK && r != WPA_FAILBUSY) return (errno = EIO, 0) ;
diff --git a/src/libwpactrl/wpactrl_xchg_computedeadline.c b/src/libwpactrl/wpactrl_xchg_computedeadline.c
index baaac77..78a3348 100644
--- a/src/libwpactrl/wpactrl_xchg_computedeadline.c
+++ b/src/libwpactrl/wpactrl_xchg_computedeadline.c
@@ -3,7 +3,7 @@
 #include <skalibs/tai.h>
 #include <bcnm/wpactrl.h>
 
-void wpactrl_xchg_computedeadline (wpactrl_xchg_t const *dt, tain_t *deadline)
+void wpactrl_xchg_computedeadline (wpactrl_xchg_t const *dt, tain *deadline)
 {
   if (tain_less(&dt->deadline, deadline)) *deadline = dt->deadline ;
 }
diff --git a/src/libwpactrl/wpactrl_xchg_event.c b/src/libwpactrl/wpactrl_xchg_event.c
index d639d24..23ad93b 100644
--- a/src/libwpactrl/wpactrl_xchg_event.c
+++ b/src/libwpactrl/wpactrl_xchg_event.c
@@ -18,7 +18,7 @@ static inline size_t wpactrl_findmsg (wpactrl_t *a, char const *filter)
   return i ;
 }
 
-int wpactrl_xchg_event (wpactrl_t *a, wpactrl_xchg_t *dt, tain_t *stamp)
+int wpactrl_xchg_event (wpactrl_t *a, wpactrl_xchg_t *dt, tain *stamp)
 {
   size_t pos, len ;
   if (dt->i >= dt->n) return 2 ;
diff --git a/src/libwpactrl/wpactrl_xchg_init.c b/src/libwpactrl/wpactrl_xchg_init.c
index b9d35f0..4a7af1b 100644
--- a/src/libwpactrl/wpactrl_xchg_init.c
+++ b/src/libwpactrl/wpactrl_xchg_init.c
@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <bcnm/wpactrl.h>
 
-void wpactrl_xchg_init (wpactrl_xchg_t *dt, wpactrl_xchgitem_t const *tab, unsigned int n, tain_t const *limit, void *aux)
+void wpactrl_xchg_init (wpactrl_xchg_t *dt, wpactrl_xchgitem_t const *tab, unsigned int n, tain const *limit, void *aux)
 {
   dt->tab = tab ;
   dt->n = n ;
diff --git a/src/libwpactrl/wpactrl_xchg_timeout.c b/src/libwpactrl/wpactrl_xchg_timeout.c
index fd99390..8b80e44 100644
--- a/src/libwpactrl/wpactrl_xchg_timeout.c
+++ b/src/libwpactrl/wpactrl_xchg_timeout.c
@@ -4,7 +4,7 @@
 #include <skalibs/tai.h>
 #include <bcnm/wpactrl.h>
 
-int wpactrl_xchg_timeout (wpactrl_t *a, wpactrl_xchg_t *dt, tain_t const *stamp)
+int wpactrl_xchg_timeout (wpactrl_t *a, wpactrl_xchg_t *dt, tain const *stamp)
 {
   if (!tain_less(stamp, &dt->deadline))
   {