summaryrefslogtreecommitdiff
path: root/src/libs6/s6lockd.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-08-09 23:42:35 +0000
committerLaurent Bercot <ska@appnovation.com>2021-08-09 23:42:35 +0000
commitaaea6322e9e765969f452764e51ca1ddd9783264 (patch)
tree4e863537677e0266a79c4045c47a5e6b9f64a1a8 /src/libs6/s6lockd.c
parentce2977ee9195612730bc8713f142c95f79605e75 (diff)
downloads6-aaea6322e9e765969f452764e51ca1ddd9783264.tar.xz
skalibs-2.11.0.0 API change
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libs6/s6lockd.c')
-rw-r--r--src/libs6/s6lockd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs6/s6lockd.c b/src/libs6/s6lockd.c
index f2d18f9..764e102 100644
--- a/src/libs6/s6lockd.c
+++ b/src/libs6/s6lockd.c
@@ -30,7 +30,7 @@ struct s6lockio_s
{
unsigned int xindex ;
unsigned int pid ;
- tain_t limit ;
+ tain limit ;
int p[2] ;
uint16_t id ; /* given by client */
} ;
@@ -179,7 +179,7 @@ static int parse_protocol (struct iovec const *v, void *context)
int main (int argc, char const *const *argv)
{
- tain_t deadline ;
+ tain deadline ;
int sfd ;
PROG = "s6lockd" ;
@@ -187,7 +187,7 @@ int main (int argc, char const *const *argv)
if (chdir(argv[1]) < 0) strerr_diefu2sys(111, "chdir to ", argv[1]) ;
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") ;
sfd = selfpipe_init() ;
if (sfd < 0) strerr_diefu1sys(111, "selfpipe_init") ;
@@ -200,7 +200,7 @@ int main (int argc, char const *const *argv)
sigaddset(&set, SIGHUP) ;
sigaddset(&set, SIGABRT) ;
sigaddset(&set, SIGINT) ;
- if (selfpipe_trapset(&set) < 0)
+ if (!selfpipe_trapset(&set))
strerr_diefu1sys(111, "trap signals") ;
}