skalibs-2.11.0.0 API change

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

5 files changed, 41 insertions, 41 deletions

diff --git a/src/include/s6/accessrules.h b/src/include/s6/accessrules.h
index c172641..d21096c 100644
--- a/src/include/s6/accessrules.h
+++ b/src/include/s6/accessrules.h
@@ -35,20 +35,20 @@ enum s6_accessrules_result_e
   S6_ACCESSRULES_NOTFOUND = 2
 } ;
 
-typedef s6_accessrules_result_t s6_accessrules_backend_func_t (char const *, size_t, void const *, s6_accessrules_params_t *) ;
-typedef s6_accessrules_backend_func_t *s6_accessrules_backend_func_t_ref ;
+typedef s6_accessrules_result_t s6_accessrules_backend_func (char const *, size_t, void const *, s6_accessrules_params_t *) ;
+typedef s6_accessrules_backend_func *s6_accessrules_backend_func_ref ;
 
-extern s6_accessrules_backend_func_t s6_accessrules_backend_fs ;
-extern s6_accessrules_backend_func_t s6_accessrules_backend_cdb ;
+extern s6_accessrules_backend_func s6_accessrules_backend_fs ;
+extern s6_accessrules_backend_func s6_accessrules_backend_cdb ;
 
-typedef s6_accessrules_result_t s6_accessrules_keycheck_func_t (void const *, void const *, s6_accessrules_params_t *, s6_accessrules_backend_func_t_ref) ;
-typedef s6_accessrules_keycheck_func_t *s6_accessrules_keycheck_func_t_ref ;
+typedef s6_accessrules_result_t s6_accessrules_keycheck_func (void const *, void const *, s6_accessrules_params_t *, s6_accessrules_backend_func_ref) ;
+typedef s6_accessrules_keycheck_func *s6_accessrules_keycheck_func_ref ;
 
-extern s6_accessrules_keycheck_func_t s6_accessrules_keycheck_uidgid ;
-extern s6_accessrules_keycheck_func_t s6_accessrules_keycheck_ip4 ;
-extern s6_accessrules_keycheck_func_t s6_accessrules_keycheck_ip6 ;
-extern s6_accessrules_keycheck_func_t s6_accessrules_keycheck_reversedns ;
-#define s6_accessrules_keycheck_ip46(key, data, params, f) (ip46_is6((ip46_t const *)(key)) ? s6_accessrules_keycheck_ip6(((ip46_t const *)(key))->ip, data, params, f) : s6_accessrules_keycheck_ip4(((ip46_t const *)(key))->ip, data, params, f))
+extern s6_accessrules_keycheck_func s6_accessrules_keycheck_uidgid ;
+extern s6_accessrules_keycheck_func s6_accessrules_keycheck_ip4 ;
+extern s6_accessrules_keycheck_func s6_accessrules_keycheck_ip6 ;
+extern s6_accessrules_keycheck_func s6_accessrules_keycheck_reversedns ;
+#define s6_accessrules_keycheck_ip46(key, data, params, f) (ip46_is6((ip46 const *)(key)) ? s6_accessrules_keycheck_ip6(((ip46 const *)(key))->ip, data, params, f) : s6_accessrules_keycheck_ip4(((ip46 const *)(key))->ip, data, params, f))
 
 extern s6_accessrules_result_t s6_accessrules_uidgid_cdb (uid_t, gid_t, cdb const *, s6_accessrules_params_t *) ;
 extern s6_accessrules_result_t s6_accessrules_uidgid_fs (uid_t, gid_t, char const *, s6_accessrules_params_t *) ;
diff --git a/src/include/s6/ftrigr.h b/src/include/s6/ftrigr.h
index 48a512f..b9360e9 100644
--- a/src/include/s6/ftrigr.h
+++ b/src/include/s6/ftrigr.h
@@ -54,7 +54,7 @@ extern ftrigr1_t const ftrigr1_zero ;
 typedef struct ftrigr_s ftrigr, ftrigr_t, *ftrigr_ref, *ftrigr_t_ref ;
 struct ftrigr_s
 {
-  textclient_t connection ;
+  textclient connection ;
   genalloc list ; /* array of uint16_t */
   size_t head ;
   gensetdyn data ; /* set of ftrigr1_t */
@@ -65,9 +65,9 @@ extern ftrigr_t const ftrigr_zero ;
 
  /* Starting and ending a session */
 
-extern int ftrigr_start (ftrigr_t *, char const *, tain_t const *, tain_t *) ;
+extern int ftrigr_start (ftrigr_t *, char const *, tain const *, tain *) ;
 #define ftrigr_start_g(a, path, deadline) ftrigr_start(a, path, (deadline), &STAMP)
-extern int ftrigr_startf (ftrigr_t *, tain_t const *, tain_t *) ;
+extern int ftrigr_startf (ftrigr_t *, tain const *, tain *) ;
 #define ftrigr_startf_g(a, deadline) ftrigr_startf(a, (deadline), &STAMP)
 extern void ftrigr_end (ftrigr_t *) ;
                     
@@ -86,14 +86,14 @@ extern void ftrigr_ack (ftrigr_t *, size_t) ;
 
 #define FTRIGR_REPEAT 0x0001
 
-extern uint16_t ftrigr_subscribe (ftrigr_t *, char const *, char const *, uint32_t, tain_t const *, tain_t *) ;
+extern uint16_t ftrigr_subscribe (ftrigr_t *, char const *, char const *, uint32_t, tain const *, tain *) ;
 #define ftrigr_subscribe_g(a, path, re, options, deadline) ftrigr_subscribe(a, path, re, options, (deadline), &STAMP)
-extern int ftrigr_unsubscribe (ftrigr_t *, uint16_t, tain_t const *, tain_t *) ;
+extern int ftrigr_unsubscribe (ftrigr_t *, uint16_t, tain const *, tain *) ;
 #define ftrigr_unsubscribe_g(a, id, deadline) ftrigr_unsubscribe(a, id, (deadline), &STAMP)
 
-extern int ftrigr_wait_and (ftrigr_t *, uint16_t const *, unsigned int, tain_t const *, tain_t *) ;
+extern int ftrigr_wait_and (ftrigr_t *, uint16_t const *, unsigned int, tain const *, tain *) ;
 #define ftrigr_wait_and_g(a, list, len, deadline) ftrigr_wait_and(a, list, len, (deadline), &STAMP)
-extern int ftrigr_wait_or  (ftrigr_t *, uint16_t const *, unsigned int, tain_t const *, tain_t *, char *) ;
+extern int ftrigr_wait_or  (ftrigr_t *, uint16_t const *, unsigned int, tain const *, tain *, char *) ;
 #define ftrigr_wait_or_g(a, list, len, deadline, what) ftrigr_wait_or(a, list, len, deadline, &STAMP, what)
 
 #endif
diff --git a/src/include/s6/s6-fdholder.h b/src/include/s6/s6-fdholder.h
index 840c167..62b9ab7 100644
--- a/src/include/s6/s6-fdholder.h
+++ b/src/include/s6/s6-fdholder.h
@@ -15,7 +15,7 @@
 typedef struct s6_fdholder_s s6_fdholder_t, *s6_fdholder_t_ref ;
 struct s6_fdholder_s
 {
-  unixconnection_t connection ;
+  unixconnection connection ;
 } ;
 #define S6_FDHOLDER_ZERO { .connection = UNIXCONNECTION_ZERO } ;
 
@@ -25,19 +25,19 @@ struct s6_fdholder_s
 #define s6_fdholder_init(a, fd) unixconnection_init(&(a)->connection, fd, fd)
 #define s6_fdholder_free(a) unixconnection_free(&(a)->connection)
 
-extern int s6_fdholder_start (s6_fdholder_t *, char const *, tain_t const *, tain_t *) ;
+extern int s6_fdholder_start (s6_fdholder_t *, char const *, tain const *, tain *) ;
 #define s6_fdholder_start_g(a, path, deadline) s6_fdholder_start(a, path, (deadline), &STAMP)
 extern void s6_fdholder_end (s6_fdholder_t *) ;
 
 
  /* Individual fds */
 
-extern int s6_fdholder_store_async (s6_fdholder_t *, int, char const *, tain_t const *) ;
-extern int s6_fdholder_store (s6_fdholder_t *, int, char const *, tain_t const *, tain_t const *, tain_t *) ;
+extern int s6_fdholder_store_async (s6_fdholder_t *, int, char const *, tain const *) ;
+extern int s6_fdholder_store (s6_fdholder_t *, int, char const *, tain const *, tain const *, tain *) ;
 #define s6_fdholder_store_g(a, fd, id, limit, deadline) s6_fdholder_store(a, fd, id, limit, (deadline), &STAMP)
 
 extern int s6_fdholder_delete_async (s6_fdholder_t *, char const *) ;
-extern int s6_fdholder_delete (s6_fdholder_t *, char const *, tain_t const *, tain_t *) ;
+extern int s6_fdholder_delete (s6_fdholder_t *, char const *, tain const *, tain *) ;
 #define s6_fdholder_delete_g(a, id, deadline) s6_fdholder_delete(a, id, (deadline), &STAMP)
 
 typedef struct s6_fdholder_retrieve_result_s s6_fdholder_retrieve_result_t, *s6_fdholder_retrieve_result_t_ref ;
@@ -48,8 +48,8 @@ struct s6_fdholder_retrieve_result_s
 } ;
 
 extern int s6_fdholder_retrieve_maybe_delete_async (s6_fdholder_t *, char const *, int) ;
-extern unixmessage_handler_func_t s6_fdholder_retrieve_cb ;
-extern int s6_fdholder_retrieve_maybe_delete (s6_fdholder_t *, char const *, int, tain_t const *, tain_t *) ;
+extern unixmessage_handler_func s6_fdholder_retrieve_cb ;
+extern int s6_fdholder_retrieve_maybe_delete (s6_fdholder_t *, char const *, int, tain const *, tain *) ;
 #define s6_fdholder_retrieve_maybe_delete_g(a, id, h, deadline) s6_fdholder_retrieve_maybe_delete(a, id, h, (deadline), &STAMP)
 #define s6_fdholder_retrieve(a, id, deadline, stamp) s6_fdholder_retrieve_maybe_delete(a, id, 0, deadline, stamp)
 #define s6_fdholder_retrieve_g(a, id, deadline) s6_fdholder_retrieve(a, id, (deadline), &STAMP)
@@ -65,8 +65,8 @@ struct s6_fdholder_list_result_s
 } ;
 
 extern int s6_fdholder_list_async (s6_fdholder_t *) ;
-extern unixmessage_handler_func_t s6_fdholder_list_cb ;
-extern int s6_fdholder_list (s6_fdholder_t *, stralloc *, tain_t const *, tain_t *) ;
+extern unixmessage_handler_func s6_fdholder_list_cb ;
+extern int s6_fdholder_list (s6_fdholder_t *, stralloc *, tain const *, tain *) ;
 #define s6_fdholder_list_g(a, sa, deadline) s6_fdholder_list(a, sa, (deadline), &STAMP)
 
 
@@ -77,12 +77,12 @@ struct s6_fdholder_fd_s
 {
   char id[S6_FDHOLDER_ID_SIZE + 1] ;
   int fd ;
-  tain_t limit ;
+  tain limit ;
 } ;
 
-extern int s6_fdholder_getdump (s6_fdholder_t *, genalloc *, tain_t const *, tain_t *) ;
+extern int s6_fdholder_getdump (s6_fdholder_t *, genalloc *, tain const *, tain *) ;
 #define s6_fdholder_getdump_g(a, g, deadline) s6_fdholder_getdump(a, g, (deadline), &STAMP)
-extern int s6_fdholder_setdump (s6_fdholder_t *, s6_fdholder_fd_t const *, unsigned int, tain_t const *, tain_t *) ;
+extern int s6_fdholder_setdump (s6_fdholder_t *, s6_fdholder_fd_t const *, unsigned int, tain const *, tain *) ;
 #define s6_fdholder_setdump_g(a, list, n, deadline) s6_fdholder_setdump(a, list, n, (deadline), &STAMP)
 
 #endif
diff --git a/src/include/s6/s6-supervise.h b/src/include/s6/s6-supervise.h
index 6c382d1..9375bec 100644
--- a/src/include/s6/s6-supervise.h
+++ b/src/include/s6/s6-supervise.h
@@ -24,8 +24,8 @@ extern int s6_svc_main (int, char const *const *, char const *, char const *, ch
 typedef struct s6_svstatus_s s6_svstatus_t, *s6_svstatus_t_ref ;
 struct s6_svstatus_s
 {
-  tain_t stamp ;
-  tain_t readystamp ;
+  tain stamp ;
+  tain readystamp ;
   pid_t pid ;
   int wstat ;
   unsigned int flagpaused : 1 ;
@@ -55,14 +55,14 @@ extern void s6_svstatus_unpack (char const *, s6_svstatus_t *) ;
 extern int s6_svstatus_read (char const *, s6_svstatus_t *) ;
 extern int s6_svstatus_write (char const *, s6_svstatus_t const *) ;
 
-extern int s6_supervise_link (char const *, char const *const *, size_t, char const *, uint32_t, tain_t const *, tain_t *) ;
+extern int s6_supervise_link (char const *, char const *const *, size_t, char const *, uint32_t, tain const *, tain *) ;
 #define s6_supervise_link_g(scdir, servicedirs, n, prefix, options, deadline) s6_supervise_link(scdir, servicedirs, n, prefix, options, (deadline), &STAMP)
 extern void s6_supervise_unlink (char const *, char const *, uint32_t) ;
 
 typedef struct s6_dtally_s s6_dtally_t, *s6_dtally_ref ;
 struct s6_dtally_s
 {
-  tain_t stamp ;
+  tain stamp ;
   unsigned char exitcode ;
   unsigned char sig ;
 } ;
diff --git a/src/include/s6/s6lock.h b/src/include/s6/s6lock.h
index a20e020..b1848c7 100644
--- a/src/include/s6/s6lock.h
+++ b/src/include/s6/s6lock.h
@@ -27,7 +27,7 @@
 typedef struct s6lock_s s6lock_t, *s6lock_t_ref ;
 struct s6lock_s
 {
-  textclient_t connection ;
+  textclient connection ;
   genalloc list ; /* array of uint16_t */
   gensetdyn data ; /* set of char */
 } ;
@@ -37,9 +37,9 @@ extern s6lock_t const s6lock_zero ;
 
  /* Starting and ending a session */
 
-extern int s6lock_start (s6lock_t *, char const *, tain_t const *, tain_t *) ;
+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_t const *, tain_t *) ;
+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 *) ;
                     
@@ -56,18 +56,18 @@ extern int s6lock_check (s6lock_t *, uint16_t) ;
 #define S6LOCK_OPTIONS_SH 0x0000U
 #define S6LOCK_OPTIONS_EX 0x0001U
 
-extern int s6lock_acquire (s6lock_t *, uint16_t *, char const *, uint32_t, tain_t const *, tain_t const *, tain_t *) ;
+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_t const *, tain_t *) ;
+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_t const *, tain_t *) ;
+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_t const *, tain_t *) ;
+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