diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-08-02 08:41:48 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-08-06 09:57:00 +0200 |
| commit | 72938b9309e5c8e392d58a58776d0f60b60806db (patch) | |
| tree | 25a39d7306818907291345dc6155f1a8c14eb9a1 /src | |
| parent | Merge pull request #9775 from yuwata/follow-up-9766 (diff) | |
| download | systemd-72938b9309e5c8e392d58a58776d0f60b60806db.tar.xz systemd-72938b9309e5c8e392d58a58776d0f60b60806db.zip | |
resolve: sort headers
Diffstat (limited to 'src')
| -rw-r--r-- | src/resolve/resolved-dnstls-gnutls.c | 6 | ||||
| -rw-r--r-- | src/resolve/resolved-dnstls-gnutls.h | 3 | ||||
| -rw-r--r-- | src/resolve/resolved-dnstls-openssl.c | 6 | ||||
| -rw-r--r-- | src/resolve/resolved-dnstls-openssl.h | 3 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/resolve/resolved-dnstls-gnutls.c b/src/resolve/resolved-dnstls-gnutls.c index 820e1926fd..15055284d5 100644 --- a/src/resolve/resolved-dnstls-gnutls.c +++ b/src/resolve/resolved-dnstls-gnutls.c @@ -4,11 +4,11 @@ #error This source file requires DNS-over-TLS to be enabled and GnuTLS to be available. #endif -#include "resolved-dnstls.h" -#include "resolved-dns-stream.h" - #include <gnutls/socket.h> +#include "resolved-dns-stream.h" +#include "resolved-dnstls.h" + DEFINE_TRIVIAL_CLEANUP_FUNC(gnutls_session_t, gnutls_deinit); static ssize_t dnstls_stream_writev(gnutls_transport_ptr_t p, const giovec_t *iov, int iovcnt) { diff --git a/src/resolve/resolved-dnstls-gnutls.h b/src/resolve/resolved-dnstls-gnutls.h index 364eea1a03..41c89f2737 100644 --- a/src/resolve/resolved-dnstls-gnutls.h +++ b/src/resolve/resolved-dnstls-gnutls.h @@ -5,9 +5,8 @@ #error This source file requires DNS-over-TLS to be enabled and GnuTLS to be available. #endif -#include <stdbool.h> - #include <gnutls/gnutls.h> +#include <stdbool.h> struct DnsTlsServerData { gnutls_certificate_credentials_t cert_cred; diff --git a/src/resolve/resolved-dnstls-openssl.c b/src/resolve/resolved-dnstls-openssl.c index a7a8b1152a..9242f6ab08 100644 --- a/src/resolve/resolved-dnstls-openssl.c +++ b/src/resolve/resolved-dnstls-openssl.c @@ -4,12 +4,12 @@ #error This source file requires DNS-over-TLS to be enabled and OpenSSL to be available. #endif -#include "resolved-dnstls.h" -#include "resolved-dns-stream.h" - #include <openssl/bio.h> #include <openssl/err.h> +#include "resolved-dns-stream.h" +#include "resolved-dnstls.h" + DEFINE_TRIVIAL_CLEANUP_FUNC(SSL*, SSL_free); DEFINE_TRIVIAL_CLEANUP_FUNC(BIO*, BIO_free); diff --git a/src/resolve/resolved-dnstls-openssl.h b/src/resolve/resolved-dnstls-openssl.h index c57bc1c57c..f0dccf32e6 100644 --- a/src/resolve/resolved-dnstls-openssl.h +++ b/src/resolve/resolved-dnstls-openssl.h @@ -5,9 +5,8 @@ #error This source file requires DNS-over-TLS to be enabled and OpenSSL to be available. #endif -#include <stdbool.h> - #include <openssl/ssl.h> +#include <stdbool.h> struct DnsTlsServerData { SSL_CTX *ctx; |