Use the new sorting rules to regroup #include headers

bin/check/named-checkconf.c

@@ -38,10 +38,10 @@
 #include <isccfg/grammar.h>
 #include <isccfg/namedconf.h>
 
-#include "check-tool.h"
-
 #include <bind9/check.h>
 
+#include "check-tool.h"
+
 static const char *program = "named-checkconf";
 
 static bool loadplugins = true;

bin/confgen/ddns-confgen.c

@@ -42,11 +42,12 @@
 #include <dns/name.h>
 #include <dns/result.h>
 
-#include "keygen.h"
-#include "util.h"
+#include <dst/dst.h>
 
 #include <confgen/os.h>
-#include <dst/dst.h>
+
+#include "keygen.h"
+#include "util.h"
 
 #define KEYGEN_DEFAULT	"tsig-key"
 #define CONFGEN_DEFAULT "ddns-key"

bin/confgen/keygen.c

@@ -12,7 +12,6 @@
 /*! \file */
 
 #include "keygen.h"
-
 #include <stdarg.h>
 #include <stdlib.h>
 
@@ -24,14 +23,16 @@
 #include <isc/result.h>
 #include <isc/string.h>
 
+#include <pk11/site.h>
+
 #include <dns/keyvalues.h>
 #include <dns/name.h>
 
-#include "util.h"
+#include <dst/dst.h>
 
 #include <confgen/os.h>
-#include <dst/dst.h>
-#include <pk11/site.h>
+
+#include "util.h"
 
 /*%
  * Convert algorithm type to string.

bin/confgen/rndc-confgen.c

@@ -37,15 +37,17 @@
 #include <isc/time.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/keyvalues.h>
 #include <dns/name.h>
 
-#include "keygen.h"
-#include "util.h"
+#include <dst/dst.h>
 
 #include <confgen/os.h>
-#include <dst/dst.h>
-#include <pk11/site.h>
+
+#include "keygen.h"
+#include "util.h"
 
 #define DEFAULT_KEYNAME "rndc-key"
 #define DEFAULT_SERVER	"127.0.0.1"

bin/confgen/unix/os.c

@@ -15,11 +15,11 @@
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <confgen/os.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 int
 set_user(FILE *fd, const char *user) {

bin/confgen/util.c

@@ -12,7 +12,6 @@
 /*! \file */
 
 #include "util.h"
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>

bin/confgen/win32/os.c

@@ -13,11 +13,11 @@
 #include <fcntl.h>
 #include <io.h>
 #include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <confgen/os.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 int
 set_user(FILE *fd, const char *user) {

bin/delv/delv.c

@@ -12,11 +12,10 @@
 #include <bind.keys.h>
 
 #ifndef WIN32
-#include <netdb.h>
-#include <signal.h>
-
 #include <arpa/inet.h>
+#include <netdb.h>
 #include <netinet/in.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #endif /* ifndef WIN32 */
@@ -66,11 +65,12 @@
 #include <dns/secalg.h>
 #include <dns/view.h>
 
+#include <dst/dst.h>
+#include <dst/result.h>
+
 #include <isccfg/log.h>
 #include <isccfg/namedconf.h>
 
-#include <dst/dst.h>
-#include <dst/result.h>
 #include <irs/netdb.h>
 #include <irs/resconf.h>
 

bin/dig/dig.c

@@ -26,6 +26,8 @@
 #include <isc/task.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/byaddr.h>
 #include <dns/fixedname.h>
 #include <dns/masterdump.h>
@@ -40,7 +42,6 @@
 #include <dns/tsig.h>
 
 #include <dig/dig.h>
-#include <pk11/site.h>
 
 #define ADD_STRING(b, s)                                          \
 	{                                                         \

bin/dig/dighost.c

@@ -57,6 +57,8 @@
 #include <isc/types.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/byaddr.h>
 #include <dns/fixedname.h>
 #include <dns/log.h>
@@ -72,14 +74,16 @@
 #include <dns/result.h>
 #include <dns/tsig.h>
 
+#include <dst/dst.h>
+#include <dst/result.h>
+
 #include <isccfg/namedconf.h>
 
+#include <irs/resconf.h>
+
 #include <bind9/getaddresses.h>
+
 #include <dig/dig.h>
-#include <dst/dst.h>
-#include <dst/result.h>
-#include <irs/resconf.h>
-#include <pk11/site.h>
 
 #if USE_PKCS11
 #include <pk11/result.h>

bin/dnssec/dnssec-keyfromlabel.c

@@ -24,6 +24,8 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/dnssec.h>
 #include <dns/fixedname.h>
 #include <dns/keyvalues.h>
@@ -34,7 +36,6 @@
 #include <dns/secalg.h>
 
 #include <dst/dst.h>
-#include <pk11/site.h>
 
 #if USE_PKCS11
 #include <pk11/result.h>

bin/dnssec/dnssec-keygen.c

@@ -39,6 +39,8 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/dnssec.h>
 #include <dns/fixedname.h>
 #include <dns/kasp.h>
@@ -49,14 +51,13 @@
 #include <dns/result.h>
 #include <dns/secalg.h>
 
+#include <dst/dst.h>
+
 #include <isccfg/cfg.h>
 #include <isccfg/grammar.h>
 #include <isccfg/kaspconf.h>
 #include <isccfg/namedconf.h>
 
-#include <dst/dst.h>
-#include <pk11/site.h>
-
 #if USE_PKCS11
 #include <pk11/result.h>
 #endif /* if USE_PKCS11 */

bin/named/config.c

@@ -25,6 +25,8 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/fixedname.h>
 #include <dns/name.h>
 #include <dns/rdataclass.h>
@@ -32,13 +34,13 @@
 #include <dns/tsig.h>
 #include <dns/zone.h>
 
+#include <dst/dst.h>
+
 #include <isccfg/grammar.h>
 #include <isccfg/namedconf.h>
 
-#include <dst/dst.h>
 #include <named/config.h>
 #include <named/globals.h>
-#include <pk11/site.h>
 
 /*% default configuration */
 static char defaultconf[] = "\

bin/named/control.c

@@ -26,6 +26,7 @@
 #include <isccc/alist.h>
 #include <isccc/cc.h>
 #include <isccc/result.h>
+
 #include <named/control.h>
 #include <named/globals.h>
 #include <named/log.h>

bin/named/controlconf.c

@@ -31,9 +31,6 @@
 
 #include <dns/result.h>
 
-#include <isccfg/namedconf.h>
-
-#include <bind9/check.h>
 #include <isccc/alist.h>
 #include <isccc/cc.h>
 #include <isccc/ccmsg.h>
@@ -42,6 +39,11 @@
 #include <isccc/sexpr.h>
 #include <isccc/symtab.h>
 #include <isccc/util.h>
+
+#include <isccfg/namedconf.h>
+
+#include <bind9/check.h>
+
 #include <named/config.h>
 #include <named/control.h>
 #include <named/log.h>

bin/named/fuzz.c

@@ -15,6 +15,7 @@
 #include <named/fuzz.h>
 
 #ifdef ENABLE_AFL
+#include <arpa/inet.h>
 #include <errno.h>
 #include <pthread.h>
 #include <signal.h>
@@ -30,7 +31,6 @@
 
 #include <dns/log.h>
 
-#include <arpa/inet.h>
 #include <named/globals.h>
 #include <named/log.h>
 #include <named/server.h>

bin/named/main.c

@@ -44,6 +44,7 @@
 #include <dns/view.h>
 
 #include <dst/result.h>
+
 #include <isccc/result.h>
 #if USE_PKCS11
 #include <pk11/result.h>

bin/named/server.c

@@ -16,6 +16,8 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/aes.h>
@@ -91,6 +93,9 @@
 #include <dns/zone.h>
 #include <dns/zt.h>
 
+#include <dst/dst.h>
+#include <dst/result.h>
+
 #include <isccfg/grammar.h>
 #include <isccfg/kaspconf.h>
 #include <isccfg/namedconf.h>
@@ -101,12 +106,9 @@
 #include <ns/listenlist.h>
 
 #include <bind9/check.h>
-#include <dst/dst.h>
-#include <dst/result.h>
+
 #include <named/config.h>
 #include <named/control.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #if defined(HAVE_GEOIP2)
 #include <named/geoip.h>
 #endif /* HAVE_GEOIP2 */

bin/named/statschannel.c

@@ -43,9 +43,8 @@
 #include <named/statschannel.h>
 
 #if HAVE_JSON_C
-#include <linkhash.h>
-
 #include <json_object.h>
+#include <linkhash.h>
 #endif /* HAVE_JSON_C */
 
 #if HAVE_LIBXML2

bin/named/tkeyconf.c

@@ -22,9 +22,10 @@
 #include <dns/name.h>
 #include <dns/tkey.h>
 
+#include <dst/gssapi.h>
+
 #include <isccfg/cfg.h>
 
-#include <dst/gssapi.h>
 #include <named/tkeyconf.h>
 
 #define RETERR(x)                            \

bin/named/unix/os.c

@@ -12,7 +12,6 @@
 /*! \file */
 #include <stdarg.h>
 #include <stdbool.h>
-
 #include <sys/stat.h>
 #include <sys/types.h> /* dev_t FreeBSD 2.1 */
 #ifdef HAVE_UNAME

bin/named/win32/os.c

@@ -18,6 +18,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <syslog.h>
 
 #include <isc/ntpaths.h>
@@ -32,8 +34,6 @@
 #include <named/main.h>
 #include <named/ntservice.h>
 #include <named/os.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 static char *lockfile = NULL;
 static char *pidfile = NULL;

bin/nsupdate/nsupdate.c

@@ -45,6 +45,8 @@
 #include <isc/types.h>
 #include <isc/util.h>
 
+#include <pk11/site.h>
+
 #include <dns/callbacks.h>
 #include <dns/dispatch.h>
 #include <dns/dnssec.h>
@@ -66,11 +68,11 @@
 #include <dns/tkey.h>
 #include <dns/tsig.h>
 
+#include <dst/dst.h>
+
 #include <isccfg/namedconf.h>
 
-#include <dst/dst.h>
 #include <irs/resconf.h>
-#include <pk11/site.h>
 
 #ifdef GSSAPI
 #include <dst/gssapi.h>

bin/pkcs11/pkcs11-destroy.c

@@ -50,6 +50,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <isc/commandline.h>
 #include <isc/print.h>
@@ -58,7 +59,6 @@
 
 #include <pk11/pk11.h>
 #include <pk11/result.h>
-#include <sys/types.h>
 
 #ifdef WIN32
 #define sleep(x) Sleep(x)

bin/pkcs11/pkcs11-keygen.c

@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <isc/commandline.h>
 #include <isc/print.h>
@@ -70,7 +71,6 @@
 #include <pk11/pk11.h>
 #include <pk11/result.h>
 #include <pkcs11/eddsa.h>
-#include <sys/types.h>
 
 /* Define static key template values */
 static CK_BBOOL truevalue = TRUE;

bin/pkcs11/pkcs11-list.c

@@ -43,6 +43,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <isc/commandline.h>
 #include <isc/print.h>
@@ -51,7 +52,6 @@
 
 #include <pk11/pk11.h>
 #include <pk11/result.h>
-#include <sys/types.h>
 
 int
 main(int argc, char *argv[]) {

bin/pkcs11/pkcs11-tokens.c

@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include <isc/commandline.h>
 #include <isc/mem.h>
@@ -27,7 +28,6 @@
 
 #include <pk11/pk11.h>
 #include <pk11/result.h>
-#include <sys/types.h>
 
 int
 main(int argc, char *argv[]) {

bin/rndc/rndc.c

@@ -33,13 +33,10 @@
 #include <isc/thread.h>
 #include <isc/util.h>
 
-#include <dns/name.h>
-
-#include <isccfg/namedconf.h>
+#include <pk11/site.h>
 
-#include "util.h"
+#include <dns/name.h>
 
-#include <bind9/getaddresses.h>
 #include <isccc/alist.h>
 #include <isccc/base64.h>
 #include <isccc/cc.h>
@@ -48,7 +45,12 @@
 #include <isccc/sexpr.h>
 #include <isccc/types.h>
 #include <isccc/util.h>
-#include <pk11/site.h>
+
+#include <isccfg/namedconf.h>
+
+#include <bind9/getaddresses.h>
+
+#include "util.h"
 
 #define SERVERADDRS 10
 

bin/rndc/util.c

@@ -12,7 +12,6 @@
 /*! \file */
 
 #include "util.h"
-
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>

bin/tests/optional/fsaccess_test.c

@@ -14,14 +14,13 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/stat.h>  /* Non-portable. */
+#include <sys/types.h> /* Non-portable. */
 
 #include <isc/fsaccess.h>
 #include <isc/print.h>
 #include <isc/result.h>
 
-#include <sys/stat.h>  /* Non-portable. */
-#include <sys/types.h> /* Non-portable. */
-
 #define PATH "/tmp/fsaccess"
 
 int

bin/tests/optional/zone_test.c

@@ -10,6 +10,10 @@
  */
 
 #include <stdlib.h>
+#include <sys/param.h>
+#include <sys/select.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/app.h>
@@ -29,11 +33,6 @@
 #include <dns/result.h>
 #include <dns/zone.h>
 
-#include <sys/param.h>
-#include <sys/select.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
 static int debug = 0;
 static int quiet = 0;
 static int stats = 0;

bin/tests/system/dlzexternal/driver.c

@@ -15,7 +15,6 @@
  */
 
 #include "driver.h"
-
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdbool.h>

bin/tests/system/dyndb/driver/db.c

@@ -12,7 +12,6 @@
  */
 
 #include "db.h"
-
 #include <inttypes.h>
 #include <stdbool.h>
 

bin/tests/system/dyndb/driver/zone.c

@@ -5,7 +5,6 @@
  */
 
 #include "zone.h"
-
 #include <inttypes.h>
 #include <stdbool.h>
 

bin/tests/system/rndc/gencheck.c

@@ -13,12 +13,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include <isc/print.h>
 
-#include <sys/stat.h>
-
 #define USAGE "usage: gencheck <filename>\n"
 
 static int

bin/tests/system/rpz/dnsrps.c

@@ -27,14 +27,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <isc/print.h>
 #include <isc/util.h>
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #ifdef USE_DNSRPS
 #define LIBRPZ_LIB_OPEN DNSRPS_LIB_OPEN
 #include <dns/librpz.h>

bin/tests/system/rsabigexponent/bigkey.c

@@ -23,6 +23,12 @@
 
 #define DST_KEY_INTERNAL
 
+#include <openssl/bn.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+