From: Josef 'Jeff' Sipek Date: Thu, 5 Oct 2017 17:06:09 +0000 (-0400) Subject: global: stop including fd-set-nonblock.h & fd-close-on-exec.h directly X-Git-Tag: 2.3.0.rc1~885 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ef9fe877817de76eb38883ccf3833fae60e6865;p=thirdparty%2Fdovecot%2Fcore.git global: stop including fd-set-nonblock.h & fd-close-on-exec.h directly --- diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c index b2806f5c80..091be87439 100644 --- a/src/doveadm/doveadm-dsync.c +++ b/src/doveadm/doveadm-dsync.c @@ -4,7 +4,6 @@ #include "lib-signals.h" #include "array.h" #include "execv-const.h" -#include "fd-set-nonblock.h" #include "child-wait.h" #include "istream.h" #include "ostream.h" diff --git a/src/doveadm/dsync/dsync-ibc-stream.c b/src/doveadm/dsync/dsync-ibc-stream.c index 7f6cc53dcb..ad7631f312 100644 --- a/src/doveadm/dsync/dsync-ibc-stream.c +++ b/src/doveadm/dsync/dsync-ibc-stream.c @@ -2,7 +2,6 @@ #include "lib.h" #include "array.h" -#include "fd-set-nonblock.h" #include "safe-mkstemp.h" #include "ioloop.h" #include "istream.h" diff --git a/src/imap-hibernate/imap-client.c b/src/imap-hibernate/imap-client.c index 53b28767b5..6a9cc06611 100644 --- a/src/imap-hibernate/imap-client.c +++ b/src/imap-hibernate/imap-client.c @@ -3,7 +3,6 @@ #include "lib.h" #include "array.h" #include "ioloop.h" -#include "fd-set-nonblock.h" #include "fdpass.h" #include "hostpid.h" #include "connection.h" diff --git a/src/imap/main.c b/src/imap/main.c index 1fe024e00a..15ffb480d2 100644 --- a/src/imap/main.c +++ b/src/imap/main.c @@ -10,7 +10,6 @@ #include "process-title.h" #include "randgen.h" #include "restrict-access.h" -#include "fd-close-on-exec.h" #include "write-full.h" #include "settings-parser.h" #include "master-interface.h" diff --git a/src/lda/main.c b/src/lda/main.c index 4d25d5c0ad..847861bdcd 100644 --- a/src/lda/main.c +++ b/src/lda/main.c @@ -4,7 +4,6 @@ #include "lib-signals.h" #include "ioloop.h" #include "env-util.h" -#include "fd-set-nonblock.h" #include "istream.h" #include "istream-seekable.h" #include "path-util.h" diff --git a/src/lib-imap-client/test-imapc-client.c b/src/lib-imap-client/test-imapc-client.c index 257a3ef2b2..af64c00a4b 100644 --- a/src/lib-imap-client/test-imapc-client.c +++ b/src/lib-imap-client/test-imapc-client.c @@ -4,7 +4,6 @@ #include "array.h" #include "hostpid.h" #include "net.h" -#include "fd-set-nonblock.h" #include "istream.h" #include "ostream.h" #include "ioloop.h" diff --git a/src/lib-master/master-login.c b/src/lib-master/master-login.c index ac0181d126..df707cdd25 100644 --- a/src/lib-master/master-login.c +++ b/src/lib-master/master-login.c @@ -4,7 +4,6 @@ #include "ioloop.h" #include "ostream.h" #include "fdpass.h" -#include "fd-close-on-exec.h" #include "llist.h" #include "str.h" #include "strescape.h" diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c index 19bfcd218d..78c445497c 100644 --- a/src/lib-master/master-service.c +++ b/src/lib-master/master-service.c @@ -10,7 +10,6 @@ #include "home-expand.h" #include "process-title.h" #include "restrict-access.h" -#include "fd-close-on-exec.h" #include "settings-parser.h" #include "syslog-util.h" #include "master-instance.h" diff --git a/src/lib/failures.c b/src/lib/failures.c index f669339235..fe41cbb57a 100644 --- a/src/lib/failures.c +++ b/src/lib/failures.c @@ -5,13 +5,11 @@ #include "str.h" #include "hostpid.h" #include "net.h" -#include "fd-set-nonblock.h" #include "process-title.h" #include "lib-signals.h" #include "backtrace-string.h" #include "printf-format-fix.h" #include "write-full.h" -#include "fd-close-on-exec.h" #include #include diff --git a/src/lib/fd-close-on-exec.c b/src/lib/fd-close-on-exec.c index 23fbc95083..6f5db11362 100644 --- a/src/lib/fd-close-on-exec.c +++ b/src/lib/fd-close-on-exec.c @@ -2,7 +2,6 @@ #include "lib.h" #include "net.h" -#include "fd-close-on-exec.h" #include #include diff --git a/src/lib/fd-set-nonblock.c b/src/lib/fd-set-nonblock.c index 7e1c8190bf..4b76cd71db 100644 --- a/src/lib/fd-set-nonblock.c +++ b/src/lib/fd-set-nonblock.c @@ -1,7 +1,6 @@ /* Copyright (c) 1999-2017 Dovecot authors, see the included COPYING file */ #include "lib.h" -#include "fd-set-nonblock.h" #include diff --git a/src/lib/ioloop-epoll.c b/src/lib/ioloop-epoll.c index d3c997df53..160098022f 100644 --- a/src/lib/ioloop-epoll.c +++ b/src/lib/ioloop-epoll.c @@ -2,7 +2,6 @@ #include "lib.h" #include "array.h" -#include "fd-close-on-exec.h" #include "ioloop-private.h" #include "ioloop-iolist.h" diff --git a/src/lib/ioloop-kqueue.c b/src/lib/ioloop-kqueue.c index d7fd238996..b8b4accfb0 100644 --- a/src/lib/ioloop-kqueue.c +++ b/src/lib/ioloop-kqueue.c @@ -9,7 +9,6 @@ #ifdef IOLOOP_KQUEUE #include "array.h" -#include "fd-close-on-exec.h" #include "ioloop-private.h" #include diff --git a/src/lib/ioloop-notify-inotify.c b/src/lib/ioloop-notify-inotify.c index 1cef6ceac5..643399c3f3 100644 --- a/src/lib/ioloop-notify-inotify.c +++ b/src/lib/ioloop-notify-inotify.c @@ -5,8 +5,6 @@ #ifdef IOLOOP_NOTIFY_INOTIFY -#include "fd-close-on-exec.h" -#include "fd-set-nonblock.h" #include "ioloop-private.h" #include "ioloop-notify-fd.h" #include "buffer.h" diff --git a/src/lib/ioloop-notify-kqueue.c b/src/lib/ioloop-notify-kqueue.c index 57c039cd29..ab86291a31 100644 --- a/src/lib/ioloop-notify-kqueue.c +++ b/src/lib/ioloop-notify-kqueue.c @@ -11,7 +11,6 @@ #include "ioloop-private.h" #include "llist.h" -#include "fd-close-on-exec.h" #include #include #include diff --git a/src/lib/istream.c b/src/lib/istream.c index 442dd4eea6..cb904f5bad 100644 --- a/src/lib/istream.c +++ b/src/lib/istream.c @@ -4,7 +4,6 @@ #include "ioloop.h" #include "array.h" #include "str.h" -#include "fd-set-nonblock.h" #include "istream-private.h" static bool i_stream_is_buffer_invalid(const struct istream_private *stream); diff --git a/src/lib/lib-signals.c b/src/lib/lib-signals.c index be9de2d614..16adccc871 100644 --- a/src/lib/lib-signals.c +++ b/src/lib/lib-signals.c @@ -3,8 +3,6 @@ #include "lib.h" #include "array.h" #include "ioloop.h" -#include "fd-close-on-exec.h" -#include "fd-set-nonblock.h" #include "write-full.h" #include "lib-signals.h" diff --git a/src/lib/lib.c b/src/lib/lib.c index 0ce51bec74..3c5739ca1a 100644 --- a/src/lib/lib.c +++ b/src/lib/lib.c @@ -5,7 +5,6 @@ #include "array.h" #include "env-util.h" #include "hostpid.h" -#include "fd-close-on-exec.h" #include "ipwd.h" #include "process-title.h" #include "var-expand-private.h" diff --git a/src/lib/mmap-anon.c b/src/lib/mmap-anon.c index ce58c6cbb6..2e2617b7af 100644 --- a/src/lib/mmap-anon.c +++ b/src/lib/mmap-anon.c @@ -17,8 +17,6 @@ #ifndef HAVE_LINUX_MREMAP -#include "fd-close-on-exec.h" - #include #define MMAP_SIGNATURE 0xdeadbeef diff --git a/src/lib/net.c b/src/lib/net.c index df35e4c902..abf4ecfc05 100644 --- a/src/lib/net.c +++ b/src/lib/net.c @@ -2,7 +2,6 @@ #define _GNU_SOURCE /* For Linux's struct ucred */ #include "lib.h" -#include "fd-set-nonblock.h" #include "time-util.h" #include "net.h" diff --git a/src/lib/randgen.c b/src/lib/randgen.c index 2b0410bf9a..9b466db610 100644 --- a/src/lib/randgen.c +++ b/src/lib/randgen.c @@ -2,7 +2,6 @@ #include "lib.h" #include "randgen.h" -#include "fd-close-on-exec.h" #include #include diff --git a/src/lib/test-iostream-proxy.c b/src/lib/test-iostream-proxy.c index e23a6f6805..59d70b5c16 100644 --- a/src/lib/test-iostream-proxy.c +++ b/src/lib/test-iostream-proxy.c @@ -6,7 +6,6 @@ #include "buffer.h" #include "ioloop.h" #include "iostream-proxy.h" -#include "fd-set-nonblock.h" #include #include diff --git a/src/lib/test-iostream-pump.c b/src/lib/test-iostream-pump.c index 374e0fb4c9..95135c20a4 100644 --- a/src/lib/test-iostream-pump.c +++ b/src/lib/test-iostream-pump.c @@ -7,7 +7,6 @@ #include "str.h" #include "ioloop.h" #include "iostream-pump.h" -#include "fd-set-nonblock.h" #include "istream-failure-at.h" #include "ostream-failure-at.h" diff --git a/src/lib/test-istream-multiplex.c b/src/lib/test-istream-multiplex.c index 031069dab7..7d927dfbf1 100644 --- a/src/lib/test-istream-multiplex.c +++ b/src/lib/test-istream-multiplex.c @@ -2,7 +2,6 @@ #include "test-lib.h" #include "ioloop.h" -#include "fd-set-nonblock.h" #include "str.h" #include "crc32.h" #include "randgen.h" diff --git a/src/lib/test-istream-unix.c b/src/lib/test-istream-unix.c index 30ccd09aa5..30ea8d51b3 100644 --- a/src/lib/test-istream-unix.c +++ b/src/lib/test-istream-unix.c @@ -2,7 +2,6 @@ #include "test-lib.h" #include "net.h" -#include "fd-set-nonblock.h" #include "fdpass.h" #include "istream.h" #include "istream-unix.h" diff --git a/src/lib/test-multiplex.c b/src/lib/test-multiplex.c index 3731665dc4..d7e1f279d1 100644 --- a/src/lib/test-multiplex.c +++ b/src/lib/test-multiplex.c @@ -3,7 +3,6 @@ #include "test-lib.h" #include "ioloop.h" #include "str.h" -#include "fd-set-nonblock.h" #include "istream.h" #include "istream-multiplex.h" #include "ostream.h" diff --git a/src/lib/test-ostream-multiplex.c b/src/lib/test-ostream-multiplex.c index 8dc0e2b030..0228badd47 100644 --- a/src/lib/test-ostream-multiplex.c +++ b/src/lib/test-ostream-multiplex.c @@ -2,7 +2,6 @@ #include "test-lib.h" #include "ioloop.h" -#include "fd-set-nonblock.h" #include "str.h" #include "istream.h" #include "ostream-private.h" diff --git a/src/lmtp/main.c b/src/lmtp/main.c index 4f80696978..f46e6e7191 100644 --- a/src/lmtp/main.c +++ b/src/lmtp/main.c @@ -6,7 +6,6 @@ #include "hostpid.h" #include "path-util.h" #include "restrict-access.h" -#include "fd-close-on-exec.h" #include "anvil-client.h" #include "master-service.h" #include "master-service-settings.h" diff --git a/src/login-common/login-proxy-state.c b/src/login-common/login-proxy-state.c index 9815e33d89..fc2d395a53 100644 --- a/src/login-common/login-proxy-state.c +++ b/src/login-common/login-proxy-state.c @@ -5,7 +5,6 @@ #include "ioloop.h" #include "hash.h" #include "strescape.h" -#include "fd-set-nonblock.h" #include "login-proxy-state.h" #include diff --git a/src/master/dup2-array.c b/src/master/dup2-array.c index e1d54de468..87c4c502aa 100644 --- a/src/master/dup2-array.c +++ b/src/master/dup2-array.c @@ -2,7 +2,6 @@ #include "lib.h" #include "array.h" -#include "fd-close-on-exec.h" #include "dup2-array.h" #include diff --git a/src/master/main.c b/src/master/main.c index cc9a169203..a31e5736f0 100644 --- a/src/master/main.c +++ b/src/master/main.c @@ -3,7 +3,6 @@ #include "common.h" #include "ioloop.h" #include "lib-signals.h" -#include "fd-close-on-exec.h" #include "array.h" #include "write-full.h" #include "env-util.h" diff --git a/src/master/service-anvil.c b/src/master/service-anvil.c index 7b625eace0..76c6ea029c 100644 --- a/src/master/service-anvil.c +++ b/src/master/service-anvil.c @@ -2,8 +2,6 @@ #include "common.h" #include "ioloop.h" -#include "fd-close-on-exec.h" -#include "fd-set-nonblock.h" #include "fdpass.h" #include "service.h" #include "service-process.h" diff --git a/src/master/service-listen.c b/src/master/service-listen.c index 036dedcbec..038efe042e 100644 --- a/src/master/service-listen.c +++ b/src/master/service-listen.c @@ -2,8 +2,6 @@ #include "common.h" #include "array.h" -#include "fd-set-nonblock.h" -#include "fd-close-on-exec.h" #include "ioloop.h" #include "net.h" #ifdef HAVE_SYSTEMD diff --git a/src/master/service-log.c b/src/master/service-log.c index a4e01876c3..a5672e079b 100644 --- a/src/master/service-log.c +++ b/src/master/service-log.c @@ -5,8 +5,6 @@ #include "aqueue.h" #include "hash.h" #include "ioloop.h" -#include "fd-close-on-exec.h" -#include "fd-set-nonblock.h" #include "service.h" #include "service-process.h" #include "service-process-notify.h" diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c index 16fa13cf29..720ac853a9 100644 --- a/src/master/service-monitor.c +++ b/src/master/service-monitor.c @@ -3,7 +3,6 @@ #include "common.h" #include "array.h" #include "ioloop.h" -#include "fd-close-on-exec.h" #include "hash.h" #include "str.h" #include "safe-mkstemp.h" diff --git a/src/master/service-process.c b/src/master/service-process.c index c869da1a64..5a72247f23 100644 --- a/src/master/service-process.c +++ b/src/master/service-process.c @@ -14,7 +14,6 @@ #include "llist.h" #include "hostpid.h" #include "env-util.h" -#include "fd-close-on-exec.h" #include "restrict-access.h" #include "restrict-process-size.h" #include "eacces-error.h" diff --git a/src/plugins/mail-filter/istream-ext-filter.c b/src/plugins/mail-filter/istream-ext-filter.c index 682fbca5af..1b1dc6056e 100644 --- a/src/plugins/mail-filter/istream-ext-filter.c +++ b/src/plugins/mail-filter/istream-ext-filter.c @@ -5,7 +5,6 @@ #include "strescape.h" #include "net.h" #include "eacces-error.h" -#include "fd-set-nonblock.h" #include "ostream.h" #include "istream-private.h" #include "istream-ext-filter.h" diff --git a/src/plugins/replication/replication-plugin.c b/src/plugins/replication/replication-plugin.c index aa61285e52..4d0679597c 100644 --- a/src/plugins/replication/replication-plugin.c +++ b/src/plugins/replication/replication-plugin.c @@ -4,7 +4,6 @@ #include "array.h" #include "str.h" #include "strescape.h" -#include "fd-set-nonblock.h" #include "ioloop.h" #include "net.h" #include "write-full.h" diff --git a/src/util/rawlog.c b/src/util/rawlog.c index f0f4ef7f54..9b7f1d3a4d 100644 --- a/src/util/rawlog.c +++ b/src/util/rawlog.c @@ -3,7 +3,6 @@ #include "lib.h" #include "ioloop.h" -#include "fd-set-nonblock.h" #include "net.h" #include "str.h" #include "write-full.h"