From bed09c16766af79a3646a006585abd0c4f00f407 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Fri, 16 Dec 2022 11:04:39 +0000 Subject: [PATCH 1/5] Remove do-nothing header Not needed since we dropped Windows support --- bin/check/check-tool.c | 2 +- bin/dig/dighost.c | 2 +- lib/bind9/getaddresses.c | 2 +- lib/dns/rdata/in_1/wks_11.c | 3 +-- lib/isc/Makefile.am | 1 - lib/isc/dir.c | 2 +- lib/isc/include/isc/netdb.h | 48 ------------------------------------- lib/isc/net.c | 2 +- lib/isc/sockaddr.c | 1 + 9 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 lib/isc/include/isc/netdb.h diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index ce36194d7a..748f591852 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -14,6 +14,7 @@ /*! \file */ #include +#include #include #include @@ -21,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 6e4aefc51e..e6eead53fd 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -42,7 +43,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c index 5fa77704fe..9e2e9d3d79 100644 --- a/lib/bind9/getaddresses.c +++ b/lib/bind9/getaddresses.c @@ -14,12 +14,12 @@ /*! \file */ #include +#include #include #include #include #include -#include #include #include #include diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index ca55126fd1..0c9163a2bd 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -15,11 +15,10 @@ #define RDATA_IN_1_WKS_11_C #include -#include +#include #include #include -#include #include #define RRTYPE_WKS_ATTRIBUTES (0) diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am index 8bc44fc864..314a70df91 100644 --- a/lib/isc/Makefile.am +++ b/lib/isc/Makefile.am @@ -58,7 +58,6 @@ libisc_la_HEADERS = \ include/isc/mutexblock.h \ include/isc/net.h \ include/isc/netaddr.h \ - include/isc/netdb.h \ include/isc/netmgr.h \ include/isc/netscope.h \ include/isc/nonce.h \ diff --git a/lib/isc/dir.c b/lib/isc/dir.c index 473618cb57..9104ca4250 100644 --- a/lib/isc/dir.c +++ b/lib/isc/dir.c @@ -15,13 +15,13 @@ #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/lib/isc/include/isc/netdb.h b/lib/isc/include/isc/netdb.h deleted file mode 100644 index 93799d7589..0000000000 --- a/lib/isc/include/isc/netdb.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#pragma once - -/***** -***** Module Info -*****/ - -/*! \file - * \brief - * Portable netdb.h support. - * - * This module is responsible for defining the getby APIs. - * - * MP: - *\li No impact. - * - * Reliability: - *\li No anticipated impact. - * - * Resources: - *\li N/A. - * - * Security: - *\li No anticipated impact. - * - * Standards: - *\li BSD API - */ - -/*** - *** Imports. - ***/ - -#include - -#include diff --git a/lib/isc/net.c b/lib/isc/net.c index 4ac0450388..507fdf5dbb 100644 --- a/lib/isc/net.c +++ b/lib/isc/net.c @@ -22,12 +22,12 @@ #endif /* if defined(HAVE_SYS_SYSCTL_H) && !defined(__linux__) */ #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c index 038e3ec7c4..529e820bab 100644 --- a/lib/isc/sockaddr.c +++ b/lib/isc/sockaddr.c @@ -13,6 +13,7 @@ /*! \file */ +#include #include #include From c7615bc28d2dd14d54c45c15500e70bb822f3a54 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Fri, 16 Dec 2022 11:47:40 +0000 Subject: [PATCH 2/5] Remove do-nothing header And replace all uses of isc_offset_t with standard off_t --- bin/named/logconf.c | 9 ++++----- lib/dns/dnstap.c | 2 +- lib/dns/journal.c | 18 +++++++++--------- lib/isc/Makefile.am | 1 - lib/isc/file.c | 2 +- lib/isc/include/isc/file.h | 2 +- lib/isc/include/isc/log.h | 4 ++-- lib/isc/include/isc/offset.h | 25 ------------------------- lib/isc/include/isc/time.h | 3 +-- lib/isc/include/isc/types.h | 6 +++--- 10 files changed, 22 insertions(+), 50 deletions(-) delete mode 100644 lib/isc/include/isc/offset.h diff --git a/bin/named/logconf.c b/bin/named/logconf.c index 5fd0904f43..59dfb2fb8f 100644 --- a/bin/named/logconf.c +++ b/bin/named/logconf.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -146,14 +145,14 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { const cfg_obj_t *suffixobj = cfg_tuple_get(fileobj, "suffix"); int32_t versions = ISC_LOG_ROLLNEVER; isc_log_rollsuffix_t suffix = isc_log_rollsuffix_increment; - isc_offset_t size = 0; + off_t size = 0; uint64_t maxoffset; /* - * isc_offset_t is a signed integer type, so the maximum + * off_t is a signed integer type, so the maximum * value is all 1s except for the MSB. */ - switch (sizeof(isc_offset_t)) { + switch (sizeof(off_t)) { case 4: maxoffset = 0x7fffffffULL; break; @@ -178,7 +177,7 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { if (sizeobj != NULL && cfg_obj_isuint64(sizeobj) && cfg_obj_asuint64(sizeobj) < maxoffset) { - size = (isc_offset_t)cfg_obj_asuint64(sizeobj); + size = (off_t)cfg_obj_asuint64(sizeobj); } if (suffixobj != NULL && cfg_obj_isstring(suffixobj) && strcasecmp(cfg_obj_asstring(suffixobj), "timestamp") == 0) diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c index 784acd92f1..2137e74db7 100644 --- a/lib/dns/dnstap.c +++ b/lib/dns/dnstap.c @@ -118,7 +118,7 @@ struct dns_dtenv { isc_region_t version; char *path; dns_dtmode_t mode; - isc_offset_t max_size; + off_t max_size; int rolls; isc_log_rollsuffix_t suffix; isc_stats_t *stats; diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 62038a01b2..66a6e74324 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -184,7 +184,7 @@ typedef struct { unsigned char serial[4]; /*%< SOA serial before update. */ /* * XXXRTH Should offset be 8 bytes? - * XXXDCL ... probably, since isc_offset_t is 8 bytes on many OSs. + * XXXDCL ... probably, since off_t is 8 bytes on many OSs. * XXXAG ... but we will not be able to seek >2G anyway on many * platforms as long as we are using fseek() rather * than lseek(). @@ -259,7 +259,7 @@ typedef struct { */ typedef struct { uint32_t serial; - isc_offset_t offset; + off_t offset; } journal_pos_t; #define POS_VALID(pos) ((pos).offset != 0) @@ -330,7 +330,7 @@ struct dns_journal { * while reading the journal */ char *filename; /*%< Journal file name */ FILE *fp; /*%< File handle */ - isc_offset_t offset; /*%< Current file offset */ + off_t offset; /*%< Current file offset */ journal_xhdr_t curxhdr; /*%< Current transaction header */ journal_header_t header; /*%< In-core journal header */ unsigned char *rawindex; /*%< In-core buffer for journal index @@ -441,7 +441,7 @@ journal_read(dns_journal_t *j, void *mem, size_t nbytes) { isc_result_totext(result)); return (ISC_R_UNEXPECTED); } - j->offset += (isc_offset_t)nbytes; + j->offset += (off_t)nbytes; return (ISC_R_SUCCESS); } @@ -456,7 +456,7 @@ journal_write(dns_journal_t *j, void *mem, size_t nbytes) { isc_result_totext(result)); return (ISC_R_UNEXPECTED); } - j->offset += (isc_offset_t)nbytes; + j->offset += (off_t)nbytes; return (ISC_R_SUCCESS); } @@ -857,7 +857,7 @@ ixfr_order(const void *av, const void *bv) { static isc_result_t maybe_fixup_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr, uint32_t serial, - isc_offset_t offset) { + off_t offset) { isc_result_t result = ISC_R_SUCCESS; /* @@ -990,7 +990,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) { ? sizeof(journal_rawxhdr_t) : sizeof(journal_rawxhdr_ver1_t); - if ((isc_offset_t)(pos->offset + hdrsize + xhdr.size) < pos->offset) { + if ((off_t)(pos->offset + hdrsize + xhdr.size) < pos->offset) { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "%s: offset too large", j->filename); return (ISC_R_UNEXPECTED); @@ -1367,7 +1367,7 @@ dns_journal_commit(dns_journal_t *j) { CHECK(journal_fsync(j)); if (j->state == JOURNAL_STATE_TRANSACTION) { - isc_offset_t offset; + off_t offset; offset = (j->x.pos[1].offset - j->x.pos[0].offset) - (j->header_ver1 ? sizeof(journal_rawxhdr_ver1_t) : sizeof(journal_rawxhdr_t)); @@ -2621,7 +2621,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, */ while (rewrite && len > 0) { journal_xhdr_t xhdr; - isc_offset_t offset = j1->offset; + off_t offset = j1->offset; uint32_t count; result = journal_read_xhdr(j1, &xhdr); diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am index 314a70df91..4322f2e686 100644 --- a/lib/isc/Makefile.am +++ b/lib/isc/Makefile.am @@ -61,7 +61,6 @@ libisc_la_HEADERS = \ include/isc/netmgr.h \ include/isc/netscope.h \ include/isc/nonce.h \ - include/isc/offset.h \ include/isc/once.h \ include/isc/os.h \ include/isc/parseint.h \ diff --git a/lib/isc/file.c b/lib/isc/file.c index a1aed8e164..128f985cd9 100644 --- a/lib/isc/file.c +++ b/lib/isc/file.c @@ -584,7 +584,7 @@ isc_file_absolutepath(const char *filename, char *path, size_t pathlen) { } isc_result_t -isc_file_truncate(const char *filename, isc_offset_t size) { +isc_file_truncate(const char *filename, off_t size) { isc_result_t result = ISC_R_SUCCESS; if (truncate(filename, size) < 0) { diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h index 46d0f9246a..2e5d4d2da5 100644 --- a/lib/isc/include/isc/file.h +++ b/lib/isc/include/isc/file.h @@ -287,7 +287,7 @@ isc_file_absolutepath(const char *filename, char *path, size_t pathlen); */ isc_result_t -isc_file_truncate(const char *filename, isc_offset_t size); +isc_file_truncate(const char *filename, off_t size); /*%< * Truncate/extend the file specified to 'size' bytes. */ diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h index 54b4022201..5a9a7a1bb3 100644 --- a/lib/isc/include/isc/log.h +++ b/lib/isc/include/isc/log.h @@ -138,8 +138,8 @@ typedef struct isc_logfile { * anyone would want). st_size returned by fstat should be typedef'd * to a size large enough for the largest possible file on a system. */ - isc_offset_t maximum_size; - bool maximum_reached; /*%< Private. */ + off_t maximum_size; + bool maximum_reached; /*%< Private. */ } isc_logfile_t; /*% diff --git a/lib/isc/include/isc/offset.h b/lib/isc/include/isc/offset.h deleted file mode 100644 index 2b62e2a292..0000000000 --- a/lib/isc/include/isc/offset.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#pragma once - -/*! \file - * \brief - * File offsets are operating-system dependent. - */ -#include /* Required for CHAR_BIT. */ -#include /* For Linux Standard Base. */ - -#include - -typedef off_t isc_offset_t; diff --git a/lib/isc/include/isc/time.h b/lib/isc/include/isc/time.h index e2f232a793..ea9fb9d9c4 100644 --- a/lib/isc/include/isc/time.h +++ b/lib/isc/include/isc/time.h @@ -15,8 +15,7 @@ /*! \file */ -#include -#include +#include #include #include diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h index 94aa5f760b..8e3e9b5b19 100644 --- a/lib/isc/include/isc/types.h +++ b/lib/isc/include/isc/types.h @@ -19,10 +19,10 @@ * \brief * OS-specific types, from the OS-specific include directories. */ -#include +#include #include - -#include +#include +#include /* * XXXDCL This is just for ISC_LIST and ISC_LINK, but gets all of the other From 6927a30926f16086a6a28469a64212a6eafd3e45 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Fri, 16 Dec 2022 12:35:31 +0000 Subject: [PATCH 3/5] Remove do-nothing header This one really truly did nothing. No lines added! --- bin/check/check-tool.c | 1 - bin/check/named-checkconf.c | 1 - bin/check/named-checkzone.c | 1 - bin/confgen/keygen.c | 1 - bin/confgen/rndc-confgen.c | 1 - bin/confgen/tsig-keygen.c | 1 - bin/confgen/util.c | 2 -- bin/delv/delv.c | 1 - bin/dig/dig.c | 1 - bin/dig/dighost.c | 1 - bin/dig/dighost.h | 1 - bin/dig/host.c | 1 - bin/dig/nslookup.c | 1 - bin/dnssec/dnssec-cds.c | 1 - bin/dnssec/dnssec-dsfromkey.c | 1 - bin/dnssec/dnssec-importkey.c | 1 - bin/dnssec/dnssec-keyfromlabel.c | 1 - bin/dnssec/dnssec-keygen.c | 1 - bin/dnssec/dnssec-revoke.c | 1 - bin/dnssec/dnssec-settime.c | 1 - bin/dnssec/dnssec-signzone.c | 1 - bin/dnssec/dnssec-verify.c | 1 - bin/dnssec/dnssectool.c | 1 - bin/named/builtin.c | 1 - bin/named/dlz_dlopen_driver.c | 1 - bin/named/geoip.c | 1 - bin/named/logconf.c | 1 - bin/named/main.c | 1 - bin/named/os.c | 1 - bin/named/server.c | 1 - bin/named/statschannel.c | 1 - bin/named/zoneconf.c | 1 - bin/nsupdate/nsupdate.c | 1 - bin/rndc/rndc.c | 1 - bin/rndc/util.c | 2 -- bin/tests/system/feature-test.c | 1 - bin/tests/system/makejournal.c | 1 - bin/tests/system/pipelined/pipequeries.c | 1 - bin/tests/system/rndc/gencheck.c | 2 -- bin/tests/system/rpz/dnsrps.c | 1 - bin/tests/system/rsabigexponent/bigkey.c | 1 - bin/tests/system/tkey/keycreate.c | 1 - bin/tests/system/tkey/keydelete.c | 1 - bin/tests/test_client.c | 1 - bin/tests/wire_test.c | 1 - bin/tools/arpaname.c | 1 - bin/tools/dnstap-read.c | 1 - bin/tools/mdig.c | 1 - bin/tools/named-journalprint.c | 1 - bin/tools/named-nzd2nzf.c | 2 -- bin/tools/named-rrchecker.c | 1 - bin/tools/nsec3hash.c | 1 - doc/misc/cfg_test.c | 1 - fuzz/dns_message_checksig.c | 1 - fuzz/dns_message_parse.c | 1 - fuzz/dns_rdata_fromtext.c | 1 - lib/bind9/check.c | 1 - lib/dns/adb.c | 1 - lib/dns/badcache.c | 1 - lib/dns/byaddr.c | 1 - lib/dns/cache.c | 1 - lib/dns/callbacks.c | 1 - lib/dns/catz.c | 1 - lib/dns/diff.c | 1 - lib/dns/dispatch.c | 1 - lib/dns/dnssec.c | 1 - lib/dns/dnstap.c | 1 - lib/dns/dst_api.c | 1 - lib/dns/dst_parse.c | 1 - lib/dns/ecs.c | 1 - lib/dns/gssapi_link.c | 1 - lib/dns/gssapictx.c | 1 - lib/dns/journal.c | 1 - lib/dns/keymgr.c | 1 - lib/dns/keytable.c | 1 - lib/dns/master.c | 1 - lib/dns/masterdump.c | 1 - lib/dns/message.c | 1 - lib/dns/name.c | 1 - lib/dns/nta.c | 1 - lib/dns/private.c | 1 - lib/dns/rbt.c | 1 - lib/dns/rbtdb.c | 1 - lib/dns/rcode.c | 1 - lib/dns/rdata.c | 1 - lib/dns/resolver.c | 1 - lib/dns/rpz.c | 1 - lib/dns/rrl.c | 1 - lib/dns/sdb.c | 1 - lib/dns/sdlz.c | 1 - lib/dns/ssu.c | 1 - lib/dns/ssu_external.c | 1 - lib/dns/time.c | 1 - lib/dns/tkey.c | 1 - lib/dns/tsig.c | 1 - lib/dns/ttl.c | 1 - lib/dns/update.c | 1 - lib/dns/validator.c | 1 - lib/dns/view.c | 1 - lib/dns/xfrin.c | 1 - lib/dns/zone.c | 1 - lib/isc/Makefile.am | 1 - lib/isc/assertions.c | 1 - lib/isc/backtrace.c | 1 - lib/isc/commandline.c | 1 - lib/isc/dir.c | 1 - lib/isc/error.c | 1 - lib/isc/file.c | 1 - lib/isc/glob.c | 1 - lib/isc/httpd.c | 1 - lib/isc/include/isc/print.h | 29 ------------------------ lib/isc/interfaceiter.c | 1 - lib/isc/lex.c | 1 - lib/isc/log.c | 1 - lib/isc/loop.c | 1 - lib/isc/mem.c | 1 - lib/isc/mutex.c | 1 - lib/isc/netaddr.c | 1 - lib/isc/netmgr/http.c | 1 - lib/isc/netmgr/netmgr.c | 1 - lib/isc/regex.c | 1 - lib/isc/sockaddr.c | 1 - lib/isc/stats.c | 1 - lib/isc/task.c | 1 - lib/isc/time.c | 1 - lib/isc/timer.c | 1 - lib/isccc/alist.c | 1 - lib/isccc/cc.c | 1 - lib/isccc/sexpr.c | 1 - lib/isccfg/aclconf.c | 1 - lib/isccfg/duration.c | 1 - lib/isccfg/kaspconf.c | 1 - lib/isccfg/namedconf.c | 1 - lib/isccfg/parser.c | 1 - lib/ns/client.c | 1 - lib/ns/hooks.c | 1 - lib/ns/notify.c | 1 - lib/ns/query.c | 1 - lib/ns/update.c | 1 - lib/ns/xfrout.c | 1 - tests/dns/acl_test.c | 1 - tests/dns/dnstap_test.c | 1 - tests/dns/geoip_test.c | 1 - tests/dns/master_test.c | 1 - tests/dns/name_test.c | 1 - tests/dns/rbt_test.c | 1 - tests/dns/rdata_test.c | 1 - tests/dns/rdatasetstats_test.c | 1 - tests/dns/resolver_test.c | 1 - tests/dns/rsa_test.c | 1 - tests/dns/tsig_test.c | 1 - tests/dns/zt_test.c | 1 - tests/include/tests/isc.h | 1 - tests/isc/buffer_test.c | 1 - tests/isc/crc64_test.c | 1 - tests/isc/dnsstream_utils_test.c | 1 - tests/isc/doh_test.c | 1 - tests/isc/hash_test.c | 1 - tests/isc/hashmap_test.c | 1 - tests/isc/ht_test.c | 1 - tests/isc/mem_test.c | 1 - tests/isc/random_test.c | 1 - tests/isc/regex_test.c | 1 - tests/isc/sockaddr_test.c | 1 - tests/isc/symtab_test.c | 1 - tests/isc/task_test.c | 1 - tests/isc/timer_test.c | 1 - tests/isccfg/parser_test.c | 1 - tests/libtest/dns.c | 1 - tests/libtest/ns.c | 1 - tests/ns/listenlist_test.c | 1 - tests/ns/notify_test.c | 1 - util/checklibs.sh | 14 ------------ 173 files changed, 218 deletions(-) delete mode 100644 lib/isc/include/isc/print.h diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index 748f591852..6087f11249 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c index cb844f2bea..807c2c2592 100644 --- a/bin/check/named-checkconf.c +++ b/bin/check/named-checkconf.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c index 39d009fb50..a5d6183617 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c index 97dfa34667..4698d1a078 100644 --- a/bin/confgen/keygen.c +++ b/bin/confgen/keygen.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c index 817929544e..4c2c3cafed 100644 --- a/bin/confgen/rndc-confgen.c +++ b/bin/confgen/rndc-confgen.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/confgen/tsig-keygen.c b/bin/confgen/tsig-keygen.c index b44f1a9158..620717c626 100644 --- a/bin/confgen/tsig-keygen.c +++ b/bin/confgen/tsig-keygen.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/confgen/util.c b/bin/confgen/util.c index b0085fe13d..2b0a8759b5 100644 --- a/bin/confgen/util.c +++ b/bin/confgen/util.c @@ -19,8 +19,6 @@ #include #include -#include - extern bool verbose; extern const char *progname; diff --git a/bin/delv/delv.c b/bin/delv/delv.c index 4f7ff13c83..487d4f0f3e 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 9438ae0826..7c5c28545a 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index e6eead53fd..2de357d950 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dig/dighost.h b/bin/dig/dighost.h index 0587ce1403..06beaa91bc 100644 --- a/bin/dig/dighost.h +++ b/bin/dig/dighost.h @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dig/host.c b/bin/dig/host.c index 89fc278c42..42b567f0e7 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 916aa4ce3c..7c21225af2 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index fcefaf3c27..d6726e8ddb 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index 9795c121e9..ffd5a411b9 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c index 441f7c3f8b..8e8d481d5e 100644 --- a/bin/dnssec/dnssec-importkey.c +++ b/bin/dnssec/dnssec-importkey.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index 53ca718784..c18da75b18 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 3d77976fab..f11b54b182 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index 93ee20cca2..b5797240a7 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 100ff88fad..816e85178d 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 39ae3a35b9..215e44ebe0 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c index db228b2e2b..9e51547ae7 100644 --- a/bin/dnssec/dnssec-verify.c +++ b/bin/dnssec/dnssec-verify.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index bfd9ad7e1e..b24e88afea 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/named/builtin.c b/bin/named/builtin.c index cf18030d1e..da028c032c 100644 --- a/bin/named/builtin.c +++ b/bin/named/builtin.c @@ -20,7 +20,6 @@ #include #include -#include #include #include diff --git a/bin/named/dlz_dlopen_driver.c b/bin/named/dlz_dlopen_driver.c index 0d5bcced64..55c6e1e3b1 100644 --- a/bin/named/dlz_dlopen_driver.c +++ b/bin/named/dlz_dlopen_driver.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/bin/named/geoip.c b/bin/named/geoip.c index 0ba4ef07c3..6d94af266c 100644 --- a/bin/named/geoip.c +++ b/bin/named/geoip.c @@ -18,7 +18,6 @@ #endif /* if defined(HAVE_GEOIP2) */ #include -#include #include #include diff --git a/bin/named/logconf.c b/bin/named/logconf.c index 59dfb2fb8f..01151de8b8 100644 --- a/bin/named/logconf.c +++ b/bin/named/logconf.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/bin/named/main.c b/bin/named/main.c index ab8d6d82a7..f09f655d23 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/named/os.c b/bin/named/os.c index 699ca2f256..31872b120a 100644 --- a/bin/named/os.c +++ b/bin/named/os.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include diff --git a/bin/named/server.c b/bin/named/server.c index f2f27d4832..9ed5091ad9 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 4f45b1be30..65f0d14ad4 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index fed5e10e69..250d9a04b5 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 49ee0e3b08..b36b79b917 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index 5612845753..04f6705a2e 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/rndc/util.c b/bin/rndc/util.c index b0085fe13d..2b0a8759b5 100644 --- a/bin/rndc/util.c +++ b/bin/rndc/util.c @@ -19,8 +19,6 @@ #include #include -#include - extern bool verbose; extern const char *progname; diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c index e6b1eb1e22..eb09f59f33 100644 --- a/bin/tests/system/feature-test.c +++ b/bin/tests/system/feature-test.c @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/bin/tests/system/makejournal.c b/bin/tests/system/makejournal.c index 1a7c43581a..03be86e14a 100644 --- a/bin/tests/system/makejournal.c +++ b/bin/tests/system/makejournal.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c index 27578fc75d..7d27603707 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tests/system/rndc/gencheck.c b/bin/tests/system/rndc/gencheck.c index 7949b66a1d..ec54f1a7b1 100644 --- a/bin/tests/system/rndc/gencheck.c +++ b/bin/tests/system/rndc/gencheck.c @@ -18,8 +18,6 @@ #include #include -#include - #define USAGE "usage: gencheck \n" static int diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c index 55d8a9106c..7bd7448f56 100644 --- a/bin/tests/system/rpz/dnsrps.c +++ b/bin/tests/system/rpz/dnsrps.c @@ -33,7 +33,6 @@ #include #include -#include #include #ifdef USE_DNSRPS diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c index c1fb2c8f15..d3cdc97bd6 100644 --- a/bin/tests/system/rsabigexponent/bigkey.c +++ b/bin/tests/system/rsabigexponent/bigkey.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c index d3dcc9862d..065e3cc446 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c index 771e8baec7..4a9e6a8fcb 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tests/test_client.c b/bin/tests/test_client.c index e4a133c034..eaecb83ef8 100644 --- a/bin/tests/test_client.c +++ b/bin/tests/test_client.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index da25fe17ce..6a052b0212 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tools/arpaname.c b/bin/tools/arpaname.c index cfbe18724c..4ccf5f9c53 100644 --- a/bin/tools/arpaname.c +++ b/bin/tools/arpaname.c @@ -14,7 +14,6 @@ #include #include -#include #define UNUSED(x) (void)(x) diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index 2e06608101..fc924ad621 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index b964dabdec..a9f0f9a238 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tools/named-journalprint.c b/bin/tools/named-journalprint.c index 402163df4f..11d3cd8784 100644 --- a/bin/tools/named-journalprint.c +++ b/bin/tools/named-journalprint.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/bin/tools/named-nzd2nzf.c b/bin/tools/named-nzd2nzf.c index 630b65bcf6..9f3b440eca 100644 --- a/bin/tools/named-nzd2nzf.c +++ b/bin/tools/named-nzd2nzf.c @@ -19,8 +19,6 @@ #include #include -#include - #include int diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c index 46794b9f79..d31ebf79e3 100644 --- a/bin/tools/named-rrchecker.c +++ b/bin/tools/named-rrchecker.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c index fb74205afe..d18756dabb 100644 --- a/bin/tools/nsec3hash.c +++ b/bin/tools/nsec3hash.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/doc/misc/cfg_test.c b/doc/misc/cfg_test.c index d5f36549e2..87b9884226 100644 --- a/doc/misc/cfg_test.c +++ b/doc/misc/cfg_test.c @@ -18,7 +18,6 @@ #include #include -#include #include #include diff --git a/fuzz/dns_message_checksig.c b/fuzz/dns_message_checksig.c index a77dd22746..b7407f3dd6 100644 --- a/fuzz/dns_message_checksig.c +++ b/fuzz/dns_message_checksig.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/fuzz/dns_message_parse.c b/fuzz/dns_message_parse.c index ac0532a404..c6b23ebf82 100644 --- a/fuzz/dns_message_parse.c +++ b/fuzz/dns_message_parse.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/fuzz/dns_rdata_fromtext.c b/fuzz/dns_rdata_fromtext.c index 03ec0935c5..5c8f1a6970 100644 --- a/fuzz/dns_rdata_fromtext.c +++ b/fuzz/dns_rdata_fromtext.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 48cb90c6e2..1482de1310 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 6b32df2a0f..36a6fe7613 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index cff5dcadf0..274ef9b55b 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c index 6297230ceb..b4d7b79b37 100644 --- a/lib/dns/byaddr.c +++ b/lib/dns/byaddr.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 6f8067428c..a904baafbb 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c index 5200b72156..34ad8fdf92 100644 --- a/lib/dns/callbacks.c +++ b/lib/dns/callbacks.c @@ -13,7 +13,6 @@ /*! \file */ -#include #include #include diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 9e23176b10..25fdf64f67 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/diff.c b/lib/dns/diff.c index 6a2b130bc6..fc8bbb0690 100644 --- a/lib/dns/diff.c +++ b/lib/dns/diff.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 31bb596a3f..995e91d96b 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index f92d3bbe63..1e847ac63a 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c index 2137e74db7..2ae39c3a0d 100644 --- a/lib/dns/dnstap.c +++ b/lib/dns/dnstap.c @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index 1016978edb..7549cfd323 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c index 901b890d47..0a1a0dcdf2 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/ecs.c b/lib/dns/ecs.c index 676c740af5..19166c027f 100644 --- a/lib/dns/ecs.c +++ b/lib/dns/ecs.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c index a3fbb6e7e1..94a4683b3b 100644 --- a/lib/dns/gssapi_link.c +++ b/lib/dns/gssapi_link.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index 6eed7565ab..3ff8011f34 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 66a6e74324..bb23a648bc 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/keymgr.c b/lib/dns/keymgr.c index 757c64678f..e0774b2dd7 100644 --- a/lib/dns/keymgr.c +++ b/lib/dns/keymgr.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c index deb6ca01de..fa4814236c 100644 --- a/lib/dns/keytable.c +++ b/lib/dns/keytable.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/master.c b/lib/dns/master.c index 8f15b554b7..4808002d2e 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index d9cdcb786e..c3c1d5428b 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/message.c b/lib/dns/message.c index ef520169fd..120e3680e9 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/name.c b/lib/dns/name.c index 7014e6c6ac..3a5491176a 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/nta.c b/lib/dns/nta.c index c913c7b281..27a67e71a0 100644 --- a/lib/dns/nta.c +++ b/lib/dns/nta.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/private.c b/lib/dns/private.c index 56573b3a41..35ccda0223 100644 --- a/lib/dns/private.c +++ b/lib/dns/private.c @@ -14,7 +14,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index eb3460c8ee..b875229e05 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 73c86615cc..4cf4ef7f29 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c index b7fa16e380..9aa89deeef 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 68dcbcbfd3..82f95c8ba1 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 060a0a41e7..e433d8fffc 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 75ee525f7d..bcb0b222bd 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c index ac3f110de5..f0ed8f112b 100644 --- a/lib/dns/rrl.c +++ b/lib/dns/rrl.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index c20670eb1f..d987cbfe63 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index e2e77f2f09..40b8ea87c1 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c index 581cdcd82f..9994459e2d 100644 --- a/lib/dns/ssu.c +++ b/lib/dns/ssu.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c index 905bbb7d40..0799315393 100644 --- a/lib/dns/ssu_external.c +++ b/lib/dns/ssu_external.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/time.c b/lib/dns/time.c index 38302710b4..1bf4a452fc 100644 --- a/lib/dns/time.c +++ b/lib/dns/time.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index 29152663b7..9218e070fc 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index 1bf652a159..54f3d2e5df 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index 012413d95b..b8060d89f8 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/update.c b/lib/dns/update.c index 079045c7ef..9f1c66279e 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/validator.c b/lib/dns/validator.c index 73c667d63f..9d5558012c 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/view.c b/lib/dns/view.c index 0c7de74463..8311f129a3 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 05b612f850..8115cbb717 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 3a261d0b49..30b7369b17 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am index 4322f2e686..c1af1232cb 100644 --- a/lib/isc/Makefile.am +++ b/lib/isc/Makefile.am @@ -66,7 +66,6 @@ libisc_la_HEADERS = \ include/isc/parseint.h \ include/isc/pause.h \ include/isc/portset.h \ - include/isc/print.h \ include/isc/quota.h \ include/isc/radix.h \ include/isc/random.h \ diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c index 8b954cf475..a5cc0a2ac8 100644 --- a/lib/isc/assertions.c +++ b/lib/isc/assertions.c @@ -18,7 +18,6 @@ #include #include -#include #include #include diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c index 3ac23c822a..fc15acf3eb 100644 --- a/lib/isc/backtrace.c +++ b/lib/isc/backtrace.c @@ -20,7 +20,6 @@ #endif /* HAVE_BACKTRACE_SYMBOLS */ #include -#include #include #include diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c index 1b4a33ad10..e8e9b5b480 100644 --- a/lib/isc/commandline.c +++ b/lib/isc/commandline.c @@ -52,7 +52,6 @@ #include #include -#include #include #include diff --git a/lib/isc/dir.c b/lib/isc/dir.c index 9104ca4250..7c3ea98837 100644 --- a/lib/isc/dir.c +++ b/lib/isc/dir.c @@ -22,7 +22,6 @@ #include #include -#include #include #include diff --git a/lib/isc/error.c b/lib/isc/error.c index 051a6c48aa..3c168b664b 100644 --- a/lib/isc/error.c +++ b/lib/isc/error.c @@ -17,7 +17,6 @@ #include #include -#include /*% Default unexpected callback. */ static void diff --git a/lib/isc/file.c b/lib/isc/file.c index 128f985cd9..354d7647e0 100644 --- a/lib/isc/file.c +++ b/lib/isc/file.c @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/glob.c b/lib/isc/glob.c index 66427b319a..71e6e6fbfb 100644 --- a/lib/isc/glob.c +++ b/lib/isc/glob.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c index 6cdd5b01ca..6ccb6091da 100644 --- a/lib/isc/httpd.c +++ b/lib/isc/httpd.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h deleted file mode 100644 index d48bf70ae7..0000000000 --- a/lib/isc/include/isc/print.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#pragma once - -/*! \file isc/print.h */ - -/*** - *** Imports - ***/ - -#include /* Required for ISC_FORMAT_PRINTF() macro. */ -#include - -/*** - *** Functions - ***/ - -#include diff --git a/lib/isc/interfaceiter.c b/lib/isc/interfaceiter.c index 566c5bd465..ab0f35acab 100644 --- a/lib/isc/interfaceiter.c +++ b/lib/isc/interfaceiter.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/lex.c b/lib/isc/lex.c index 2796fc8eb2..3232b8c152 100644 --- a/lib/isc/lex.c +++ b/lib/isc/lex.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/log.c b/lib/isc/log.c index 43e371a813..0a671916da 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/loop.c b/lib/isc/loop.c index 3ec2c6ba52..42b94acd06 100644 --- a/lib/isc/loop.c +++ b/lib/isc/loop.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/mem.c b/lib/isc/mem.c index ea66c9c09d..0b2a317244 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/mutex.c b/lib/isc/mutex.c index c0bc2dc2e0..e591ffe872 100644 --- a/lib/isc/mutex.c +++ b/lib/isc/mutex.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c index c674d839b2..527546eb20 100644 --- a/lib/isc/netaddr.c +++ b/lib/isc/netaddr.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/netmgr/http.c b/lib/isc/netmgr/http.c index 0638255f6f..e8cd05c21c 100644 --- a/lib/isc/netmgr/http.c +++ b/lib/isc/netmgr/http.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index 1fb20e276a..fbd3c89f9c 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/regex.c b/lib/isc/regex.c index f7a3f5e13f..de99688f1c 100644 --- a/lib/isc/regex.c +++ b/lib/isc/regex.c @@ -14,7 +14,6 @@ #include #include -#include #include #include diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c index 529e820bab..7c99c75c67 100644 --- a/lib/isc/sockaddr.c +++ b/lib/isc/sockaddr.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/stats.c b/lib/isc/stats.c index 756733ed51..f178914c8d 100644 --- a/lib/isc/stats.c +++ b/lib/isc/stats.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/task.c b/lib/isc/task.c index 0695faa4c4..8b75e4938d 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/time.c b/lib/isc/time.c index d01ed162b4..9f369d8b47 100644 --- a/lib/isc/time.c +++ b/lib/isc/time.c @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/timer.c b/lib/isc/timer.c index 422b2bc438..0d9efbe5c3 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c index 182ada0b00..255de24423 100644 --- a/lib/isccc/alist.c +++ b/lib/isccc/alist.c @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index 23eaf9d629..70d877fefc 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c @@ -38,7 +38,6 @@ #include #include -#include #include #include diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c index 62c80c46ed..bfaacbf3a4 100644 --- a/lib/isccc/sexpr.c +++ b/lib/isccc/sexpr.c @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c index e72134c8a7..3f2c6994ee 100644 --- a/lib/isccfg/aclconf.c +++ b/lib/isccfg/aclconf.c @@ -16,7 +16,6 @@ #include #include -#include #include #include diff --git a/lib/isccfg/duration.c b/lib/isccfg/duration.c index 9ed9d6f657..edb8370f40 100644 --- a/lib/isccfg/duration.c +++ b/lib/isccfg/duration.c @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c index ba36b0d8ee..de41e8a0ab 100644 --- a/lib/isccfg/kaspconf.c +++ b/lib/isccfg/kaspconf.c @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index b3f35c52e2..d060d7cdc7 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index f70665675e..933b6cf0df 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/ns/client.c b/lib/ns/client.c index ea94e45427..54e44e2f51 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/ns/hooks.c b/lib/ns/hooks.c index 2657533f1a..fe9d9cc2ed 100644 --- a/lib/ns/hooks.c +++ b/lib/ns/hooks.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/ns/notify.c b/lib/ns/notify.c index 35b6b91cb9..fd5b474c0c 100644 --- a/lib/ns/notify.c +++ b/lib/ns/notify.c @@ -12,7 +12,6 @@ */ #include -#include #include #include diff --git a/lib/ns/query.c b/lib/ns/query.c index bf918b7e27..3b9172460a 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/ns/update.c b/lib/ns/update.c index 02202842e9..8ad4ea7f4f 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index 5f7984bcdc..1fd605f5d3 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/dns/acl_test.c b/tests/dns/acl_test.c index 210ab45dfa..419ffc06d7 100644 --- a/tests/dns/acl_test.c +++ b/tests/dns/acl_test.c @@ -23,7 +23,6 @@ #define UNIT_TESTING #include -#include #include #include diff --git a/tests/dns/dnstap_test.c b/tests/dns/dnstap_test.c index c695918963..1514674d3f 100644 --- a/tests/dns/dnstap_test.c +++ b/tests/dns/dnstap_test.c @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/tests/dns/geoip_test.c b/tests/dns/geoip_test.c index 8af48f448c..b4e7cf80a5 100644 --- a/tests/dns/geoip_test.c +++ b/tests/dns/geoip_test.c @@ -25,7 +25,6 @@ #include #include -#include #include #include #include diff --git a/tests/dns/master_test.c b/tests/dns/master_test.c index 31521bffbe..00d0f12dc5 100644 --- a/tests/dns/master_test.c +++ b/tests/dns/master_test.c @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/tests/dns/name_test.c b/tests/dns/name_test.c index c7d876efec..a20eb79536 100644 --- a/tests/dns/name_test.c +++ b/tests/dns/name_test.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/tests/dns/rbt_test.c b/tests/dns/rbt_test.c index c66c365e59..fc56d7dc6a 100644 --- a/tests/dns/rbt_test.c +++ b/tests/dns/rbt_test.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c index 6c13acdec4..68050a2169 100644 --- a/tests/dns/rdata_test.c +++ b/tests/dns/rdata_test.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/dns/rdatasetstats_test.c b/tests/dns/rdatasetstats_test.c index 1c5bba9373..9bfe6a05c2 100644 --- a/tests/dns/rdatasetstats_test.c +++ b/tests/dns/rdatasetstats_test.c @@ -24,7 +24,6 @@ #define UNIT_TESTING #include -#include #include #include diff --git a/tests/dns/resolver_test.c b/tests/dns/resolver_test.c index 51b6b35faa..f65e2f986a 100644 --- a/tests/dns/resolver_test.c +++ b/tests/dns/resolver_test.c @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/tests/dns/rsa_test.c b/tests/dns/rsa_test.c index 40652541f5..587dc4ea3e 100644 --- a/tests/dns/rsa_test.c +++ b/tests/dns/rsa_test.c @@ -23,7 +23,6 @@ #define UNIT_TESTING #include -#include #include #include "dst_internal.h" diff --git a/tests/dns/tsig_test.c b/tests/dns/tsig_test.c index bf180c6aaa..d00266bf14 100644 --- a/tests/dns/tsig_test.c +++ b/tests/dns/tsig_test.c @@ -23,7 +23,6 @@ #include #include -#include #include #include diff --git a/tests/dns/zt_test.c b/tests/dns/zt_test.c index 0f47695103..00b8345dc3 100644 --- a/tests/dns/zt_test.c +++ b/tests/dns/zt_test.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/include/tests/isc.h b/tests/include/tests/isc.h index 5f7b976060..241f32f4b2 100644 --- a/tests/include/tests/isc.h +++ b/tests/include/tests/isc.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isc/buffer_test.c b/tests/isc/buffer_test.c index 09e1038e46..a0530784c3 100644 --- a/tests/isc/buffer_test.c +++ b/tests/isc/buffer_test.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/tests/isc/crc64_test.c b/tests/isc/crc64_test.c index 9b8ff47b9e..f635b1bb03 100644 --- a/tests/isc/crc64_test.c +++ b/tests/isc/crc64_test.c @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/tests/isc/dnsstream_utils_test.c b/tests/isc/dnsstream_utils_test.c index 61b63e0fb5..2d8d6d690f 100644 --- a/tests/isc/dnsstream_utils_test.c +++ b/tests/isc/dnsstream_utils_test.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include "dnsstream_utils_test_data.h" diff --git a/tests/isc/doh_test.c b/tests/isc/doh_test.c index 3c031e6e92..1fbaaa7d37 100644 --- a/tests/isc/doh_test.c +++ b/tests/isc/doh_test.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isc/hash_test.c b/tests/isc/hash_test.c index 10a8c27e58..a0a7093209 100644 --- a/tests/isc/hash_test.c +++ b/tests/isc/hash_test.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isc/hashmap_test.c b/tests/isc/hashmap_test.c index b7e755a1fe..ed15f6fc24 100644 --- a/tests/isc/hashmap_test.c +++ b/tests/isc/hashmap_test.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/tests/isc/ht_test.c b/tests/isc/ht_test.c index eec36f53c0..699c1085ae 100644 --- a/tests/isc/ht_test.c +++ b/tests/isc/ht_test.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/tests/isc/mem_test.c b/tests/isc/mem_test.c index cdcbda0f28..9022532748 100644 --- a/tests/isc/mem_test.c +++ b/tests/isc/mem_test.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isc/random_test.c b/tests/isc/random_test.c index b9914f6a21..391a0e0800 100644 --- a/tests/isc/random_test.c +++ b/tests/isc/random_test.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isc/regex_test.c b/tests/isc/regex_test.c index dd44d3bc89..1650af9dc6 100644 --- a/tests/isc/regex_test.c +++ b/tests/isc/regex_test.c @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/tests/isc/sockaddr_test.c b/tests/isc/sockaddr_test.c index 126bfa9fe4..d89ba51b1e 100644 --- a/tests/isc/sockaddr_test.c +++ b/tests/isc/sockaddr_test.c @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/tests/isc/symtab_test.c b/tests/isc/symtab_test.c index bcbc0c43bb..27b8af37ff 100644 --- a/tests/isc/symtab_test.c +++ b/tests/isc/symtab_test.c @@ -22,7 +22,6 @@ #define UNIT_TESTING #include -#include #include #include diff --git a/tests/isc/task_test.c b/tests/isc/task_test.c index 1505c74a93..1f489f08fa 100644 --- a/tests/isc/task_test.c +++ b/tests/isc/task_test.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isc/timer_test.c b/tests/isc/timer_test.c index 6a1a420179..cd9412e648 100644 --- a/tests/isc/timer_test.c +++ b/tests/isc/timer_test.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/isccfg/parser_test.c b/tests/isccfg/parser_test.c index 7e4f02ba12..4e2d2881ac 100644 --- a/tests/isccfg/parser_test.c +++ b/tests/isccfg/parser_test.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/libtest/dns.c b/tests/libtest/dns.c index a2063e1779..e14cfdc3db 100644 --- a/tests/libtest/dns.c +++ b/tests/libtest/dns.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/libtest/ns.c b/tests/libtest/ns.c index 55603feb8e..2128b50a2b 100644 --- a/tests/libtest/ns.c +++ b/tests/libtest/ns.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/ns/listenlist_test.c b/tests/ns/listenlist_test.c index 322a98dcb1..a7ddcf828a 100644 --- a/tests/ns/listenlist_test.c +++ b/tests/ns/listenlist_test.c @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/tests/ns/notify_test.c b/tests/ns/notify_test.c index bc9b951a28..ae867c9e28 100644 --- a/tests/ns/notify_test.c +++ b/tests/ns/notify_test.c @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/util/checklibs.sh b/util/checklibs.sh index 6711f01cf2..d18b9a7007 100755 --- a/util/checklibs.sh +++ b/util/checklibs.sh @@ -13,20 +13,6 @@ status=0 -# -# Check for missing #include or "print_p.h" -# -list=`git grep -l snprintf lib bin | - grep '\.c$' | - grep -vE -e '(lib/bind|lib/dns/rdata|lib/dns/gen.c)' \ - -e '(dlzexternal/driver/driver.c)' | - xargs grep -EL "(isc/print.h|print_p.h)" 2> /dev/null` -[ -n "$list" ] && { - status=1 - echo 'Missing #include or #include "print_p.h":' - echo "$list" -} - # # Check for missing #include # From f9c725d7d4b300431e1914803e6b52f94a2b8f21 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Fri, 16 Dec 2022 11:59:48 +0000 Subject: [PATCH 4/5] Remove do-nothing header Use instead --- bin/named/server.c | 1 - lib/isc/Makefile.am | 1 - lib/isc/include/isc/file.h | 3 ++- lib/isc/include/isc/stat.h | 44 -------------------------------------- lib/isc/log.c | 2 +- lib/isc/stdio.c | 2 +- 6 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 lib/isc/include/isc/stat.h diff --git a/bin/named/server.c b/bin/named/server.c index 9ed5091ad9..43871fa775 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am index c1af1232cb..55eac3a7c9 100644 --- a/lib/isc/Makefile.am +++ b/lib/isc/Makefile.am @@ -80,7 +80,6 @@ libisc_la_HEADERS = \ include/isc/signal.h\ include/isc/siphash.h \ include/isc/sockaddr.h \ - include/isc/stat.h \ include/isc/stats.h \ include/isc/stdio.h \ include/isc/stdtime.h \ diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h index 2e5d4d2da5..73aeaf8265 100644 --- a/lib/isc/include/isc/file.h +++ b/lib/isc/include/isc/file.h @@ -19,9 +19,10 @@ #include #include -#include #include +#include + ISC_LANG_BEGINDECLS isc_result_t diff --git a/lib/isc/include/isc/stat.h b/lib/isc/include/isc/stat.h deleted file mode 100644 index fad37c91fa..0000000000 --- a/lib/isc/include/isc/stat.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * SPDX-License-Identifier: MPL-2.0 - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, you can obtain one at https://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#pragma once - -/***** -***** Module Info -*****/ - -/* - * Portable support. - * - * This module is responsible for defining S_IS??? macros. - * - * MP: - * No impact. - * - * Reliability: - * No anticipated impact. - * - * Resources: - * N/A. - * - * Security: - * No anticipated impact. - * - */ - -/*** - *** Imports. - ***/ - -#include -#include diff --git a/lib/isc/log.c b/lib/isc/log.c index 0a671916da..0b30d8e2a0 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -18,6 +18,7 @@ #include #include #include +#include #include /* dev_t FreeBSD 2.1 */ #include @@ -28,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/isc/stdio.c b/lib/isc/stdio.c index 12ab678c1f..ad987c66d5 100644 --- a/lib/isc/stdio.c +++ b/lib/isc/stdio.c @@ -12,9 +12,9 @@ */ #include +#include #include -#include #include #include From 9892ac791cfd669337ef71bae1bd67b5b1e61eac Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Fri, 16 Dec 2022 12:57:36 +0000 Subject: [PATCH 5/5] Add CHANGES note [cleanup] Several nugatory headers have been removed from libisc --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 63ec91928f..5fa95a0238 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +6102. [cleanup] Several nugatory headers have been removed from libisc. + [GL !7464] + 6101. [port] Clarify the portability dodge needed for `strerror_r()` [GL !7465]