summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-10-26 12:54:25 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-10-26 12:54:25 +0000
commit66dc13cea9263457a030ceee508ddb56f18a5a51 (patch)
tree780e79102cac45bdb9941a879c9710b2c4c83f56 /src
parent65e6a29abd7413e21cc45470561e0eee2b24549e (diff)
downloads6-66dc13cea9263457a030ceee508ddb56f18a5a51.tar.xz
Align on new names of skalibs functions
Diffstat (limited to 'src')
-rw-r--r--src/libs6/s6_supervise_lock_mode.c10
-rw-r--r--src/libs6/s6_svc_lock_take.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libs6/s6_supervise_lock_mode.c b/src/libs6/s6_supervise_lock_mode.c
index 710e3ba..b6b0829 100644
--- a/src/libs6/s6_supervise_lock_mode.c
+++ b/src/libs6/s6_supervise_lock_mode.c
@@ -59,23 +59,23 @@ int s6_supervise_lock_mode (char const *subdir, unsigned int subdirmode, unsigne
if (!S_ISFIFO(st.st_mode))
strerr_diefu2x(100, control, " is not a FIFO") ;
}
- fdlock = open_createcoe(lock) ;
+ fdlock = openc_create(lock) ;
if (fdlock < 0)
strerr_diefu2sys(111, "open_create ", lock) ;
if (lock_ex(fdlock) < 0)
strerr_diefu2sys(111, "lock ", lock) ;
- fdctlw = open_writecoe(control) ;
+ fdctlw = openc_write(control) ;
if (fdctlw >= 0) strerr_dief1x(100, "directory already locked") ;
if (errno != ENXIO)
strerr_diefu2sys(111, "open_write ", control) ;
- fdctl = open_readcoe(control) ;
+ fdctl = openc_read(control) ;
if (fdctl < 0)
strerr_diefu2sys(111, "open_read ", control) ;
- fdctlw = open_writecoe(control) ;
+ fdctlw = openc_write(control) ;
if (fdctlw < 0)
strerr_diefu2sys(111, "open_write ", control) ;
fd_close(fdlock) ;
return fdctl ;
- /* fdctlw is leaking. That's okay, it's coe. */
+ /* we leak fdctlw but it's coe. */
}
diff --git a/src/libs6/s6_svc_lock_take.c b/src/libs6/s6_svc_lock_take.c
index a98aeab..fcb098a 100644
--- a/src/libs6/s6_svc_lock_take.c
+++ b/src/libs6/s6_svc_lock_take.c
@@ -17,7 +17,7 @@ int s6_svc_lock_take (char const *dir)
memcpy(lock + dirlen, "/" S6_SUPERVISE_CTLDIR, sizeof(S6_SUPERVISE_CTLDIR) + 1) ;
if ((mkdir(lock, S_IRWXU) < 0) && (errno != EEXIST)) return -1 ;
memcpy(lock + dirlen + sizeof(S6_SUPERVISE_CTLDIR), "/lock", 6) ;
- fdlock = open_createcoe(lock) ;
+ fdlock = openc_create(lock) ;
if (fdlock < 0) return -1 ;
if (lock_ex(fdlock) < 0)
{