tree-wide: introduce PIPE_EBADF macro

diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 530270a73fe00acb083a666b1672299b095e2b5b..1faefe6a0e6b1682f404971183c37ebc1a6f1923 100644 (file)
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -15,6 +15,7 @@
 /* Make sure we can distinguish fd 0 and NULL */
 #define FD_TO_PTR(fd) INT_TO_PTR((fd)+1)
 #define PTR_TO_FD(p) (PTR_TO_INT(p)-1)
+#define PIPE_EBADF { -EBADF, -EBADF }
 
 int close_nointr(int fd);
 int safe_close(int fd);

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 6afcf066cd10bd50209d8ee488a38eccc667edc3..5cf2055dc6e6be764a09012a86d2b5d57b95e9fc 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1130,7 +1130,7 @@ static int ptsname_namespace(int pty, char **ret) {
 
 int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_slave) {
         _cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, usernsfd = -EBADF, rootfd = -EBADF, fd = -EBADF;
-        _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
         pid_t child;
         int r;
 
@@ -1183,7 +1183,7 @@ int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_slave) {
 
 int open_terminal_in_namespace(pid_t pid, const char *name, int mode) {
         _cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, usernsfd = -EBADF, rootfd = -EBADF;
-        _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
         pid_t child;
         int r;
 

diff --git a/src/core/automount.c b/src/core/automount.c
index 361034d7f4f20b426704e1d7fb07d5442d997873..4cffca419cc48039ecd7244827911d0e3162132b 100644 (file)
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -573,7 +573,7 @@ static void automount_trigger_notify(Unit *u, Unit *other) {
 
 static void automount_enter_waiting(Automount *a) {
         _cleanup_close_ int ioctl_fd = -EBADF;
-        int pipe_fd[2] = { -EBADF, -EBADF };
+        int pipe_fd[2] = PIPE_EBADF;
         char name[STRLEN("systemd-") + DECIMAL_STR_MAX(pid_t) + 1];
         _cleanup_free_ char *options = NULL;
         bool mounted = false;

diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index 763f5d4c84616cadb0aa7fc3024aed416442e525..5bdfff89e32038c77dd746d8f60e3e7218c22768 100644 (file)
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -74,7 +74,7 @@ static int dynamic_user_add(Manager *m, const char *name, int storage_socket[sta
 }
 
 static int dynamic_user_acquire(Manager *m, const char *name, DynamicUser** ret) {
-        _cleanup_close_pair_ int storage_socket[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int storage_socket[2] = PIPE_EBADF;
         DynamicUser *d;
         int r;
 

diff --git a/src/core/execute.c b/src/core/execute.c
index 5784c8ce5c22d918bfccfe1f45af1acaa78962c6..5dc8535a47a99ea956d396d665f7937d7adb995a 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2099,7 +2099,7 @@ bool exec_needs_mount_namespace(
 
 static int setup_private_users(uid_t ouid, gid_t ogid, uid_t uid, gid_t gid) {
         _cleanup_free_ char *uid_map = NULL, *gid_map = NULL;
-        _cleanup_close_pair_ int errno_pipe[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int errno_pipe[2] = PIPE_EBADF;
         _cleanup_close_ int unshare_ready_fd = -EBADF;
         _cleanup_(sigkill_waitp) pid_t pid = 0;
         uint64_t c = 1;
@@ -6609,8 +6609,8 @@ static int exec_runtime_allocate(ExecRuntime **ret, const char *id) {
 
         *n = (ExecRuntime) {
                 .id = TAKE_PTR(id_copy),
-                .netns_storage_socket = { -EBADF, -EBADF },
-                .ipcns_storage_socket = { -EBADF, -EBADF },
+                .netns_storage_socket = PIPE_EBADF,
+                .ipcns_storage_socket = PIPE_EBADF,
         };
 
         *ret = n;
@@ -6672,7 +6672,7 @@ static int exec_runtime_make(
                 ExecRuntime **ret) {
 
         _cleanup_(namespace_cleanup_tmpdirp) char *tmp_dir = NULL, *var_tmp_dir = NULL;
-        _cleanup_close_pair_ int netns_storage_socket[2] = { -EBADF, -EBADF }, ipcns_storage_socket[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int netns_storage_socket[2] = PIPE_EBADF, ipcns_storage_socket[2] = PIPE_EBADF;
         int r;
 
         assert(m);

diff --git a/src/core/manager.c b/src/core/manager.c
index 4e15f5cb8b13dca6450353bb50d99e046356a2a5..3332d5775b2dfdbc5f6d1676d1749fc0d3df0223 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -851,7 +851,7 @@ int manager_new(LookupScope scope, ManagerTestRunFlags test_run_flags, Manager *
                 .notify_fd = -EBADF,
                 .cgroups_agent_fd = -EBADF,
                 .signal_fd = -EBADF,
-                .user_lookup_fds = { -EBADF, -EBADF },
+                .user_lookup_fds = PIPE_EBADF,
                 .private_listen_fd = -EBADF,
                 .dev_autofs_fd = -EBADF,
                 .cgroup_inotify_fd = -EBADF,

diff --git a/src/core/service.c b/src/core/service.c
index c967dc989796c4bc68f5b17f693f5cc2e48340d1..b1fe19127f6ad9ce292916450248b19cff6be34f 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1402,7 +1402,7 @@ static int service_allocate_exec_fd(
                 sd_event_source **ret_event_source,
                 int *ret_exec_fd) {
 
-        _cleanup_close_pair_ int p[] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int p[] = PIPE_EBADF;
         int r;
 
         assert(s);

diff --git a/src/core/socket.c b/src/core/socket.c
index 518f27705395a8fa4794ead29f475b94aa3314f8..409d415d8d99295a25164aa645110ebec6d29df8 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1502,7 +1502,7 @@ static int socket_address_listen_in_cgroup(
                 const SocketAddress *address,
                 const char *label) {
 
-        _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
         int fd, r;
         pid_t pid;
 
@@ -2899,7 +2899,7 @@ static int socket_accept_do(Socket *s, int fd) {
 }
 
 static int socket_accept_in_cgroup(Socket *s, SocketPort *p, int fd) {
-        _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
         int cfd, r;
         pid_t pid;
 

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 29265d9220ed09dc398f363f1b3852e2238b7952..37fdfa540f1a3be8fdfbd8d2632c266586177fde 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -241,7 +241,7 @@ static int fsck_progress_socket(void) {
 }
 
 static int run(int argc, char *argv[]) {
-        _cleanup_close_pair_ int progress_pipe[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int progress_pipe[2] = PIPE_EBADF;
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
         _cleanup_free_ char *dpath = NULL;
         _cleanup_fclose_ FILE *console = NULL;

diff --git a/src/fuzz/fuzz-varlink.c b/src/fuzz/fuzz-varlink.c
index c97586be9efe28f5ff8000ba3c5f066cd8c87b0f..cbfde088d90ba7c9bb958b5f9f0da1fafc31ee54 100644 (file)
--- a/src/fuzz/fuzz-varlink.c
+++ b/src/fuzz/fuzz-varlink.c
@@ -85,7 +85,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         struct iovec server_iov = IOVEC_MAKE((void*) data, size), client_iov = IOVEC_MAKE((void*) data, size);
         /* Important: the declaration order matters here! we want that the fds are closed on return after the
          * event sources, hence we declare the fds first, the event sources second */
-        _cleanup_close_pair_ int server_pair[2] = { -EBADF, -EBADF }, client_pair[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int server_pair[2] = PIPE_EBADF, client_pair[2] = PIPE_EBADF;
         _cleanup_(sd_event_source_unrefp) sd_event_source *idle_event_source = NULL,
                 *server_event_source = NULL, *client_event_source = NULL;
         _cleanup_(varlink_server_unrefp) VarlinkServer *s = NULL;

diff --git a/src/import/import-common.c b/src/import/import-common.c
index eb52c6c116c9af345300e844f61387d4e16f9897..b67a49c72d0e8477a1822c956b36b17eeebcafce 100644 (file)
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -23,7 +23,7 @@
 #include "tmpfile-util.h"
 
 int import_fork_tar_x(const char *path, pid_t *ret) {
-        _cleanup_close_pair_ int pipefd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pipefd[2] = PIPE_EBADF;
         bool use_selinux;
         pid_t pid;
         int r;
@@ -96,7 +96,7 @@ int import_fork_tar_x(const char *path, pid_t *ret) {
 }
 
 int import_fork_tar_c(const char *path, pid_t *ret) {
-        _cleanup_close_pair_ int pipefd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pipefd[2] = PIPE_EBADF;
         bool use_selinux;
         pid_t pid;
         int r;

diff --git a/src/import/importd.c b/src/import/importd.c
index b6d90cde103e5699c45dec4db5f8c17ca5044585..65647a66a6342e0ea1ab599fcf09cc78b403058e 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -356,7 +356,7 @@ static int transfer_on_log(sd_event_source *s, int fd, uint32_t revents, void *u
 }
 
 static int transfer_start(Transfer *t) {
-        _cleanup_close_pair_ int pipefd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pipefd[2] = PIPE_EBADF;
         int r;
 
         assert(t);

diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index 1c7194fd6b153d1cdf224936bb3a67b52fffafc5..6e9aade3cff40eb4983527d0ddfdd12142c27069 100644 (file)
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -381,7 +381,7 @@ static int verify_gpg(
                 const void *payload, size_t payload_size,
                 const void *signature, size_t signature_size) {
 
-        _cleanup_close_pair_ int gpg_pipe[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int gpg_pipe[2] = PIPE_EBADF;
         char sig_file_path[] = "/tmp/sigXXXXXX", gpg_home[] = "/tmp/gpghomeXXXXXX";
         _cleanup_(sigkill_waitp) pid_t pid = 0;
         bool gpg_home_created = false;

diff --git a/src/journal/fuzz-journald-stream.c b/src/journal/fuzz-journald-stream.c
index cece8c440e88487bde3df9c96420f966610c9bd4..ed52f950d2e122db00ceeff8b9f7be83b951a581 100644 (file)
--- a/src/journal/fuzz-journald-stream.c
+++ b/src/journal/fuzz-journald-stream.c
@@ -9,7 +9,7 @@
 #include "fuzz-journald.h"
 #include "journald-stream.h"
 
-static int stream_fds[2] = { -EBADF, -EBADF };
+static int stream_fds[2] = PIPE_EBADF;
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         Server s;

diff --git a/src/libsystemd-network/fuzz-dhcp6-client.c b/src/libsystemd-network/fuzz-dhcp6-client.c
index 7da285e54e37a428e207fb679bf5be1968c99dbf..356a9f48fd19ce82aaa51569a5518552deb93763 100644 (file)
--- a/src/libsystemd-network/fuzz-dhcp6-client.c
+++ b/src/libsystemd-network/fuzz-dhcp6-client.c
@@ -10,7 +10,7 @@
 #include "fd-util.h"
 #include "fuzz.h"
 
-static int test_dhcp_fd[2] = { -EBADF, -EBADF };
+static int test_dhcp_fd[2] = PIPE_EBADF;
 
 int dhcp6_network_send_udp_socket(int s, struct in6_addr *server_address, const void *packet, size_t len) {
         return len;

diff --git a/src/libsystemd-network/fuzz-lldp-rx.c b/src/libsystemd-network/fuzz-lldp-rx.c
index 00a98bbeb0ec97b85aef356e903f60b790043797..2d8e201854024879c76ccd600caf606de3929219 100644 (file)
--- a/src/libsystemd-network/fuzz-lldp-rx.c
+++ b/src/libsystemd-network/fuzz-lldp-rx.c
@@ -10,7 +10,7 @@
 #include "fuzz.h"
 #include "lldp-network.h"
 
-static int test_fd[2] = { -EBADF, -EBADF };
+static int test_fd[2] = PIPE_EBADF;
 
 int lldp_network_bind_raw_socket(int ifindex) {
         if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) < 0)

diff --git a/src/libsystemd-network/fuzz-ndisc-rs.c b/src/libsystemd-network/fuzz-ndisc-rs.c
index 1d80630be5e87de5ffdd199f7f04ee70cb535f70..7a5c45a2f97395d1d649f4b55a1f583b157d37aa 100644 (file)
--- a/src/libsystemd-network/fuzz-ndisc-rs.c
+++ b/src/libsystemd-network/fuzz-ndisc-rs.c
@@ -7,12 +7,13 @@
 #include "sd-ndisc.h"
 
 #include "alloc-util.h"
+#include "fd-util.h"
 #include "fuzz.h"
 #include "icmp6-util.h"
 #include "ndisc-internal.h"
 #include "socket-util.h"
 
-static int test_fd[2] = { -EBADF, -EBADF };
+static int test_fd[2] = PIPE_EBADF;
 
 int icmp6_bind_router_solicitation(int index) {
         assert_se(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) >= 0);

diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c
index 7344099e77e6045e88347d5deffa07739dcb3237..3e1c52a306136fe386250ad8e24a358ed5d5ba51 100644 (file)
--- a/src/libsystemd-network/test-dhcp6-client.c
+++ b/src/libsystemd-network/test-dhcp6-client.c
@@ -73,7 +73,7 @@ static const uint8_t server_id[] = { SERVER_ID_BYTES };
 static const struct ether_addr mac = {
         .ether_addr_octet = { 'A', 'B', 'C', '1', '2', '3' },
 };
-static int test_fd[2] = { -EBADF, -EBADF };
+static int test_fd[2] = PIPE_EBADF;
 static int test_ifindex = 42;
 static unsigned test_client_sent_message_count = 0;
 static sd_dhcp6_client *client_ref = NULL;

diff --git a/src/libsystemd-network/test-lldp-rx.c b/src/libsystemd-network/test-lldp-rx.c
index 7ec1ab1ee90e519b80220a1d18bb7cd59e1c2a13..387e1e2203a45eac8fee44bb1756bc2348f04d1b 100644 (file)
--- a/src/libsystemd-network/test-lldp-rx.c
+++ b/src/libsystemd-network/test-lldp-rx.c
@@ -20,7 +20,7 @@
 #define TEST_LLDP_TYPE_SYSTEM_NAME "systemd-lldp"
 #define TEST_LLDP_TYPE_SYSTEM_DESC "systemd-lldp-desc"
 
-static int test_fd[2] = { -EBADF, -EBADF };
+static int test_fd[2] = PIPE_EBADF;
 static int lldp_rx_handler_calls;
 
 int lldp_network_bind_raw_socket(int ifindex) {

diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c
index 4a1d4d2ef82dc33ad4ecbeace35226deb3958021..eddd634d8a653a19267da86c4288c17f737c6342 100644 (file)
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libsystemd/sd-bus/bus-container.c
@@ -12,7 +12,7 @@
 #include "string-util.h"
 
 int bus_container_connect_socket(sd_bus *b) {
-        _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
         _cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, usernsfd = -EBADF, rootfd = -EBADF;
         int r, error_buf = 0;
         pid_t child;

diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index a402a70223a02d6d8c780b313ab48501cfc65ace..34c7f00080a4e16a0331a38dc7d49e901343c302 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -211,7 +211,7 @@ int main(int argc, char *argv[]) {
                 MODE_CHART,
         } mode = MODE_BISECT;
         Type type = TYPE_LEGACY;
-        int i, pair[2] = { -EBADF, -EBADF };
+        int i, pair[2] = PIPE_EBADF;
         _cleanup_free_ char *address = NULL, *server_name = NULL;
         _cleanup_close_ int bus_ref = -1;
         const char *unique;

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 382761171c64a4ff5a737e5327b155b49aabd584..8e66919b4637b5e6d1a19e203c9da96b0fc30753 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -260,7 +260,7 @@ static void* client1(void *p) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         const char *hello;
         int r;
-        _cleanup_close_pair_ int pp[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pp[2] = PIPE_EBADF;
         char x;
 
         r = sd_bus_open_user(&bus);

diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 46125fedf113671b6d11b9174ab9375ac543be0d..6da351dd9bc1ca6b66405b93685372e121616edf 100644 (file)
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -549,7 +549,7 @@ finish:
 }
 
 _public_ int sd_notify_barrier(int unset_environment, uint64_t timeout) {
-        _cleanup_close_pair_ int pipe_fd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pipe_fd[2] = PIPE_EBADF;
         int r;
 
         if (pipe2(pipe_fd, O_CLOEXEC) < 0)

diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c
index 7cc4cc9e28382b125c52d8dc41d15a239c708506..591eab8896e97a542e579c46f32a52636c3f7bb4 100644 (file)
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -198,8 +198,8 @@ static void test_basic_one(bool with_pidfd) {
         sd_event *e = NULL;
         sd_event_source *w = NULL, *x = NULL, *y = NULL, *z = NULL, *q = NULL, *t = NULL;
         static const char ch = 'x';
-        int a[2] = { -EBADF, -EBADF }, b[2] = { -EBADF, -EBADF },
-            d[2] = { -EBADF, -EBADF }, k[2] = { -EBADF, -EBADF };
+        int a[2] = PIPE_EBADF, b[2] = PIPE_EBADF,
+            d[2] = PIPE_EBADF, k[2] = PIPE_EBADF;
         uint64_t event_now;
         int64_t priority;
 
@@ -628,7 +628,7 @@ static int ratelimit_expired(sd_event_source *s, void *userdata) {
 }
 
 TEST(ratelimit) {
-        _cleanup_close_pair_ int p[2] = {-1, -1};
+        _cleanup_close_pair_ int p[2] = PIPE_EBADF;
         _cleanup_(sd_event_unrefp) sd_event *e = NULL;
         _cleanup_(sd_event_source_unrefp) sd_event_source *s = NULL;
         uint64_t interval;

diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
index 2b2d1c4b64000049972fc4b4873ee4864f548620..96a8c567fc7654204a7f05902a1ed79c2de693ea 100644 (file)
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libsystemd/sd-login/test-login.c
@@ -37,7 +37,7 @@ static const char *e(int r) {
 }
 
 TEST(login) {
-        _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
         _cleanup_free_ char *pp = NULL, *qq = NULL,
                 *display_session = NULL, *cgroup = NULL,
                 *display = NULL, *remote_user = NULL, *remote_host = NULL,

diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index f8c09a8b7cf34c0b942bcfdc4da731f33d588f20..bf65eecfdd4232f19132efc045ebb4326207df92 100644 (file)
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -31,7 +31,7 @@ int bus_image_method_remove(
                 void *userdata,
                 sd_bus_error *error) {
 
-        _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
         Image *image = ASSERT_PTR(userdata);
         Manager *m = image->userdata;
         pid_t child;
@@ -145,7 +145,7 @@ int bus_image_method_clone(
                 void *userdata,
                 sd_bus_error *error) {
 
-        _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
         Image *image = ASSERT_PTR(userdata);
         Manager *m = ASSERT_PTR(image->userdata);
         const char *new_name;

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 1867893004d959b6f6fc4b4ab080536281672198..fa81c9d13c94199a5af7fbbd8911050ef7351701 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -223,7 +223,7 @@ int bus_machine_method_get_addresses(sd_bus_message *message, void *userdata, sd
         }
 
         case MACHINE_CONTAINER: {
-                _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+                _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
                 _cleanup_free_ char *us = NULL, *them = NULL;
                 _cleanup_close_ int netns_fd = -EBADF;
                 const char *p;
@@ -371,7 +371,7 @@ int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, s
 
         case MACHINE_CONTAINER: {
                 _cleanup_close_ int mntns_fd = -EBADF, root_fd = -EBADF, pidns_fd = -EBADF;
-                _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+                _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
                 _cleanup_fclose_ FILE *f = NULL;
                 pid_t child;
 
@@ -888,7 +888,7 @@ int bus_machine_method_bind_mount(sd_bus_message *message, void *userdata, sd_bu
 int bus_machine_method_copy(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_free_ char *host_basename = NULL, *container_basename = NULL;
         const char *src, *dest, *host_path, *container_path;
-        _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
         CopyFlags copy_flags = COPY_REFLINK|COPY_MERGE|COPY_HARDLINKS;
         _cleanup_close_ int hostfd = -EBADF;
         Machine *m = ASSERT_PTR(userdata);
@@ -1085,7 +1085,7 @@ int bus_machine_method_open_root_directory(sd_bus_message *message, void *userda
 
         case MACHINE_CONTAINER: {
                 _cleanup_close_ int mntns_fd = -EBADF, root_fd = -EBADF;
-                _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+                _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
                 pid_t child;
 
                 r = namespace_open(m->leader, NULL, &mntns_fd, NULL, NULL, &root_fd);

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index ed2862782694ef5c36c97d60e141f677de65b7fe..0c157a981aff495bf716715bfc98489e25dd0cf6 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -683,7 +683,7 @@ static int method_clean_pool(sd_bus_message *message, void *userdata, sd_bus_err
                 REMOVE_HIDDEN,
         } mode;
 
-        _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
         _cleanup_close_ int result_fd = -EBADF;
         Manager *m = userdata;
         Operation *operation;

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index de3e95145b6ae0cb3c90e4619fc6033e7ca909c0..b80637b0357d487ef4856b9f2b3de7c6ccc3336e 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4744,8 +4744,8 @@ static int run_container(
         _cleanup_(release_lock_file) LockFile uid_shift_lock = LOCK_FILE_INIT;
         _cleanup_close_ int etc_passwd_lock = -1;
         _cleanup_close_pair_ int
-                fd_inner_socket_pair[2] = { -EBADF, -EBADF },
-                fd_outer_socket_pair[2] = { -EBADF, -EBADF };
+                fd_inner_socket_pair[2] = PIPE_EBADF,
+                fd_outer_socket_pair[2] = PIPE_EBADF;
 
         _cleanup_close_ int notify_socket = -1, mntns_fd = -EBADF, fd_kmsg_fifo = -EBADF;
         _cleanup_(barrier_destroy) Barrier barrier = BARRIER_NULL;

diff --git a/src/portable/portable.c b/src/portable/portable.c
index 28d9ccd302d6ad49f5b80483dd42412b06533959..7be1afbcc4bd8d4969bfc6265019945b1c44c62e 100644 (file)
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -355,7 +355,7 @@ static int portable_extract_by_path(
         else {
                 _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
                 _cleanup_(rmdir_and_freep) char *tmpdir = NULL;
-                _cleanup_(close_pairp) int seq[2] = { -EBADF, -EBADF };
+                _cleanup_(close_pairp) int seq[2] = PIPE_EBADF;
                 _cleanup_(sigkill_waitp) pid_t child = 0;
 
                 /* We now have a loopback block device, let's fork off a child in its own mount namespace, mount it

diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index f0eb71b7103591f15ca92f58be7dd5bc51062137..07d10b05bf12688434b276f539ad37e329704b4d 100644 (file)
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -486,7 +486,7 @@ int bus_image_common_remove(
                 Image *image,
                 sd_bus_error *error) {
 
-        _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
         _cleanup_(sigkill_waitp) pid_t child = 0;
         PortableState state;
         int r;

diff --git a/src/shared/data-fd-util.c b/src/shared/data-fd-util.c
index 0a4ef3fffc21591985783bda0c937c981e3a807e..895d8e8b334d0f70e460eb3d733e67381d58dc01 100644 (file)
--- a/src/shared/data-fd-util.c
+++ b/src/shared/data-fd-util.c
@@ -26,7 +26,7 @@
 #define DATA_FD_TMP_LIMIT (1024U*1024U)
 
 int acquire_data_fd(const void *data, size_t size, unsigned flags) {
-        _cleanup_close_pair_ int pipefds[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pipefds[2] = PIPE_EBADF;
         char pattern[] = "/dev/shm/data-fd-XXXXXX";
         _cleanup_close_ int fd = -EBADF;
         int isz = 0, r;
@@ -218,7 +218,7 @@ int copy_data_fd(int fd) {
                         /* Hmm, pity, this didn't fit. Let's fall back to /tmp then, see below */
 
                 } else {
-                        _cleanup_(close_pairp) int pipefds[2] = { -EBADF, -EBADF };
+                        _cleanup_(close_pairp) int pipefds[2] = PIPE_EBADF;
                         int isz;
 
                         /* If memfds aren't available, use a pipe. Set O_NONBLOCK so that we will get EAGAIN rather

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index e2905b646dc2ab64b0bece6b4b27a069a9a68b9f..4351f185cde6802d9ccb9b725e4e0e0f6359b08f 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -2696,7 +2696,7 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_
         };
 
         _cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL, **initrd_release = NULL, **extension_release = NULL;
-        _cleanup_close_pair_ int error_pipe[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int error_pipe[2] = PIPE_EBADF;
         _cleanup_(rmdir_and_freep) char *t = NULL;
         _cleanup_(sigkill_waitp) pid_t child = 0;
         sd_id128_t machine_id = SD_ID128_NULL;

diff --git a/src/shared/elf-util.c b/src/shared/elf-util.c
index bbe59f7af6b1c436a1f558a0e1ebf1c102a2eb1f..8da16f528fe373fc93ff64dd133dff94d6f28be6 100644 (file)
--- a/src/shared/elf-util.c
+++ b/src/shared/elf-util.c
@@ -744,9 +744,9 @@ static int parse_elf(int fd, const char *executable, char **ret, JsonVariant **r
 }
 
 int parse_elf_object(int fd, const char *executable, bool fork_disable_dump, char **ret, JsonVariant **ret_package_metadata) {
-        _cleanup_close_pair_ int error_pipe[2] = { -EBADF, -EBADF },
-                                 return_pipe[2] = { -EBADF, -EBADF },
-                                 json_pipe[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int error_pipe[2] = PIPE_EBADF,
+                                 return_pipe[2] = PIPE_EBADF,
+                                 json_pipe[2] = PIPE_EBADF;
         _cleanup_(json_variant_unrefp) JsonVariant *package_metadata = NULL;
         _cleanup_free_ char *buf = NULL;
         int r;

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 1be22a62c6ed1a2069c69d30e5bb72e6545922dd..5c9dd61898a63efb5b7c0d21ee6e1821f83982d0 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1624,7 +1624,7 @@ int add_matches_for_user_unit(sd_journal *j, const char *unit, uid_t uid) {
 }
 
 static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
-        _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int pair[2] = PIPE_EBADF;
         _cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, rootfd = -EBADF;
         char buf[SD_ID128_UUID_STRING_MAX];
         pid_t pid, child;

diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index 80cf87526ee0a45b5a248d57a85bd65b1806dcec..603eb7b780f778e8cac43d92187d2eb8b1e9c7ed 100644 (file)
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -806,7 +806,7 @@ static int mount_in_namespace(
                 const MountOptions *options,
                 bool is_image) {
 
-        _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
         _cleanup_close_ int mntns_fd = -EBADF, root_fd = -EBADF, pidns_fd = -EBADF, chased_src_fd = -EBADF;
         char mount_slave[] = "/tmp/propagate.XXXXXX", *mount_tmp, *mount_outside, *p;
         bool mount_slave_created = false, mount_slave_mounted = false,

diff --git a/src/shared/pager.c b/src/shared/pager.c
index 831cc1dce04e1e5f05c457f1e45d54a65285ce03..6ed35a3ca9983733206f40a2d037952b453ce56c 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -83,7 +83,7 @@ static int no_quit_on_interrupt(int exe_name_fd, const char *less_opts) {
 }
 
 void pager_open(PagerFlags flags) {
-        _cleanup_close_pair_ int fd[2] = { -EBADF, -EBADF }, exe_name_pipe[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int fd[2] = PIPE_EBADF, exe_name_pipe[2] = PIPE_EBADF;
         _cleanup_strv_free_ char **pager_args = NULL;
         _cleanup_free_ char *l = NULL;
         const char *pager, *less_opts;

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index d73bdbdc1ea6e798a6b4286da4b1149028bd69a3..821049e667573d6602a03445417e41293671b28d 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -487,8 +487,8 @@ static int add_connection_socket(Context *context, int fd) {
                .context = context,
                .server_fd = fd,
                .client_fd = -EBADF,
-               .server_to_client_buffer = { -EBADF, -EBADF },
-               .client_to_server_buffer = { -EBADF, -EBADF },
+               .server_to_client_buffer = PIPE_EBADF,
+               .client_to_server_buffer = PIPE_EBADF,
         };
 
         r = set_ensure_put(&context->connections, NULL, c);

diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c
index 759c81a4f0b8bd9ba33ce9ca636f491dd157e35a..d52545e7b8ff2fb60e90a3bf45f0ff455e940472 100644 (file)
--- a/src/sysupdate/sysupdate-resource.c
+++ b/src/sysupdate/sysupdate-resource.c
@@ -242,7 +242,7 @@ static int download_manifest(
                 size_t *ret_size) {
 
         _cleanup_free_ char *buffer = NULL, *suffixed_url = NULL;
-        _cleanup_(close_pairp) int pfd[2] = { -EBADF, -EBADF };
+        _cleanup_(close_pairp) int pfd[2] = PIPE_EBADF;
         _cleanup_fclose_ FILE *manifest = NULL;
         size_t size = 0;
         pid_t pid;

diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 2568b9b384e0e7f6a817a8ee327745acce8d31e1..662481d3372e993cbfb7804d54176f48bf389180 100644 (file)
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -257,7 +257,7 @@ TEST(copy_tree) {
 }
 
 TEST(copy_bytes) {
-        _cleanup_close_pair_ int pipefd[2] = {-1, -1};
+        _cleanup_close_pair_ int pipefd[2] = PIPE_EBADF;
         _cleanup_close_ int infd = -EBADF;
         int r, r2;
         char buf[1024], buf2[1024];

diff --git a/src/test/test-data-fd-util.c b/src/test/test-data-fd-util.c
index d69648842e0889543d981d83a41f8586b74cdb50..c0febec2080d77ebcc4625fbafddaebdfe24e75e 100644 (file)
--- a/src/test/test-data-fd-util.c
+++ b/src/test/test-data-fd-util.c
@@ -81,7 +81,7 @@ static void assert_equal_fd(int fd1, int fd2) {
 
 TEST(copy_data_fd) {
         _cleanup_close_ int fd1 = -EBADF, fd2 = -EBADF;
-        _cleanup_(close_pairp) int sfd[2] = { -EBADF, -EBADF };
+        _cleanup_(close_pairp) int sfd[2] = PIPE_EBADF;
         _cleanup_(sigkill_waitp) pid_t pid = -1;
         int r;
 

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 51c3e755e04efe8618c272ae6319eea2dcac743f..76342d9a820a578f971590c9ce2aef2701299b81 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -559,7 +559,7 @@ static int find_libraries(const char *exec, char ***ret) {
         _cleanup_(sd_event_source_unrefp) sd_event_source *sigchld_source = NULL;
         _cleanup_(sd_event_source_unrefp) sd_event_source *stdout_source = NULL;
         _cleanup_(sd_event_source_unrefp) sd_event_source *stderr_source = NULL;
-        _cleanup_close_pair_ int outpipe[2] = {-1, -1}, errpipe[2] = {-1, -1};
+        _cleanup_close_pair_ int outpipe[2] = PIPE_EBADF, errpipe[2] = PIPE_EBADF;
         _cleanup_strv_free_ char **libraries = NULL;
         _cleanup_free_ char *result = NULL;
         pid_t pid;

diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c
index f08d0f0dd47adf422686aa99902a9a44af078532..5068f8edf746c0cc9891e27409520828036a7b26 100644 (file)
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -532,7 +532,7 @@ TEST(fd_reopen_condition) {
 
 TEST(take_fd) {
         _cleanup_close_ int fd1 = -EBADF, fd2 = -EBADF;
-        int array[2] = { -EBADF, -EBADF }, i = 0;
+        int array[2] = PIPE_EBADF, i = 0;
 
         assert_se(fd1 == -EBADF);
         assert_se(fd2 == -EBADF);

diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index be09f71e75233f609923c300a113fc3a4bfbb0a3..72155127c1e90563378ee29a187d2cefe10f1c32 100644 (file)
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -83,7 +83,7 @@ TEST(tmpdir) {
 }
 
 static void test_shareable_ns(unsigned long nsflag) {
-        _cleanup_close_pair_ int s[2] = { -EBADF, -EBADF };
+        _cleanup_close_pair_ int s[2] = PIPE_EBADF;
         pid_t pid1, pid2, pid3;
         int r, n = 0;
         siginfo_t si;

diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c
index 58112591831b4a488ea7c1a25784a86e6c69bcc2..e961887fecb20d0b49a18b91704dbb8ac594274f 100644 (file)
--- a/src/test/test-varlink.c
+++ b/src/test/test-varlink.c
@@ -191,7 +191,7 @@ int main(int argc, char *argv[]) {
         _cleanup_(rm_rf_physical_and_freep) char *tmpdir = NULL;
         _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
         _cleanup_(sd_event_unrefp) sd_event *e = NULL;
-        _cleanup_(close_pairp) int block_fds[2] = { -EBADF, -EBADF };
+        _cleanup_(close_pairp) int block_fds[2] = PIPE_EBADF;
         pthread_t t;
         const char *sp;
 

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 63be5275e4b418ce83ccce15e55c83bc2335f4ac..0ca8d121633084fe5c0c5b3130a707541b8207ec 100644 (file)
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -763,7 +763,7 @@ int udev_event_spawn(
                 size_t ressize,
                 bool *ret_truncated) {
 
-        _cleanup_close_pair_ int outpipe[2] = {-1, -1}, errpipe[2] = {-1, -1};
+        _cleanup_close_pair_ int outpipe[2] = PIPE_EBADF, errpipe[2] = PIPE_EBADF;
         _cleanup_strv_free_ char **argv = NULL;
         char **envp = NULL;
         Spawn spawn;

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 4942c852a0b19faf9088f2a20913944c0f0ee3cb..28b76bfbab2c19b4805fa0435ad39d736fb27b19 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1848,7 +1848,7 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent) {
 
         *manager = (Manager) {
                 .inotify_fd = -EBADF,
-                .worker_watch = { -EBADF, -EBADF },
+                .worker_watch = PIPE_EBADF,
                 .cgroup = TAKE_PTR(cgroup),
         };