From: Yu Watanabe Date: Thu, 2 Aug 2018 06:41:48 +0000 (+0900) Subject: resolve: sort headers X-Git-Tag: v240~862 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72938b9309e5c8e392d58a58776d0f60b60806db;p=thirdparty%2Fsystemd.git resolve: sort headers --- diff --git a/src/resolve/resolved-dnstls-gnutls.c b/src/resolve/resolved-dnstls-gnutls.c index 820e1926fd5..15055284d5c 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 +#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 364eea1a038..41c89f27375 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 - #include +#include 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 a7a8b1152a9..9242f6ab08d 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 #include +#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 c57bc1c57c9..f0dccf32e65 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 - #include +#include struct DnsTlsServerData { SSL_CTX *ctx;