diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-10-26 12:54:25 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-10-26 12:54:25 +0000 |
| commit | 66dc13cea9263457a030ceee508ddb56f18a5a51 (patch) | |
| tree | 780e79102cac45bdb9941a879c9710b2c4c83f56 | |
| parent | 65e6a29abd7413e21cc45470561e0eee2b24549e (diff) | |
| download | s6-66dc13cea9263457a030ceee508ddb56f18a5a51.tar.xz | |
Align on new names of skalibs functions
| -rw-r--r-- | package/deps.mak | 2 | ||||
| -rw-r--r-- | src/libs6/s6_supervise_lock_mode.c | 10 | ||||
| -rw-r--r-- | src/libs6/s6_svc_lock_take.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/package/deps.mak b/package/deps.mak index 9d61497..9d050fa 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -40,8 +40,6 @@ src/fdholder/s6-fdholder-setdump.o src/fdholder/s6-fdholder-setdump.lo: src/fdho src/fdholder/s6-fdholder-store.o src/fdholder/s6-fdholder-store.lo: src/fdholder/s6-fdholder-store.c src/include/s6/s6-fdholder.h src/fdholder/s6-fdholder-transferdump.o src/fdholder/s6-fdholder-transferdump.lo: src/fdholder/s6-fdholder-transferdump.c src/include/s6/s6-fdholder.h src/fdholder/s6-fdholderd.o src/fdholder/s6-fdholderd.lo: src/fdholder/s6-fdholderd.c src/include/s6/accessrules.h src/include/s6/s6-fdholder.h -src/instance/s6-instance-create.o src/instance/s6-instance-create.lo: src/instance/s6-instance-create.c -src/instance/s6-instance-delete.o src/instance/s6-instance-delete.lo: src/instance/s6-instance-delete.c src/libs6/ftrig1_free.o src/libs6/ftrig1_free.lo: src/libs6/ftrig1_free.c src/libs6/ftrig1.h src/libs6/ftrig1_make.o src/libs6/ftrig1_make.lo: src/libs6/ftrig1_make.c src/libs6/ftrig1.h src/libs6/ftrigr1_zero.o src/libs6/ftrigr1_zero.lo: src/libs6/ftrigr1_zero.c src/include/s6/ftrigr.h 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) { |