Apply adjusted clang-format

The headers were slightly reordered when liburcu was added.

diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
index 8f0681aa38a31e7c9459021ebd0ea8ea12d2cb5e..ee938a59739a302a2d49d9450e5bf3f906a23174 100644 (file)
--- a/bin/named/include/named/control.h
+++ b/bin/named/include/named/control.h
@@ -20,9 +20,10 @@
 
 #include <stdbool.h>
 
+#include <isccc/types.h>
+
 #include <isccfg/aclconf.h>
 
-#include <isccc/types.h>
 #include <named/types.h>
 
 #define NAMED_CONTROL_PORT 953

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 40b37143bc141ff1782419c48c13a7b4de78bcd0..4f64c13a133570fb934d012b9d5751cf1dee3e84 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -26,10 +26,11 @@
 #include <dns/acl.h>
 #include <dns/zone.h>
 
+#include <dst/dst.h>
+
 #include <isccfg/aclconf.h>
 #include <isccfg/cfg.h>
 
-#include <dst/dst.h>
 #include <named/fuzz.h>
 #include <named/types.h>
 

diff --git a/bin/named/include/named/statschannel.h b/bin/named/include/named/statschannel.h
index 8240dc12d6975c42d521b0eb13ad1ff42bf020a2..8cce67083ab2b45cc4c049e96f6ce5e4effd7280 100644 (file)
--- a/bin/named/include/named/statschannel.h
+++ b/bin/named/include/named/statschannel.h
@@ -18,9 +18,10 @@
  * The statistics channels built-in the name server.
  */
 
+#include <isccc/types.h>
+
 #include <isccfg/aclconf.h>
 
-#include <isccc/types.h>
 #include <named/types.h>
 
 #define NAMED_STATSCHANNEL_HTTPPORT 80

diff --git a/contrib/dlz/modules/include/dlz_minimal.h b/contrib/dlz/modules/include/dlz_minimal.h
index 0bc092aeadd677d44bfc04ebad0da944565a77e6..7acdbb19caf2c32fe7c3a7800cd6b25e4b168adb 100644 (file)
--- a/contrib/dlz/modules/include/dlz_minimal.h
+++ b/contrib/dlz/modules/include/dlz_minimal.h
@@ -25,13 +25,12 @@
 
 #pragma once
 
-#include <inttypes.h>
-#include <stdbool.h>
-#include <stdlib.h>
-
 #include <arpa/inet.h>
+#include <inttypes.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#include <stdbool.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>

diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h
index 48718232cd152df7f5a4b244bc8bef281359a416..c99920cb77f93312d9189abc8d5b134aa3fdf37c 100644 (file)
--- a/lib/dns/include/dns/librpz.h
+++ b/lib/dns/include/dns/librpz.h
@@ -36,13 +36,12 @@
 
 #pragma once
 
+#include <arpa/nameser.h>
 #include <inttypes.h>
+#include <netinet/in.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
-
-#include <arpa/nameser.h>
-#include <netinet/in.h>
 #include <sys/types.h>
 
 /*

diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 34a3f2e6ebdbd229faf5c8916902cdffcdc9511b..83ea6bb40627c729ac37f569820b8bc3172fa33d 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -46,6 +46,7 @@
  */
 
 #include <inttypes.h>
+#include <netinet/in.h>
 #include <stdbool.h>
 
 #include <isc/lang.h>
@@ -58,8 +59,6 @@
 #include <dns/fixedname.h>
 #include <dns/types.h>
 
-#include <netinet/in.h>
-
 #undef DNS_RESOLVER_TRACE
 
 ISC_LANG_BEGINDECLS

diff --git a/lib/isc/include/isc/dir.h b/lib/isc/include/isc/dir.h
index 90c327ecb448f24690537e6e5035997018b84346..51db17f75adf4eadffa3ad9d76f00cffbe4c5d43 100644 (file)
--- a/lib/isc/include/isc/dir.h
+++ b/lib/isc/include/isc/dir.h
@@ -17,12 +17,11 @@
 
 #include <dirent.h>
 #include <limits.h>
+#include <sys/types.h> /* Required on some systems. */
 
 #include <isc/lang.h>
 #include <isc/result.h>
 
-#include <sys/types.h> /* Required on some systems. */
-
 #ifndef NAME_MAX
 #define NAME_MAX 256
 #endif

diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 73aeaf8265d63c563393aa0b91661d3a046a17a8..61365a32d2399161618c70a8e4558cec7d8cbee3 100644 (file)
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -17,12 +17,11 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <sys/stat.h>
 
 #include <isc/lang.h>
 #include <isc/types.h>
 
-#include <sys/stat.h>
-
 ISC_LANG_BEGINDECLS
 
 isc_result_t

diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index 1a3ce63e050cf315c48c844af1b6801bef120001..320c5f682df322ff6dde8de962038202826aeffa 100644 (file)
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -65,17 +65,16 @@
 /***
  *** Imports.
  ***/
-#include <inttypes.h>
-
-#include <isc/lang.h>
-#include <isc/types.h>
-
 #include <arpa/inet.h> /* Contractual promise. */
+#include <inttypes.h>
 #include <net/if.h>
 #include <netinet/in.h> /* Contractual promise. */
 #include <sys/socket.h> /* Contractual promise. */
 #include <sys/types.h>
 
+#include <isc/lang.h>
+#include <isc/types.h>
+
 #ifndef IN6ADDR_LOOPBACK_INIT
 #ifdef s6_addr
 /*% IPv6 address loopback init */

diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index 112051f9f9a9ea468e833ec86a094819d6dcf4eb..e2d0613ed6fa797655f872516405bdb7b608288c 100644 (file)
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -17,14 +17,13 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
+#include <sys/types.h>
+#include <sys/un.h>
 
 #include <isc/lang.h>
 #include <isc/net.h>
 #include <isc/types.h>
 
-#include <sys/types.h>
-#include <sys/un.h>
-
 ISC_LANG_BEGINDECLS
 
 /*

diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h
index 9201dee880fa6278a718bcbfc7af154308c197ec..ddec791437a0f357509a8e10261b6dcf7f1609e4 100644 (file)
--- a/lib/isc/include/isc/netmgr.h
+++ b/lib/isc/include/isc/netmgr.h
@@ -13,6 +13,8 @@
 
 #pragma once
 
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/mem.h>
@@ -21,9 +23,6 @@
 #include <isc/tls.h>
 #include <isc/types.h>
 
-#include <sys/socket.h>
-#include <sys/types.h>
-
 #undef ISC_NETMGR_TRACE
 
 #if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__))

diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 9f3986b01ff62f6aa24f079a46f70f4990ac2b9b..5d86d49895ea76948cceba75b6802104dd6a912f 100644 (file)
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -16,13 +16,12 @@
 /*! \file isc/sockaddr.h */
 
 #include <stdbool.h>
+#include <sys/un.h>
 
 #include <isc/lang.h>
 #include <isc/net.h>
 #include <isc/types.h>
 
-#include <sys/un.h>
-
 /*
  * Any updates to this structure should also be applied in
  * contrib/modules/dlz/dlz_minmal.h.

diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h
index f597276756d68eb253715d18ff7e75b941d0e695..20fe17b7dbf49b83f5c9bfe7a12c949066a19a70 100644 (file)
--- a/lib/isccc/include/isccc/cc.h
+++ b/lib/isccc/include/isccc/cc.h
@@ -38,6 +38,7 @@
 #include <isc/lang.h>
 
 #include <dst/dst.h>
+
 #include <isccc/types.h>
 
 ISC_LANG_BEGINDECLS