From 8e22cbe9d3f821598a2eb9dea387c6b413f76105 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 10 Nov 2024 04:28:17 +0000 Subject: Don't step on POSIX remove() is in stdio.h, which bionic pulls. lol @ bionic. Signed-off-by: Laurent Bercot --- src/libs6/s6-ftrigrd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs6/s6-ftrigrd.c b/src/libs6/s6-ftrigrd.c index 903619c..5b5ffd9 100644 --- a/src/libs6/s6-ftrigrd.c +++ b/src/libs6/s6-ftrigrd.c @@ -85,7 +85,7 @@ static void answer (unsigned char c) } } -static void remove (size_t i) +static void ftrigio_remove (size_t i) { size_t n = genalloc_len(ftrigio, &g) ; ftrigio *a = genalloc_s(ftrigio, &g) ; @@ -143,7 +143,7 @@ static int parse_protocol (struct iovec const *v, void *context) for (; i < n ; i++) if (genalloc_s(ftrigio, &g)[i].id == id) break ; if (i < n) { - remove(i) ; + ftrigio_remove(i) ; answer(0) ; } else answer(EINVAL) ; @@ -274,7 +274,7 @@ int main (void) { ftrigio *p = genalloc_s(ftrigio, &g) + i ; if (x[p->xindex].revents & IOPAUSE_READ) - if (!ftrigio_read(p)) remove(i--) ; + if (!ftrigio_read(p)) ftrigio_remove(i--) ; } /* client is writing */ -- cgit v1.2.3