Adapt to skalibs-2.11.0.0

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

5 files changed, 14 insertions, 14 deletions

diff --git a/src/include/pamela/pamela.h b/src/include/pamela/pamela.h
index ce5a971..58fccc6 100644
--- a/src/include/pamela/pamela.h
+++ b/src/include/pamela/pamela.h
@@ -24,8 +24,8 @@
 
  /* pam_fail_delay */
 
-typedef void pamela_pam_delay_func_t (int, unsigned int, void *) ;
-typedef pamela_pam_delay_func_t *pamela_pam_delay_func_t_ref ;
+typedef void pamela_pam_delay_func (int, unsigned int, void *) ;
+typedef pamela_pam_delay_func *pamela_pam_delay_func_ref ;
 
 
  /* Conversations */
@@ -46,8 +46,8 @@ struct pamela_pam_response_s
 
 extern void pamela_pam_response_free (pamela_pam_response_t *, uint32_t) ;
 
-typedef int pamela_pam_conv_func_t (int, pamela_pam_message_t const **, pamela_pam_response_t **, void *) ;
-typedef pamela_pam_conv_func_t *pamela_pam_conv_func_t_ref ;
+typedef int pamela_pam_conv_func (int, pamela_pam_message_t const **, pamela_pam_response_t **, void *) ;
+typedef pamela_pam_conv_func *pamela_pam_conv_func_ref ;
 
 
  /* Client handle */
@@ -55,11 +55,11 @@ typedef pamela_pam_conv_func_t *pamela_pam_conv_func_t_ref ;
 typedef struct pamela_s pamela_t, *pamela_t_ref ;
 struct pamela_s
 {
-  textmessage_receiver_t in ;
-  textmessage_sender_t out ;
+  textmessage_receiver in ;
+  textmessage_sender out ;
   pid_t pid ;
-  pamela_pam_delay_func_t_ref delayfn ;
-  pamela_pam_conv_func_t_ref convfn ;
+  pamela_pam_delay_func_ref delayfn ;
+  pamela_pam_conv_func_ref convfn ;
   void *aux ;
   char inbuf[PAMELA_BUFSIZE] ;
 } ;
@@ -70,7 +70,7 @@ extern pamela_t const pamela_zero ;
 
  /* User-facing functions */
 
-extern int pamela_startf (pamela_t *, char const *, char const *, pamela_pam_conv_func_t_ref, void *) ;
+extern int pamela_startf (pamela_t *, char const *, char const *, pamela_pam_conv_func_ref, void *) ;
 extern void pamela_end (pamela_t *) ;
 extern int pamela_strerror (pamela_t *, unsigned char, stralloc *) ;
 extern int pamela_getenvlist (pamela_t *, stralloc *) ;
diff --git a/src/pamela/pam_set_item.c b/src/pamela/pam_set_item.c
index 03e08c0..f3c145e 100644
--- a/src/pamela/pam_set_item.c
+++ b/src/pamela/pam_set_item.c
@@ -33,13 +33,13 @@ int pam_set_item (pam_handle_t *pamh, int item_type, void const *item)
     case PAM_FAIL_DELAY :
     {
       int e ;
-      pamh->handle.delayfn = (pamela_pam_delay_func_t_ref)item ;
+      pamh->handle.delayfn = (pamela_pam_delay_func_ref)item ;
       e = pamela_op(&pamh->handle, PAMELA_OP_SETFAILDELAY, 0) ;
       if (e != PAM_SUCCESS) return e ;
       break ;
     }
     case PAM_CONV :
-      pamh->handle.convfn = (pamela_pam_conv_func_t_ref)item ;
+      pamh->handle.convfn = (pamela_pam_conv_func_ref)item ;
       break ;
     case PAM_XAUTHDATA :
       return xauthdata_pack_and_set(&pamh->handle, (struct pam_xauth_data const *)item) ;
diff --git a/src/pamela/pam_start.c b/src/pamela/pam_start.c
index 3847080..9206c64 100644
--- a/src/pamela/pam_start.c
+++ b/src/pamela/pam_start.c
@@ -23,7 +23,7 @@ int pam_start (char const *service_name, char const *user, struct pam_conv const
   a->flagerrcached = a->flagenvcached = 0 ;
   for (unsigned int i = 0 ; i < _PAM_RETURN_VALUES ; i++) a->err[i] = stralloc_zero ;
   for (unsigned int i = 0 ; i < PAM_ITEM_MAX ; i++) a->item[i] = stralloc_zero ;
-  e = pamela_startf(&a->handle, service_name, user, pam_conversation && pam_conversation->conv ? (pamela_pam_conv_func_t_ref)pam_conversation->conv : &pamela_dummy_conv, pam_conversation ? pam_conversation->appdata_ptr : 0) ;
+  e = pamela_startf(&a->handle, service_name, user, pam_conversation && pam_conversation->conv ? (pamela_pam_conv_func_ref)pam_conversation->conv : &pamela_dummy_conv, pam_conversation ? pam_conversation->appdata_ptr : 0) ;
   if (e)
   {
     free(a) ;
diff --git a/src/pamela/pamela_startf.c b/src/pamela/pamela_startf.c
index 4d7ff46..9e054d6 100644
--- a/src/pamela/pamela_startf.c
+++ b/src/pamela/pamela_startf.c
@@ -8,7 +8,7 @@
 #include <pamela/config.h>
 #include <pamela/pamela.h>
 
-int pamela_startf (pamela_t *a, char const *service_name, char const *user, pamela_pam_conv_func_t_ref convfn, void *aux)
+int pamela_startf (pamela_t *a, char const *service_name, char const *user, pamela_pam_conv_func_ref convfn, void *aux)
 {
   char const *argv[4] = { PAMELA_LIBEXECPREFIX "pamelad", service_name, user, 0 } ;
   int fd[2] ;
diff --git a/src/pamela/pamelad.c b/src/pamela/pamelad.c
index 42a08fe..617ca24 100644
--- a/src/pamela/pamelad.c
+++ b/src/pamela/pamelad.c
@@ -315,7 +315,7 @@ int main (int argc, char const *const *argv)
   if (argc < 3) strerr_dieusage(100, USAGE) ;
   if (ndelay_on(0) < 0) strerr_diefu2sys(111, "ndelay_on ", "0") ;
   if (ndelay_on(1) < 0) strerr_diefu2sys(111, "ndelay_on ", "1") ;
-  if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+  if (!sig_altignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ;
 
   if (!getgid())
   {