From 7efb5d467368ea9168cebc2473bc3c6942e031bb Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Mon, 28 Oct 2019 22:54:16 -0700 Subject: Rename symbol set_cloexec to sway_set_cloexec, remove duplicates. set_cloexec is defined by both sway and wlroots (and who-knows-else), so rename the sway one for supporting static linkage. We also remove the duplicate version of this in client/. Fixes: https://github.com/swaywm/sway/issues/4677 --- client/pool-buffer.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'client') diff --git a/client/pool-buffer.c b/client/pool-buffer.c index 836c6b13..fd500c49 100644 --- a/client/pool-buffer.c +++ b/client/pool-buffer.c @@ -11,19 +11,7 @@ #include #include "config.h" #include "pool-buffer.h" - -static bool set_cloexec(int fd) { - long flags = fcntl(fd, F_GETFD); - if (flags == -1) { - return false; - } - - if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) { - return false; - } - - return true; -} +#include "util.h" static int create_pool_file(size_t size, char **name) { static const char template[] = "sway-client-XXXXXX"; @@ -46,7 +34,7 @@ static int create_pool_file(size_t size, char **name) { return -1; } - if (!set_cloexec(fd)) { + if (!sway_set_cloexec(fd, true)) { close(fd); return -1; } -- cgit v1.2.3