diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h index b8da20324e..7e8f946268 100644 --- a/bin/check/check-tool.h +++ b/bin/check/check-tool.h @@ -18,7 +18,6 @@ #include #include -#include #include #include @@ -26,8 +25,6 @@ #include #include -ISC_LANG_BEGINDECLS - isc_result_t setup_logging(FILE *errout); @@ -48,5 +45,3 @@ extern bool docheckmx; extern bool docheckns; extern bool dochecksrv; extern dns_zoneopt_t zone_options; - -ISC_LANG_ENDDECLS diff --git a/bin/confgen/include/confgen/os.h b/bin/confgen/include/confgen/os.h index 2a924a30b1..f004a71a53 100644 --- a/bin/confgen/include/confgen/os.h +++ b/bin/confgen/include/confgen/os.h @@ -17,10 +17,6 @@ #include -#include - -ISC_LANG_BEGINDECLS - int set_user(FILE *fd, const char *user); /*%< @@ -29,5 +25,3 @@ set_user(FILE *fd, const char *user); * 0 success * -1 insufficient permissions, or 'user' does not exist. */ - -ISC_LANG_ENDDECLS diff --git a/bin/confgen/keygen.h b/bin/confgen/keygen.h index f5b7a551cd..7a8ca3a4b0 100644 --- a/bin/confgen/keygen.h +++ b/bin/confgen/keygen.h @@ -16,13 +16,10 @@ /*! \file */ #include -#include #include #include -ISC_LANG_BEGINDECLS - void generate_key(isc_mem_t *mctx, dns_secalg_t alg, int keysize, isc_buffer_t *key_txtbuffer); @@ -37,5 +34,3 @@ dns_secalg_t alg_fromtext(const char *name); int alg_bits(dns_secalg_t alg); - -ISC_LANG_ENDDECLS diff --git a/bin/confgen/util.h b/bin/confgen/util.h index 0567ad33b1..3300edad26 100644 --- a/bin/confgen/util.h +++ b/bin/confgen/util.h @@ -17,7 +17,6 @@ #include #include -#include #define NS_CONTROL_PORT 953 @@ -31,12 +30,8 @@ notify("%s", name); \ } while (0) -ISC_LANG_BEGINDECLS - void notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2); ISC_NORETURN void fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); - -ISC_LANG_ENDDECLS diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 6091445a79..efe4837e91 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/bin/dig/dighost.h b/bin/dig/dighost.h index 56842f9419..81ce6b609d 100644 --- a/bin/dig/dighost.h +++ b/bin/dig/dighost.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -85,8 +84,6 @@ * in a tight loop of constant lookups. It's value is arbitrary. */ -ISC_LANG_BEGINDECLS - typedef struct dig_lookup dig_lookup_t; typedef struct dig_query dig_query_t; typedef struct dig_server dig_server_t; @@ -466,5 +463,3 @@ dig_shutdown(void); bool dig_lookup_is_tls(const dig_lookup_t *lookup); - -ISC_LANG_ENDDECLS diff --git a/bin/named/include/named/builtin.h b/bin/named/include/named/builtin.h index 688510137c..bf0ac43fb5 100644 --- a/bin/named/include/named/builtin.h +++ b/bin/named/include/named/builtin.h @@ -17,7 +17,6 @@ #include -#include #include #include diff --git a/bin/named/include/named/tkeyconf.h b/bin/named/include/named/tkeyconf.h index 79639d625a..ad6a297dac 100644 --- a/bin/named/include/named/tkeyconf.h +++ b/bin/named/include/named/tkeyconf.h @@ -15,13 +15,10 @@ /*! \file */ -#include #include #include -ISC_LANG_BEGINDECLS - isc_result_t named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, dns_tkeyctx_t **tctxp); @@ -39,5 +36,3 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, *\li ISC_R_SUCCESS *\li ISC_R_NOMEMORY */ - -ISC_LANG_ENDDECLS diff --git a/bin/named/include/named/transportconf.h b/bin/named/include/named/transportconf.h index 1e472ff45f..a377c0300c 100644 --- a/bin/named/include/named/transportconf.h +++ b/bin/named/include/named/transportconf.h @@ -15,15 +15,12 @@ /*! \file */ -#include #include #include #include -ISC_LANG_BEGINDECLS - isc_result_t named_transports_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, isc_mem_t *mctx, dns_transport_list_t **listp); @@ -39,5 +36,3 @@ named_transports_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, * \li 'listp' is not NULL, and '*listp' is NULL * */ - -ISC_LANG_ENDDECLS diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h index 240eebe130..7adaf2ed8b 100644 --- a/bin/named/include/named/tsigconf.h +++ b/bin/named/include/named/tsigconf.h @@ -15,11 +15,8 @@ /*! \file */ -#include #include -ISC_LANG_BEGINDECLS - isc_result_t named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, isc_mem_t *mctx, dns_tsigkeyring_t **ringp); @@ -37,5 +34,3 @@ named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, * \li ISC_R_SUCCESS * \li ISC_R_NOMEMORY */ - -ISC_LANG_ENDDECLS diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h index 1eb059b25a..a10a650fc7 100644 --- a/bin/named/include/named/zoneconf.h +++ b/bin/named/include/named/zoneconf.h @@ -17,14 +17,11 @@ #include -#include #include #include #include -ISC_LANG_BEGINDECLS - isc_result_t named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, const cfg_obj_t *zconfig, cfg_aclconfctx_t *ac, @@ -76,5 +73,3 @@ named_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, * \li 'rdclass' to be a valid rdataclass * \li 'name' to be a valid zone origin name */ - -ISC_LANG_ENDDECLS diff --git a/bin/rndc/util.h b/bin/rndc/util.h index 0567ad33b1..3300edad26 100644 --- a/bin/rndc/util.h +++ b/bin/rndc/util.h @@ -17,7 +17,6 @@ #include #include -#include #define NS_CONTROL_PORT 953 @@ -31,12 +30,8 @@ notify("%s", name); \ } while (0) -ISC_LANG_BEGINDECLS - void notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2); ISC_NORETURN void fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); - -ISC_LANG_ENDDECLS diff --git a/doc/dev/style.md b/doc/dev/style.md index 8115f67e5e..1a9714f096 100644 --- a/doc/dev/style.md +++ b/doc/dev/style.md @@ -180,14 +180,6 @@ within a library but not for public use, are kept in the source tree at the same level as their related C files, and often have `"_p"` in their names, e.g. `lib/isc/mem_p.h`. -Header files that define modules should have a structure like the -following. Note that `` MUST be included by any public header -file using the ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS macros, so the -correct name-mangling happens for function declarations when C++ programs -include the file. `` SHOULD be included for private header files -or for public files that do not declare any functions. - - /* * Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC") * @@ -231,7 +223,6 @@ or for public files that do not declare any functions. ***/ /* #includes here. */ - #include /*** *** Types @@ -242,9 +233,7 @@ or for public files that do not declare any functions. /*** *** Functions ***/ - ISC_LANG_BEGINDECLS /* (Function declarations here, with full prototypes.) */ - ISC_LANG_ENDDECLS #### Including Interfaces (.h files) diff --git a/fuzz/fuzz.h b/fuzz/fuzz.h index b34c6a26d7..7f8a2f1feb 100644 --- a/fuzz/fuzz.h +++ b/fuzz/fuzz.h @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -26,8 +25,6 @@ #include -ISC_LANG_BEGINDECLS - extern bool debug; int @@ -40,5 +37,3 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); if ((x) != ISC_R_SUCCESS) { \ return (0); \ } - -ISC_LANG_ENDDECLS diff --git a/lib/dns/db_p.h b/lib/dns/db_p.h index bfad169252..b1e0460b5d 100644 --- a/lib/dns/db_p.h +++ b/lib/dns/db_p.h @@ -14,7 +14,6 @@ #pragma once #include -#include #include #include @@ -115,8 +114,6 @@ #define IS_STUB(db) (((db)->common.attributes & DNS_DBATTR_STUB) != 0) #define IS_CACHE(db) (((db)->common.attributes & DNS_DBATTR_CACHE) != 0) -ISC_LANG_BEGINDECLS - struct dns_glue { struct dns_glue *next; dns_name_t name; @@ -204,5 +201,3 @@ dns__db_logtoomanyrecords(dns_db_t *db, const dns_name_t *name, * 'maxrrperset' limit. 'op' is 'adding' or 'updating' depending on whether * the addition is to create a new rdataset or to merge to an existing one. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h index 988d14cf9c..cc57468f4f 100644 --- a/lib/dns/dst_internal.h +++ b/lib/dns/dst_internal.h @@ -39,7 +39,6 @@ #include #include -#include #include #include #include @@ -51,8 +50,6 @@ #include -ISC_LANG_BEGINDECLS - #define KEY_MAGIC ISC_MAGIC('D', 'S', 'T', 'K') #define CTX_MAGIC ISC_MAGIC('D', 'S', 'T', 'C') @@ -227,6 +224,4 @@ dst_key_close(char *tmpname, FILE *fp, char *filename); isc_result_t dst_key_cleanup(char *tmpname, FILE *fp); -ISC_LANG_ENDDECLS - /*! \file */ diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h index a7c796897e..8d57211af2 100644 --- a/lib/dns/dst_openssl.h +++ b/lib/dns/dst_openssl.h @@ -20,13 +20,10 @@ #include #include -#include #include #include #include -ISC_LANG_BEGINDECLS - #define dst__openssl_toresult(fallback) \ isc__tlserr2result(ISC_LOGCATEGORY_INVALID, ISC_LOGMODULE_INVALID, \ NULL, fallback, __FILE__, __LINE__) @@ -49,5 +46,3 @@ dst__openssl_keypair_isprivate(const dst_key_t *key); void dst__openssl_keypair_destroy(dst_key_t *key); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h index 8703810ff7..80612ec253 100644 --- a/lib/dns/dst_parse.h +++ b/lib/dns/dst_parse.h @@ -30,8 +30,6 @@ /*! \file */ #pragma once -#include - #include #define MAXFIELDSIZE 512 @@ -109,8 +107,6 @@ struct dst_private { typedef struct dst_private dst_private_t; -ISC_LANG_BEGINDECLS - void dst__privstruct_free(dst_private_t *priv, isc_mem_t *mctx); @@ -121,5 +117,3 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex, isc_result_t dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, const char *directory); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h index 7ad2e53a39..bf11af019f 100644 --- a/lib/dns/include/dns/acl.h +++ b/lib/dns/include/dns/acl.h @@ -30,7 +30,6 @@ #include -#include #include #include #include @@ -118,8 +117,6 @@ struct dns_aclenv { *** Functions ***/ -ISC_LANG_BEGINDECLS - void dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target); /*%< @@ -312,5 +309,3 @@ dns_acl_merge_ports_transports(dns_acl_t *dest, dns_acl_t *source, bool pos); *\li 'dest' is a valid ACL object; *\li 'source' is a valid ACL object. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index 585f0f6c9b..87902a3277 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -66,7 +66,6 @@ #include #include -#include #include #include #include @@ -75,8 +74,6 @@ #include #include -ISC_LANG_BEGINDECLS - /*** *** Magic number checks ***/ @@ -754,4 +751,3 @@ dns_adb_dumpquota(dns_adb_t *adb, isc_buffer_t **buf); * Requires: * \li 'adb' is valid. */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/badcache.h b/lib/dns/include/dns/badcache.h index 7552decef1..1568ce7e00 100644 --- a/lib/dns/include/dns/badcache.h +++ b/lib/dns/include/dns/badcache.h @@ -51,8 +51,6 @@ #include -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -146,5 +144,3 @@ dns_badcache_print(dns_badcache_t *bc, const char *cachename, FILE *fp); * \li cachename != NULL * \li fp != NULL */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h index 718221f084..ffd51093bb 100644 --- a/lib/dns/include/dns/byaddr.h +++ b/lib/dns/include/dns/byaddr.h @@ -40,12 +40,8 @@ *\li Drafts: TBS */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_byaddr_createptrname(const isc_netaddr_t *address, dns_name_t *name); /*%< @@ -56,5 +52,3 @@ dns_byaddr_createptrname(const isc_netaddr_t *address, dns_name_t *name); * \li 'address' is a valid address. * \li 'name' is a valid name with a dedicated buffer. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h index c629ab26c4..2eaa705544 100644 --- a/lib/dns/include/dns/cache.h +++ b/lib/dns/include/dns/cache.h @@ -46,15 +46,12 @@ #include -#include #include #include #include #include -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -273,5 +270,3 @@ dns_cache_renderjson(dns_cache_t *cache, void *cstats0); * Render cache statistics and status in JSON */ #endif /* HAVE_JSON_C */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h index da15ec9255..e9dce8c73a 100644 --- a/lib/dns/include/dns/callbacks.h +++ b/lib/dns/include/dns/callbacks.h @@ -19,13 +19,10 @@ *** Imports ***/ -#include #include #include -ISC_LANG_BEGINDECLS - /*** *** Types ***/ @@ -100,5 +97,3 @@ dns_rdatacallbacks_init_stdio(dns_rdatacallbacks_t *callbacks); /*%< * Like dns_rdatacallbacks_init, but logs to stdio. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h index 923f3b33a6..32aecc4e14 100644 --- a/lib/dns/include/dns/catz.h +++ b/lib/dns/include/dns/catz.h @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -31,8 +30,6 @@ #include #include -ISC_LANG_BEGINDECLS - #define DNS_CATZ_ERROR_LEVEL ISC_LOG_WARNING #define DNS_CATZ_INFO_LEVEL ISC_LOG_INFO #define DNS_CATZ_DEBUG_LEVEL1 ISC_LOG_DEBUG(1) @@ -446,5 +443,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_catz_zones); ISC_REFCOUNT_DECL(dns_catz_zone); ISC_REFCOUNT_DECL(dns_catz_zones); #endif /* DNS_CATZ_TRACE */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h index c1a0a503ee..97a6ed0b2c 100644 --- a/lib/dns/include/dns/cert.h +++ b/lib/dns/include/dns/cert.h @@ -15,12 +15,8 @@ /*! \file dns/cert.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source); /*%< @@ -56,5 +52,3 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target); *\li #ISC_R_SUCCESS on success *\li #ISC_R_NOSPACE target buffer is too small */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/client.h b/lib/dns/include/dns/client.h index 75cbf89250..6dd2a71998 100644 --- a/lib/dns/include/dns/client.h +++ b/lib/dns/include/dns/client.h @@ -48,8 +48,6 @@ #include -ISC_LANG_BEGINDECLS - /*** *** Types ***/ @@ -292,5 +290,3 @@ dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, * *\li Anything else Failure. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h index fb644c304d..9678161ce3 100644 --- a/lib/dns/include/dns/clientinfo.h +++ b/lib/dns/include/dns/clientinfo.h @@ -44,8 +44,6 @@ #include -ISC_LANG_BEGINDECLS - /***** ***** Types *****/ @@ -98,5 +96,3 @@ dns_clientinfo_setecs(dns_clientinfo_t *ci, dns_ecs_t *ecs); * Set the ECS client data associated with a clientinfo object 'ci'. * If 'ecs' is NULL, initialize ci->ecs to 0/0/0; otherwise copy it. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h index 8fbe2928b0..1e3fb84527 100644 --- a/lib/dns/include/dns/compress.h +++ b/lib/dns/include/dns/compress.h @@ -16,14 +16,11 @@ #include #include -#include #include #include #include -ISC_LANG_BEGINDECLS - /*! \file dns/compress.h * Direct manipulation of the structures is strongly discouraged. * @@ -228,5 +225,3 @@ dns_decompress_getpermitted(dns_decompress_t dctx) { return dctx == DNS_DECOMPRESS_ALWAYS || dctx == DNS_DECOMPRESS_PERMITTED; } - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index e38f4a3aca..c898957b11 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -52,7 +52,6 @@ #include #include -#include #include #include #include @@ -67,8 +66,6 @@ #include #include -ISC_LANG_BEGINDECLS - /*% * Tuning: external query load in packets per seconds. */ @@ -1821,4 +1818,3 @@ dns_db_setmaxtypepername(dns_db_t *db, uint32_t value); * stored at a given node, then any subsequent attempt to add an rdataset * with a new RR type will return ISC_R_TOOMANYRECORDS. */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h index 306b28b918..e97e9add0b 100644 --- a/lib/dns/include/dns/dbiterator.h +++ b/lib/dns/include/dns/dbiterator.h @@ -56,13 +56,10 @@ #include -#include #include #include -ISC_LANG_BEGINDECLS - /***** ***** Types *****/ @@ -288,5 +285,3 @@ dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name); * *\li Other results are possible, depending on the DB implementation. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h index 95c0bce1a8..95a58f990a 100644 --- a/lib/dns/include/dns/diff.h +++ b/lib/dns/include/dns/diff.h @@ -29,7 +29,6 @@ #include -#include #include #include @@ -110,8 +109,6 @@ dns_diff_compare_func(const void *, const void *); *** Functions ***/ -ISC_LANG_BEGINDECLS - /**************************************************************************/ /* * Manipulation of diffs and tuples. @@ -291,5 +288,3 @@ dns_diff_print(const dns_diff_t *diff, FILE *file); *\li #ISC_R_UNEXPECTED *\li any error from dns_rdataset_totext() */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h index 6e35e9533f..45fc4946d2 100644 --- a/lib/dns/include/dns/dispatch.h +++ b/lib/dns/include/dns/dispatch.h @@ -50,7 +50,6 @@ #include #include -#include #include #include #include @@ -60,8 +59,6 @@ /* Add -DDNS_DISPATCH_TRACE=1 to CFLAGS for detailed reference tracing */ -ISC_LANG_BEGINDECLS - /*% * This is a set of one or more dispatches which can be retrieved * round-robin fashion. @@ -435,5 +432,3 @@ dns_dispatch_checkperm(dns_dispatch_t *disp); * Requires: *\li disp is valid */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h index 4b61411259..60de2aaeba 100644 --- a/lib/dns/include/dns/dlz.h +++ b/lib/dns/include/dns/dlz.h @@ -79,8 +79,6 @@ #include -#include - #include #include #include @@ -88,8 +86,6 @@ #include -ISC_LANG_BEGINDECLS - /*** *** Types ***/ @@ -329,5 +325,3 @@ dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, const dns_name_t *signer, /*%< * call a DLZ drivers ssumatch method, if supplied. Otherwise return false */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h index a0059ffbdf..e388798dfd 100644 --- a/lib/dns/include/dns/dlz_dlopen.h +++ b/lib/dns/include/dns/dlz_dlopen.h @@ -20,8 +20,6 @@ #include -ISC_LANG_BEGINDECLS - /* * This header provides a minimal set of defines and typedefs needed * for the entry points of an external DLZ module for bind9. @@ -152,5 +150,3 @@ dlz_dlopen_subrdataset_t(const char *name, const char *rdatastr, void *dbdata, typedef isc_result_t dlz_dlopen_delrdataset_t(const char *name, const char *type, void *dbdata, void *version); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/dns64.h b/lib/dns/include/dns/dns64.h index 9242cbcbc8..7e10e5bfe0 100644 --- a/lib/dns/include/dns/dns64.h +++ b/lib/dns/include/dns/dns64.h @@ -15,12 +15,8 @@ #include -#include - #include -ISC_LANG_BEGINDECLS - /* * dns_dns64_create() flags. */ @@ -190,5 +186,3 @@ dns_dns64_findprefix(dns_rdataset_t *rdataset, isc_netprefix_t *prefix, * into 'prefix'. * ISC_R_NOTFOUND no prefixes where found. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h index 3525672dcf..09281eb9cc 100644 --- a/lib/dns/include/dns/dnssec.h +++ b/lib/dns/include/dns/dnssec.h @@ -17,7 +17,6 @@ #include -#include #include #include @@ -27,8 +26,6 @@ #include -ISC_LANG_BEGINDECLS - extern isc_stats_t *dns_dnssec_stats; /*%< Maximum number of keys supported in a zone. */ @@ -423,4 +420,3 @@ dns_dnssec_matchdskey(dns_name_t *name, dns_rdata_t *dsrdata, *\li ISC_R_NOTFOUND *\li Other values indicate error */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/ds.h b/lib/dns/include/dns/ds.h index 629729bc3a..a10d9355c1 100644 --- a/lib/dns/include/dns/ds.h +++ b/lib/dns/include/dns/ds.h @@ -13,8 +13,6 @@ #pragma once -#include - #include #include @@ -28,8 +26,6 @@ */ #define DNS_DS_BUFFERSIZE (52) -ISC_LANG_BEGINDECLS - isc_result_t dns_ds_fromkeyrdata(const dns_name_t *owner, dns_rdata_t *key, dns_dsdigest_t digest_type, unsigned char *digest, @@ -61,5 +57,3 @@ dns_ds_buildrdata(dns_name_t *owner, dns_rdata_t *key, * \li *rdata Contains a valid DS rdata. The 'data' member refers * to 'buffer'. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/dsdigest.h b/lib/dns/include/dns/dsdigest.h index 3b3898b9cc..05ba253faa 100644 --- a/lib/dns/include/dns/dsdigest.h +++ b/lib/dns/include/dns/dsdigest.h @@ -15,12 +15,8 @@ /*! \file dns/dsdigest.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_dsdigest_fromtext(dns_dsdigest_t *dsdigestp, isc_textregion_t *source); /*%< @@ -65,5 +61,3 @@ dns_dsdigest_format(dns_dsdigest_t typ, char *cp, unsigned int size); /*%< * Wrapper for dns_dsdigest_totext(), writing text into 'cp' */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/dyndb.h b/lib/dns/include/dns/dyndb.h index 7c481d4a97..acea3f0dcd 100644 --- a/lib/dns/include/dns/dyndb.h +++ b/lib/dns/include/dns/dyndb.h @@ -19,8 +19,6 @@ #include -ISC_LANG_BEGINDECLS - /*! * \brief * Context for initializing a dyndb module. @@ -153,5 +151,3 @@ dns_dyndb_destroyctx(dns_dyndbctx_t **dctxp); * Destroys a dyndb initialization context structure; all * reference-counted members are detached and the structure is freed. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/ecs.h b/lib/dns/include/dns/ecs.h index caa274c066..e8b32e034d 100644 --- a/lib/dns/include/dns/ecs.h +++ b/lib/dns/include/dns/ecs.h @@ -15,7 +15,6 @@ #include -#include #include #include @@ -46,8 +45,6 @@ struct dns_ecs { /*
/NNN/NNN */ #define DNS_ECS_FORMATSIZE (ISC_NETADDR_FORMATSIZE + 9) -ISC_LANG_BEGINDECLS - void dns_ecs_init(dns_ecs_t *ecs); /*%< @@ -78,4 +75,3 @@ dns_ecs_format(const dns_ecs_t *ecs, char *buf, size_t size); * \li 'buf' is not NULL. * \li 'size' is at least DNS_ECS_FORMATSIZE */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/fixedname.h b/lib/dns/include/dns/fixedname.h index 97155e77f0..95ce7e0836 100644 --- a/lib/dns/include/dns/fixedname.h +++ b/lib/dns/include/dns/fixedname.h @@ -50,7 +50,6 @@ *****/ #include -#include #include @@ -65,8 +64,6 @@ struct dns_fixedname { unsigned char data[DNS_NAME_MAXWIRE]; }; -ISC_LANG_BEGINDECLS - void dns_fixedname_init(dns_fixedname_t *fixed); @@ -78,5 +75,3 @@ dns_fixedname_name(dns_fixedname_t *fixed); dns_name_t * dns_fixedname_initname(dns_fixedname_t *fixed); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h index 4da882943a..ca5450f3fd 100644 --- a/lib/dns/include/dns/forward.h +++ b/lib/dns/include/dns/forward.h @@ -15,7 +15,6 @@ /*! \file dns/forward.h */ -#include #include #include #include @@ -27,8 +26,6 @@ /* Add -DDNS_FORWARD_TRACE=1 to CFLAGS for detailed reference tracing */ -ISC_LANG_BEGINDECLS - struct dns_forwarder { isc_sockaddr_t addr; dns_name_t *tlsname; @@ -122,4 +119,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_forwarders); #else ISC_REFCOUNT_DECL(dns_forwarders); #endif -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/geoip.h b/lib/dns/include/dns/geoip.h index 0d44f6a9d3..9b46196654 100644 --- a/lib/dns/include/dns/geoip.h +++ b/lib/dns/include/dns/geoip.h @@ -30,7 +30,6 @@ #include -#include #include #include #include @@ -99,13 +98,9 @@ struct dns_geoip_databases { *** Functions ***/ -ISC_LANG_BEGINDECLS - bool dns_geoip_match(const isc_netaddr_t *reqaddr, const dns_geoip_databases_t *geoip, const dns_geoip_elem_t *elt); -ISC_LANG_ENDDECLS - #endif /* HAVE_GEOIP2 */ diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h index 9c709141ca..939e8e7232 100644 --- a/lib/dns/include/dns/iptable.h +++ b/lib/dns/include/dns/iptable.h @@ -16,7 +16,6 @@ #include #include -#include #include #include #include @@ -40,8 +39,6 @@ struct dns_iptable { *** Functions ***/ -ISC_LANG_BEGINDECLS - void dns_iptable_create(isc_mem_t *mctx, dns_iptable_t **target); /* @@ -73,5 +70,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_iptable); #else ISC_REFCOUNT_DECL(dns_iptable); #endif - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h index 05f904ad61..6276bb687e 100644 --- a/lib/dns/include/dns/journal.h +++ b/lib/dns/include/dns/journal.h @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -75,8 +74,6 @@ typedef struct dns_journal dns_journal_t; *** Functions ***/ -ISC_LANG_BEGINDECLS - /**************************************************************************/ isc_result_t @@ -334,5 +331,3 @@ dns_journal_set_sourceserial(dns_journal_t *j, uint32_t sourceserial); * Returns: * true if sourceserial has previously been set. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/kasp.h b/lib/dns/include/dns/kasp.h index 674e733551..fd8ec896f2 100644 --- a/lib/dns/include/dns/kasp.h +++ b/lib/dns/include/dns/kasp.h @@ -25,7 +25,6 @@ * signed and maintained. */ -#include #include #include #include @@ -34,8 +33,6 @@ #include #include -ISC_LANG_BEGINDECLS - /* For storing a list of digest types */ struct dns_kasp_digest { dns_dsdigest_t digest; @@ -904,5 +901,3 @@ dns_kasp_adddigest(dns_kasp_t *kasp, dns_dsdigest_t alg); * *\li 'kasp' is a valid, thawed kasp. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/keydata.h b/lib/dns/include/dns/keydata.h index fba86d4b37..8456a451e4 100644 --- a/lib/dns/include/dns/keydata.h +++ b/lib/dns/include/dns/keydata.h @@ -28,14 +28,11 @@ #include -#include #include #include #include -ISC_LANG_BEGINDECLS - isc_result_t dns_keydata_todnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, isc_mem_t *mctx); @@ -44,5 +41,3 @@ isc_result_t dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, uint32_t refresh, uint32_t addhd, uint32_t removehd, isc_mem_t *mctx); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h index 51f6cee335..9d5142ea48 100644 --- a/lib/dns/include/dns/keyflags.h +++ b/lib/dns/include/dns/keyflags.h @@ -15,12 +15,8 @@ /*! \file dns/keyflags.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source); /*%< @@ -41,5 +37,3 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source); *\li ISC_R_RANGE numeric flag value is out of range *\li DNS_R_UNKNOWN mnemonic flag is unknown */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/keymgr.h b/lib/dns/include/dns/keymgr.h index deb007623f..bbdb8fff78 100644 --- a/lib/dns/include/dns/keymgr.h +++ b/lib/dns/include/dns/keymgr.h @@ -15,15 +15,12 @@ /*! \file dns/keymgr.h */ -#include #include #include #include -ISC_LANG_BEGINDECLS - void dns_keymgr_settime_syncpublish(dst_key_t *key, dns_kasp_t *kasp, bool first); /*%< @@ -158,5 +155,3 @@ dns_keymgr_status(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, *\li Printable status in 'out'. * */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/keystore.h b/lib/dns/include/dns/keystore.h index 4e648bc414..2dd2738991 100644 --- a/lib/dns/include/dns/keystore.h +++ b/lib/dns/include/dns/keystore.h @@ -26,7 +26,6 @@ /* Add -DDNS_KEYSTORE_TRACE=1 to CFLAGS for detailed reference tracing */ -#include #include #include #include @@ -35,8 +34,6 @@ #include -ISC_LANG_BEGINDECLS - /* Key store */ struct dns_keystore { unsigned int magic; @@ -198,5 +195,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_keystore); #else ISC_REFCOUNT_DECL(dns_keystore); #endif /* DNS_KEYSTORE_TRACE */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h index dc0b398622..689aab7e9d 100644 --- a/lib/dns/include/dns/keytable.h +++ b/lib/dns/include/dns/keytable.h @@ -36,7 +36,6 @@ #include -#include #include #include #include @@ -47,8 +46,6 @@ #include -ISC_LANG_BEGINDECLS - typedef void (*dns_keytable_callback_t)(const dns_name_t *name, void *fn_arg); void @@ -296,4 +293,3 @@ dns_keytable_forall(dns_keytable_t *keytable, ISC_REFCOUNT_DECL(dns_keytable); ISC_REFCOUNT_DECL(dns_keynode); -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index 2e9966f8d0..20402e5882 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -22,8 +22,6 @@ #include #include -#include - #include /* @@ -61,8 +59,6 @@ #define DNS_MASTER_CHECKTTL 0x00010000 /*%< Check max-zone-ttl */ #define DNS_MASTER_CHECKSVCB 0x00020000 /*%< Check SVBC records */ -ISC_LANG_BEGINDECLS - /* * Structures that implement the "raw" format for master dump. * These are provided for a reference purpose only; in the actual @@ -229,4 +225,3 @@ dns_master_initrawheader(dns_masterrawheader_t *header); * Initializes the header for a raw master file, setting all * values to zero. */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h index a030924e73..8d86e9364b 100644 --- a/lib/dns/include/dns/masterdump.h +++ b/lib/dns/include/dns/masterdump.h @@ -21,8 +21,6 @@ #include -#include - #include /*** @@ -120,8 +118,6 @@ typedef struct dns_master_style dns_master_style_t; */ #define DNS_STYLEFLAG_CLASS_PERNAME 0x400000000ULL -ISC_LANG_BEGINDECLS - /*** *** Constants ***/ @@ -349,5 +345,3 @@ dns_master_stylecreate(dns_master_style_t **style, void dns_master_styledestroy(dns_master_style_t **style, isc_mem_t *mctx); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index e63fff1f0a..0189bbf297 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -20,7 +20,6 @@ #include #include -#include #include #include @@ -365,8 +364,6 @@ typedef void (*dns_message_cb_t)(void *arg, isc_result_t result); *** Functions ***/ -ISC_LANG_BEGINDECLS - void dns_message_create(isc_mem_t *mctx, isc_mempool_t *namepool, isc_mempool_t *rdspool, dns_message_intent_t intent, @@ -1533,5 +1530,3 @@ dns_ede_unlinkall(isc_mem_t *mctx, dns_edelist_t *list); * \li mctx to be non NULL; * \li list to be non NULL; */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index d79fe445bd..3e405846e2 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -69,14 +69,11 @@ #include #include -#include #include #include /* Required for storage size of dns_label_t. */ #include -ISC_LANG_BEGINDECLS - /***** ***** Names ***** @@ -1367,5 +1364,3 @@ dns_name_israd(const dns_name_t *name, const dns_name_t *rad); * Requires: * \li 'name' to be valid. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/nametree.h b/lib/dns/include/dns/nametree.h index 9fec23041b..98a230e6bf 100644 --- a/lib/dns/include/dns/nametree.h +++ b/lib/dns/include/dns/nametree.h @@ -26,7 +26,6 @@ #include -#include #include #include #include @@ -45,8 +44,6 @@ typedef enum { DNS_NAMETREE_COUNT } dns_nametree_type_t; -ISC_LANG_BEGINDECLS - void dns_nametree_create(isc_mem_t *mctx, dns_nametree_type_t type, const char *name, dns_nametree_t **ntp); @@ -190,4 +187,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_ntnode); ISC_REFCOUNT_DECL(dns_nametree); ISC_REFCOUNT_DECL(dns_ntnode); #endif -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h index ce6213637f..4c196aa7fa 100644 --- a/lib/dns/include/dns/ncache.h +++ b/lib/dns/include/dns/ncache.h @@ -41,13 +41,10 @@ #include -#include #include #include -ISC_LANG_BEGINDECLS - /*% * _OMITDNSSEC: * Omit DNSSEC records when rendering. @@ -180,5 +177,3 @@ dns_ncache_current(dns_rdataset_t *ncacherdataset, dns_name_t *found, * \li 'found' to be valid. * \li 'rdataset' to be unassociated. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/nsec.h b/lib/dns/include/dns/nsec.h index e68ea35ebf..eda6214bb1 100644 --- a/lib/dns/include/dns/nsec.h +++ b/lib/dns/include/dns/nsec.h @@ -17,16 +17,12 @@ #include -#include - #include #include #include #define DNS_NSEC_BUFFERSIZE (DNS_NAME_MAXWIRE + 8192 + 512) -ISC_LANG_BEGINDECLS - isc_result_t dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, const dns_name_t *target, unsigned char *buffer, @@ -122,5 +118,3 @@ dns_nsec_requiredtypespresent(dns_rdataset_t *rdataset); * Requires: * \li rdataset to be a NSEC rdataset. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/nsec3.h b/lib/dns/include/dns/nsec3.h index 3cd81cc616..c1a7bd8c7f 100644 --- a/lib/dns/include/dns/nsec3.h +++ b/lib/dns/include/dns/nsec3.h @@ -16,7 +16,6 @@ #include #include -#include #include #include @@ -43,8 +42,6 @@ */ #define DNS_NSEC3_UNKNOWNALG ((dns_hash_t)245U) -ISC_LANG_BEGINDECLS - isc_result_t dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, unsigned int hashalg, unsigned int optin, @@ -265,5 +262,3 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, bool *optout, bool *unknown, bool *setclosest, bool *setnearest, dns_name_t *closest, dns_name_t *nearest, dns_nseclog_t logit, void *arg); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h index 777a0fd3a4..36af12b4cf 100644 --- a/lib/dns/include/dns/nta.h +++ b/lib/dns/include/dns/nta.h @@ -28,7 +28,6 @@ #include #include -#include #include #include #include @@ -42,8 +41,6 @@ /* Add -DDNS_NTA_TRACE=1 to CFLAGS for detailed reference tracing */ -ISC_LANG_BEGINDECLS - #define NTATABLE_MAGIC ISC_MAGIC('N', 'T', 'A', 't') #define VALID_NTATABLE(nt) ISC_MAGIC_VALID(nt, NTATABLE_MAGIC) @@ -180,5 +177,3 @@ ISC_REFCOUNT_TRACE_DECL(dns__nta); #else ISC_REFCOUNT_DECL(dns__nta); #endif - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/opcode.h b/lib/dns/include/dns/opcode.h index 6b8f6f88e7..30f573d7c8 100644 --- a/lib/dns/include/dns/opcode.h +++ b/lib/dns/include/dns/opcode.h @@ -15,12 +15,8 @@ /*! \file dns/opcode.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target); /*%< @@ -39,5 +35,3 @@ dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target); *\li #ISC_R_SUCCESS on success *\li #ISC_R_NOSPACE target buffer is too small */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/order.h b/lib/dns/include/dns/order.h index 4b0a25f504..54261257bc 100644 --- a/lib/dns/include/dns/order.h +++ b/lib/dns/include/dns/order.h @@ -15,13 +15,10 @@ /*! \file dns/order.h */ -#include #include #include -ISC_LANG_BEGINDECLS - isc_result_t dns_order_create(isc_mem_t *mctx, dns_order_t **orderp); /*%< @@ -86,5 +83,3 @@ dns_order_detach(dns_order_t **orderp); * Requires: *\li '*orderp' to be valid. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h index d429d667d0..1e67611300 100644 --- a/lib/dns/include/dns/peer.h +++ b/lib/dns/include/dns/peer.h @@ -29,7 +29,6 @@ #include #include -#include #include #include #include @@ -46,8 +45,6 @@ *** Functions ***/ -ISC_LANG_BEGINDECLS - isc_result_t dns_peerlist_new(isc_mem_t *mem, dns_peerlist_t **list); @@ -217,4 +214,3 @@ dns_peer_setednsversion(dns_peer_t *peer, uint8_t ednsversion); isc_result_t dns_peer_getednsversion(dns_peer_t *peer, uint8_t *ednsversion); -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/private.h b/lib/dns/include/dns/private.h index 675510c0d1..8f3d5a32ad 100644 --- a/lib/dns/include/dns/private.h +++ b/lib/dns/include/dns/private.h @@ -13,7 +13,6 @@ #include -#include #include #include @@ -21,8 +20,6 @@ #pragma once -ISC_LANG_BEGINDECLS - isc_result_t dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype, bool *build_nsec, @@ -62,5 +59,3 @@ dns_private_totext(dns_rdata_t *privaterdata, isc_buffer_t *buffer); * \li ISC_R_SUCCESS * \li other on error */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rcode.h b/lib/dns/include/dns/rcode.h index 2c496ee8f3..cbdbbaf4c9 100644 --- a/lib/dns/include/dns/rcode.h +++ b/lib/dns/include/dns/rcode.h @@ -15,12 +15,8 @@ /*! \file dns/rcode.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source); /*%< @@ -103,5 +99,3 @@ dns_hashalg_fromtext(unsigned char *hashalg, isc_textregion_t *source); *\li #ISC_R_SUCCESS on success *\li #DNS_R_UNKNOWN type is unknown */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index 02ac4eef22..2123bbc927 100644 --- a/lib/dns/include/dns/rdata.h +++ b/lib/dns/include/dns/rdata.h @@ -86,14 +86,10 @@ #include -#include - #include #include #include -ISC_LANG_BEGINDECLS - /*** *** Types ***/ @@ -822,5 +818,3 @@ dns_rdata_checksvcb(const dns_name_t *owner, const dns_rdata_t *rdata); *\li #DNS_R_NOALPN -- ALPN required for 'owner', but not found *\li #DNS_R_NODOHPATH -- DOHPATH required for 'owner', but not found */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rdataclass.h b/lib/dns/include/dns/rdataclass.h index 466c4a3fcc..41ede6e3de 100644 --- a/lib/dns/include/dns/rdataclass.h +++ b/lib/dns/include/dns/rdataclass.h @@ -15,12 +15,8 @@ /*! \file dns/rdataclass.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source); /*%< @@ -87,5 +83,3 @@ dns_rdataclass_format(dns_rdataclass_t rdclass, char *array, unsigned int size); /*%< * Minimum size of array to pass to dns_rdataclass_format(). */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h index 6e564b635e..a61d6a0b2a 100644 --- a/lib/dns/include/dns/rdatalist.h +++ b/lib/dns/include/dns/rdatalist.h @@ -37,8 +37,6 @@ *\li None. */ -#include - #include /*% @@ -59,8 +57,6 @@ struct dns_rdatalist { unsigned char upper[32]; }; -ISC_LANG_BEGINDECLS - void dns_rdatalist_init(dns_rdatalist_t *rdatalist); /*%< @@ -151,5 +147,3 @@ dns_rdatalist_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name); void dns_rdatalist_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index d53f80fa55..ae835b961d 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -47,7 +47,6 @@ #include #include -#include #include #include @@ -66,8 +65,6 @@ #define DNS_RDATASET_COUNT 0 #endif /* DNS_RDATASET_FIXED */ -ISC_LANG_BEGINDECLS - typedef enum { dns_rdatasetadditional_fromauth, dns_rdatasetadditional_fromcache, @@ -655,5 +652,3 @@ dns_trust_totext(dns_trust_t trust); /*%< * Display trust in textual form. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h index 4689d333c3..a91c1ec416 100644 --- a/lib/dns/include/dns/rdatasetiter.h +++ b/lib/dns/include/dns/rdatasetiter.h @@ -54,14 +54,11 @@ ***** Imports *****/ -#include #include #include #include -ISC_LANG_BEGINDECLS - /***** ***** Types *****/ @@ -166,5 +163,3 @@ dns__rdatasetiter_current(dns_rdatasetiter_t *iterator, *\li The rdataset cursor of 'iterator' is at a valid location (i.e. the * result of last call to a cursor movement command was #ISC_R_SUCCESS). */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h index 3061f0ece4..00ed2f6895 100644 --- a/lib/dns/include/dns/rdataslab.h +++ b/lib/dns/include/dns/rdataslab.h @@ -45,7 +45,6 @@ #include #include -#include #include #include @@ -53,8 +52,6 @@ #include #include -ISC_LANG_BEGINDECLS - #define DNS_RDATASLAB_FORCE 0x1 #define DNS_RDATASLAB_EXACT 0x2 @@ -321,4 +318,3 @@ dns_slabheader_freeproof(isc_mem_t *mctx, dns_slabheader_proof_t **proof); /*%< * Free all memory associated with a nonexistence proof. */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h index 61cad7d8bb..b4005367c9 100644 --- a/lib/dns/include/dns/rdatatype.h +++ b/lib/dns/include/dns/rdatatype.h @@ -15,8 +15,6 @@ /*! \file dns/rdatatype.h */ -#include - #include #define DNS_TYPEPAIR_TYPE(type) ((dns_rdatatype_t)((type) & 0xFFFF)) @@ -27,8 +25,6 @@ ((dns_typepair_t)(((uint32_t)type) << 16) | \ (((uint32_t)dns_rdatatype_rrsig) & 0xffff)) -ISC_LANG_BEGINDECLS - isc_result_t dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source); /*%< @@ -98,5 +94,3 @@ dns_rdatatype_format(dns_rdatatype_t rdtype, char *array, unsigned int size); * May need to be adjusted if a new RR type with a very long * name is defined. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/remote.h b/lib/dns/include/dns/remote.h index 7d3a6f1fd9..6738fe11cf 100644 --- a/lib/dns/include/dns/remote.h +++ b/lib/dns/include/dns/remote.h @@ -17,14 +17,11 @@ #include -#include #include #include #include -ISC_LANG_BEGINDECLS - #define DNS_REMOTE_MAGIC ISC_MAGIC('R', 'm', 't', 'e') #define DNS_REMOTE_VALID(remote) ISC_MAGIC_VALID(remote, DNS_REMOTE_MAGIC) @@ -215,5 +212,3 @@ dns_remote_done(dns_remote_t *remote); * Requires: * 'remote' is a valid remote structure. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h index ccbc9e2b20..07b2b17af9 100644 --- a/lib/dns/include/dns/request.h +++ b/lib/dns/include/dns/request.h @@ -37,7 +37,6 @@ #include #include -#include #include #include @@ -49,8 +48,6 @@ #define DNS_REQUESTOPT_FIXEDID 0x00000004U #define DNS_REQUESTOPT_LARGE 0x00000008U -ISC_LANG_BEGINDECLS - isc_result_t dns_requestmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr, dns_dispatchmgr_t *dispatchmgr, @@ -305,5 +302,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_request); #else ISC_REFCOUNT_DECL(dns_request); #endif - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index 5938cc8357..93a215598c 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -49,7 +49,6 @@ #include #include -#include #include #include #include @@ -62,8 +61,6 @@ /* Add -DDNS_RESOLVER_TRACE=1 to CFLAGS for detailed reference tracing */ -ISC_LANG_BEGINDECLS - /*% * A dns_fetchresponse_t is sent to the caller when a fetch completes. * Any of 'db', 'node', 'rdataset', and 'sigrdataset' may be bound; it @@ -637,5 +634,3 @@ dns_resolver_freefresp(dns_fetchresponse_t **frespp); * Requires: * \li 'frespp' is valid. No-op if *frespp == NULL */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h index 6ab7e51a49..8465e99323 100644 --- a/lib/dns/include/dns/result.h +++ b/lib/dns/include/dns/result.h @@ -15,17 +15,12 @@ /*! \file dns/result.h */ -#include #include #include -ISC_LANG_BEGINDECLS - dns_rcode_t dns_result_torcode(isc_result_t result); isc_result_t dns_result_fromrcode(dns_rcode_t rcode); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rootns.h b/lib/dns/include/dns/rootns.h index d7740f78c9..df6026a1ed 100644 --- a/lib/dns/include/dns/rootns.h +++ b/lib/dns/include/dns/rootns.h @@ -15,12 +15,8 @@ /*! \file dns/rootns.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, const char *filename, dns_db_t **target); @@ -32,5 +28,3 @@ dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db); * * Requires view, hints and (cache) db to be valid. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h index be54144189..4cc81b4764 100644 --- a/lib/dns/include/dns/rpz.h +++ b/lib/dns/include/dns/rpz.h @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -30,8 +29,6 @@ #include #include -ISC_LANG_BEGINDECLS - #define DNS_RPZ_PREFIX "rpz-" /* * Sub-zones of various trigger types. @@ -418,5 +415,3 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, dns_rpz_zbits_t dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, dns_rpz_zbits_t zbits, dns_name_t *trig_name); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rriterator.h b/lib/dns/include/dns/rriterator.h index a1cd9b932a..606dd31af9 100644 --- a/lib/dns/include/dns/rriterator.h +++ b/lib/dns/include/dns/rriterator.h @@ -28,7 +28,6 @@ #include -#include #include #include @@ -41,8 +40,6 @@ #include #include -ISC_LANG_BEGINDECLS - /***** ***** Types *****/ @@ -175,5 +172,3 @@ dns_rriterator_destroy(dns_rriterator_t *it); * *\li All resources used by the rriterator are freed. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h index bdffed99ac..aef47a7345 100644 --- a/lib/dns/include/dns/rrl.h +++ b/lib/dns/include/dns/rrl.h @@ -20,14 +20,10 @@ #include #include -#include - #include #include #include -ISC_LANG_BEGINDECLS - /* * Memory allocation or other failures. */ @@ -265,5 +261,3 @@ dns_rrl_view_destroy(dns_view_t *view); isc_result_t dns_rrl_init(dns_rrl_t **rrlp, dns_view_t *view, int min_entries); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h index b0388b98cf..8466b581c4 100644 --- a/lib/dns/include/dns/sdlz.h +++ b/lib/dns/include/dns/sdlz.h @@ -56,8 +56,6 @@ #include #include -ISC_LANG_BEGINDECLS - #define DNS_SDLZFLAG_THREADSAFE 0x00000001U #define DNS_SDLZFLAG_RELATIVEOWNER 0x00000002U #define DNS_SDLZFLAG_RELATIVERDATA 0x00000004U @@ -352,5 +350,3 @@ dns_sdlz_setdb_t dns_sdlz_setdb; /*%< * Create the database pointers for a writeable SDLZ zone */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h index 09b3d2b359..91f50e698c 100644 --- a/lib/dns/include/dns/secalg.h +++ b/lib/dns/include/dns/secalg.h @@ -15,12 +15,8 @@ /*! \file dns/secalg.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source); /*%< @@ -65,5 +61,3 @@ dns_secalg_format(dns_secalg_t alg, char *cp, unsigned int size); /*%< * Wrapper for dns_secalg_totext(), writing text into 'cp' */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h index 0dc80a089f..f98df5c741 100644 --- a/lib/dns/include/dns/secproto.h +++ b/lib/dns/include/dns/secproto.h @@ -15,12 +15,8 @@ /*! \file dns/secproto.h */ -#include - #include -ISC_LANG_BEGINDECLS - isc_result_t dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source); /*%< @@ -58,5 +54,3 @@ dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target); *\li ISC_R_SUCCESS on success *\li ISC_R_NOSPACE target buffer is too small */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/skr.h b/lib/dns/include/dns/skr.h index 6b2c3c71f9..a3e1255eb9 100644 --- a/lib/dns/include/dns/skr.h +++ b/lib/dns/include/dns/skr.h @@ -26,8 +26,6 @@ #include #include -ISC_LANG_BEGINDECLS - #define DNS_SKR_MAGIC ISC_MAGIC('S', 'K', 'R', '-') #define DNS_SKR_VALID(t) ISC_MAGIC_VALID(t, DNS_SKR_MAGIC) @@ -145,5 +143,3 @@ dns_skr_destroy(dns_skr_t *skr); * Requires: * \li 'skr' is a valid SKR */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h index 4f8aa07ba5..1f44f14c01 100644 --- a/lib/dns/include/dns/soa.h +++ b/lib/dns/include/dns/soa.h @@ -28,13 +28,10 @@ #include -#include #include #include -ISC_LANG_BEGINDECLS - #define DNS_SOA_BUFFERSIZE ((2 * DNS_NAME_MAXWIRE) + (4 * 5)) isc_result_t @@ -89,5 +86,3 @@ dns_soa_setminimum(uint32_t val, dns_rdata_t *rdata); * Requires: * rdata refers to the rdata of a well-formed SOA record. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h index b26f750911..d71067bbf1 100644 --- a/lib/dns/include/dns/ssu.h +++ b/lib/dns/include/dns/ssu.h @@ -17,15 +17,11 @@ #include -#include - #include #include #include -ISC_LANG_BEGINDECLS - typedef enum { dns_ssumatchtype_name = 0, dns_ssumatchtype_subdomain = 1, @@ -258,5 +254,3 @@ dns_ssu_mtypefromstring(const char *str, dns_ssumatchtype_t *mtype); *\li #ISC_R_SUCCESS *\li #ISC_R_NOTFOUND */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h index a08f080217..6384f38603 100644 --- a/lib/dns/include/dns/stats.h +++ b/lib/dns/include/dns/stats.h @@ -257,8 +257,6 @@ typedef void (*dns_dnssecsignstats_dumper_t)(uint32_t, uint64_t, void *); typedef void (*dns_opcodestats_dumper_t)(dns_opcode_t, uint64_t, void *); typedef void (*dns_rcodestats_dumper_t)(dns_rcode_t, uint64_t, void *); -ISC_LANG_BEGINDECLS - void dns_generalstats_create(isc_mem_t *mctx, dns_stats_t **statsp, int ncounters); /*%< @@ -515,5 +513,3 @@ dns_rcodestats_dump(dns_stats_t *stats, dns_rcodestats_dumper_t dump_fn, * Requires: *\li 'stats' is a valid dns_stats_t created by dns_generalstats_create(). */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h index db86a49ee6..866d3fcebd 100644 --- a/lib/dns/include/dns/time.h +++ b/lib/dns/include/dns/time.h @@ -22,9 +22,6 @@ #include #include -#include - -ISC_LANG_BEGINDECLS /*** *** Functions @@ -66,5 +63,3 @@ dns_time64_from32(uint32_t value); /*%< * Covert a 32-bit cyclic time value into a 64 bit time stamp. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h index f1998beb1c..5c58231c64 100644 --- a/lib/dns/include/dns/tkey.h +++ b/lib/dns/include/dns/tkey.h @@ -18,15 +18,11 @@ #include #include -#include - #include #include #include -ISC_LANG_BEGINDECLS - /* Key agreement modes */ #define DNS_TKEYMODE_SERVERASSIGNED 1 #define DNS_TKEYMODE_DIFFIEHELLMAN 2 @@ -139,4 +135,3 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, * DNS_R_CONTINUE additional context negotiation is required; * send the new qmsg to the server */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h index edd0694df0..7fe3dcefd5 100644 --- a/lib/dns/include/dns/tsig.h +++ b/lib/dns/include/dns/tsig.h @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -95,8 +94,6 @@ struct dns_tsigkey { ISC_LINK(dns_tsigkey_t) link; }; -ISC_LANG_BEGINDECLS - const dns_name_t * dns_tsigkey_identity(const dns_tsigkey_t *tsigkey); /*%< @@ -308,5 +305,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_tsigkeyring); ISC_REFCOUNT_DECL(dns_tsigkey); ISC_REFCOUNT_DECL(dns_tsigkeyring); #endif - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h index 5495368125..afa7ea2c78 100644 --- a/lib/dns/include/dns/ttl.h +++ b/lib/dns/include/dns/ttl.h @@ -22,11 +22,8 @@ #include #include -#include #include -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -73,5 +70,3 @@ dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl); *\li ISC_R_SUCCESS *\li DNS_R_BADTTL */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h index 8ca1bf090e..ec406dca0c 100644 --- a/lib/dns/include/dns/update.h +++ b/lib/dns/include/dns/update.h @@ -21,8 +21,6 @@ #include -#include - #include #include @@ -32,8 +30,6 @@ typedef struct { void *arg; } dns_update_log_t; -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -68,5 +64,3 @@ dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, dns_diff_t *diff, uint32_t sigvalidityinterval, dns_update_state_t **state); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h index 382d5c964c..e097c98611 100644 --- a/lib/dns/include/dns/validator.h +++ b/lib/dns/include/dns/validator.h @@ -49,7 +49,6 @@ #include #include -#include #include #include @@ -164,8 +163,6 @@ struct dns_validator { #define DNS_VALIDATOR_NOCDFLAG 0x0004U #define DNS_VALIDATOR_NONTA 0x0008U /*% Ignore NTA table */ -ISC_LANG_BEGINDECLS - isc_result_t dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, @@ -264,5 +261,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_validator); #else ISC_REFCOUNT_DECL(dns_validator); #endif - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h index eff61f113e..edab9d2be1 100644 --- a/lib/dns/include/dns/view.h +++ b/lib/dns/include/dns/view.h @@ -57,7 +57,6 @@ #include #include -#include #include #include #include @@ -78,8 +77,6 @@ #include #include -ISC_LANG_BEGINDECLS - struct dns_view { /* Unlocked. */ unsigned int magic; @@ -1346,5 +1343,3 @@ dns_view_setmaxqueries(dns_view_t *view, uint16_t max_queries); *\li 'view' is valid; *\li 'max_queries' is greater than 0. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h index 04ad65072d..52c74ec91a 100644 --- a/lib/dns/include/dns/xfrin.h +++ b/lib/dns/include/dns/xfrin.h @@ -26,7 +26,6 @@ *** Imports ***/ -#include #include #include #include @@ -49,8 +48,6 @@ typedef struct dns_xfrin dns_xfrin_t; *** Functions ***/ -ISC_LANG_BEGINDECLS - void dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype, uint32_t ixfr_maxdiffs, const isc_sockaddr_t *primaryaddr, @@ -235,4 +232,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_xfrin); #else ISC_REFCOUNT_DECL(dns_xfrin); #endif -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index 23c89e5197..7866ac43a0 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -150,8 +149,6 @@ typedef enum { * exponential backoff */ #endif /* ifndef DNS_ZONE_DEFAULTRETRY */ -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -2674,7 +2671,6 @@ dns_zone_setserial(dns_zone_t *zone, uint32_t serial); /*% * Set the zone's serial to 'serial'. */ -ISC_LANG_ENDDECLS isc_stats_t * dns_zone_getgluecachestats(dns_zone_t *zone); diff --git a/lib/dns/include/dns/zonekey.h b/lib/dns/include/dns/zonekey.h index b093fa924d..5b1b30a73d 100644 --- a/lib/dns/include/dns/zonekey.h +++ b/lib/dns/include/dns/zonekey.h @@ -17,12 +17,8 @@ #include -#include - #include -ISC_LANG_BEGINDECLS - bool dns_zonekey_iszonekey(dns_rdata_t *keyrdata); /*%< @@ -31,5 +27,3 @@ dns_zonekey_iszonekey(dns_rdata_t *keyrdata); * Requires: * 'keyrdata' is not NULL. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/zoneverify.h b/lib/dns/include/dns/zoneverify.h index 22a680ac53..77f5d97eb2 100644 --- a/lib/dns/include/dns/zoneverify.h +++ b/lib/dns/include/dns/zoneverify.h @@ -21,8 +21,6 @@ #include -ISC_LANG_BEGINDECLS - /*% * Verify that certain things are sane: * @@ -46,5 +44,3 @@ dns_zoneverify_dnssec(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin, dns_keytable_t *secroots, isc_mem_t *mctx, bool ignore_kskflag, bool keyset_kskonly, void (*report)(const char *, ...)); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h index 3ed74911c2..733f576f1e 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -17,13 +17,10 @@ #include -#include #include #include -ISC_LANG_BEGINDECLS - typedef enum dns_ztfind { DNS_ZTFIND_EXACT = 1 << 0, DNS_ZTFIND_NOEXACT = 1 << 1, @@ -215,5 +212,3 @@ dns_zt_setviewrevert(dns_zt_t *zt); * Requires: *\li 'zt' to be valid. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h index c63a743f81..33866d6682 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h @@ -18,7 +18,6 @@ #include #include -#include #include #include @@ -30,8 +29,6 @@ #include -ISC_LANG_BEGINDECLS - /*** *** Types ***/ @@ -1232,5 +1229,3 @@ dst_hmac_algorithm_totext(dst_algorithm_t alg); * Return the name associtated with the HMAC algorithm 'alg' * or return "unknown". */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h index 494b4b0762..5c6f0d203d 100644 --- a/lib/dns/include/dst/gssapi.h +++ b/lib/dns/include/dst/gssapi.h @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -27,8 +26,6 @@ typedef void *dns_gss_cred_id_t; typedef void *dns_gss_ctx_id_t; -ISC_LANG_BEGINDECLS - /*** *** Types ***/ @@ -188,5 +185,3 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, * in "name" (which represents the realm name). * */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/include/irs/resconf.h b/lib/dns/include/irs/resconf.h index 3af1723447..23a5b82873 100644 --- a/lib/dns/include/irs/resconf.h +++ b/lib/dns/include/irs/resconf.h @@ -13,7 +13,6 @@ #pragma once -#include #include #include @@ -39,8 +38,6 @@ typedef struct irs_resconf_search { typedef ISC_LIST(irs_resconf_search_t) irs_resconf_searchlist_t; -ISC_LANG_BEGINDECLS - isc_result_t irs_resconf_load(isc_mem_t *mctx, const char *filename, irs_resconf_t **confp); /*%< @@ -136,5 +133,3 @@ irs_resconf_gettimeout(irs_resconf_t *conf); * *\li 'conf' is a valid resconf object. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/qpcache_p.h b/lib/dns/qpcache_p.h index 63ffc584cb..041241cd71 100644 --- a/lib/dns/qpcache_p.h +++ b/lib/dns/qpcache_p.h @@ -14,7 +14,6 @@ #pragma once #include -#include #include #include @@ -30,8 +29,6 @@ * DNS QPDB Implementation (minimally adapted from RBTDB) */ -ISC_LANG_BEGINDECLS - isc_result_t dns__qpcache_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], @@ -48,4 +45,3 @@ dns__qpcache_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type, * * \li argc == 0 or argv[0] is a valid memory context. */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/qpzone_p.h b/lib/dns/qpzone_p.h index 23cd4ef191..45502f95a2 100644 --- a/lib/dns/qpzone_p.h +++ b/lib/dns/qpzone_p.h @@ -14,7 +14,6 @@ #pragma once #include -#include #include #include @@ -30,8 +29,6 @@ * DNS QP-Trie DB Implementation */ -ISC_LANG_BEGINDECLS - isc_result_t dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char **argv, @@ -48,4 +45,3 @@ dns__qpzone_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type, * * \li argc == 0 or argv[0] is a valid memory context. */ -ISC_LANG_ENDDECLS diff --git a/lib/dns/rdata/generic/avc_258.h b/lib/dns/rdata/generic/avc_258.h index 828d7f0a3b..b3128a87ff 100644 --- a/lib/dns/rdata/generic/avc_258.h +++ b/lib/dns/rdata/generic/avc_258.h @@ -23,8 +23,3 @@ typedef struct dns_rdata_avc { /* private */ uint16_t offset; } dns_rdata_avc_t; - -/* - * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done - * via rdatastructpre.h and rdatastructsuf.h. - */ diff --git a/lib/dns/rdata/generic/ninfo_56.h b/lib/dns/rdata/generic/ninfo_56.h index 66cf9482b5..b19737558c 100644 --- a/lib/dns/rdata/generic/ninfo_56.h +++ b/lib/dns/rdata/generic/ninfo_56.h @@ -18,11 +18,6 @@ typedef struct dns_rdata_txt_string dns_rdata_ninfo_string_t; typedef struct dns_rdata_txt dns_rdata_ninfo_t; -/* - * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done - * via rdatastructpre.h and rdatastructsuf.h. - */ - isc_result_t dns_rdata_ninfo_first(dns_rdata_ninfo_t *); diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h index 2198fde772..1842b0dc83 100644 --- a/lib/dns/rdata/generic/opt_41.h +++ b/lib/dns/rdata/generic/opt_41.h @@ -31,11 +31,6 @@ typedef struct dns_rdata_opt { uint16_t offset; } dns_rdata_opt_t; -/* - * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done - * via rdatastructpre.h and rdatastructsuf.h. - */ - isc_result_t dns_rdata_opt_first(dns_rdata_opt_t *); diff --git a/lib/dns/rdata/generic/resinfo_261.h b/lib/dns/rdata/generic/resinfo_261.h index a40365bacb..67218881a8 100644 --- a/lib/dns/rdata/generic/resinfo_261.h +++ b/lib/dns/rdata/generic/resinfo_261.h @@ -26,8 +26,3 @@ typedef struct dns_rdata_resinfo { /* private */ uint16_t offset; } dns_rdata_resinfo_t; - -/* - * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done - * via rdatastructpre.h and rdatastructsuf.h. - */ diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h index f0963ed28d..cffe055a66 100644 --- a/lib/dns/rdata/generic/spf_99.h +++ b/lib/dns/rdata/generic/spf_99.h @@ -26,8 +26,3 @@ typedef struct dns_rdata_spf { /* private */ uint16_t offset; } dns_rdata_spf_t; - -/* - * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done - * via rdatastructpre.h and rdatastructsuf.h. - */ diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h index 3e4c58ad7a..c27b0a2c40 100644 --- a/lib/dns/rdata/generic/txt_16.h +++ b/lib/dns/rdata/generic/txt_16.h @@ -28,11 +28,6 @@ typedef struct dns_rdata_txt { uint16_t offset; } dns_rdata_txt_t; -/* - * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done - * via rdatastructpre.h and rdatastructsuf.h. - */ - isc_result_t dns_rdata_txt_first(dns_rdata_txt_t *); diff --git a/lib/dns/rdata/generic/wallet_262.h b/lib/dns/rdata/generic/wallet_262.h index ca552ca427..9ac7b331c1 100644 --- a/lib/dns/rdata/generic/wallet_262.h +++ b/lib/dns/rdata/generic/wallet_262.h @@ -18,11 +18,6 @@ typedef struct dns_rdata_txt_string dns_rdata_wallet_string_t; typedef struct dns_rdata_txt dns_rdata_wallet_t; -/* - * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done - * via rdatastructpre.h and rdatastructsuf.h. - */ - isc_result_t dns_rdata_wallet_first(dns_rdata_wallet_t *); diff --git a/lib/dns/rdata/in_1/apl_42.h b/lib/dns/rdata/in_1/apl_42.h index 0a3f7ac40f..2408e6c2ed 100644 --- a/lib/dns/rdata/in_1/apl_42.h +++ b/lib/dns/rdata/in_1/apl_42.h @@ -32,11 +32,6 @@ typedef struct dns_rdata_in_apl { uint16_t offset; } dns_rdata_in_apl_t; -/* - * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done - * via rdatastructpre.h and rdatastructsuf.h. - */ - isc_result_t dns_rdata_apl_first(dns_rdata_in_apl_t *); diff --git a/lib/dns/rdata/rdatastructpre.h b/lib/dns/rdata/rdatastructpre.h index 4fe31b1af1..f2019ac2df 100644 --- a/lib/dns/rdata/rdatastructpre.h +++ b/lib/dns/rdata/rdatastructpre.h @@ -13,14 +13,11 @@ #pragma once -#include #include #include #include -ISC_LANG_BEGINDECLS - typedef struct dns_rdatacommon { dns_rdataclass_t rdclass; dns_rdatatype_t rdtype; diff --git a/lib/dns/rdata/rdatastructsuf.h b/lib/dns/rdata/rdatastructsuf.h index c3ec424e6d..5ab4314b50 100644 --- a/lib/dns/rdata/rdatastructsuf.h +++ b/lib/dns/rdata/rdatastructsuf.h @@ -10,5 +10,3 @@ * See the COPYRIGHT file distributed with this work for additional * information regarding copyright ownership. */ - -ISC_LANG_ENDDECLS diff --git a/lib/dns/tsig_p.h b/lib/dns/tsig_p.h index 42316a0608..9b43c762f5 100644 --- a/lib/dns/tsig_p.h +++ b/lib/dns/tsig_p.h @@ -26,11 +26,7 @@ * its associated unit tests. */ -ISC_LANG_BEGINDECLS - bool dns__tsig_algvalid(unsigned int alg); dst_algorithm_t dns__tsig_algfromname(const dns_name_t *algorithm); - -ISC_LANG_ENDDECLS diff --git a/lib/dns/zone_p.h b/lib/dns/zone_p.h index 16ee0e522a..3cd21982bc 100644 --- a/lib/dns/zone_p.h +++ b/lib/dns/zone_p.h @@ -22,8 +22,6 @@ * associated unit tests. */ -ISC_LANG_BEGINDECLS - typedef struct { dns_diff_t *diff; bool offline; @@ -40,5 +38,3 @@ isc_result_t dns__zone_lookup_nsec3param(dns_zone_t *zone, dns_rdata_nsec3param_t *lookup, dns_rdata_nsec3param_t *param, unsigned char saltbuf[255], bool resalt); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am index 277e5e951e..d60ccd03b1 100644 --- a/lib/isc/Makefile.am +++ b/lib/isc/Makefile.am @@ -41,7 +41,6 @@ libisc_la_HEADERS = \ include/isc/interfaceiter.h \ include/isc/iterated_hash.h \ include/isc/job.h \ - include/isc/lang.h \ include/isc/lex.h \ include/isc/list.h \ include/isc/log.h \ diff --git a/lib/isc/errno2result.h b/lib/isc/errno2result.h index 80fee698e0..96eb059b80 100644 --- a/lib/isc/errno2result.h +++ b/lib/isc/errno2result.h @@ -20,15 +20,10 @@ #include /* Provides errno. */ #include -#include #include -ISC_LANG_BEGINDECLS - #define isc__errno2result(x) isc___errno2result(x, true, __FILE__, __LINE__) isc_result_t isc___errno2result(int posixerrno, bool dolog, const char *file, unsigned int line); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h index 03e90414eb..49182be1c8 100644 --- a/lib/isc/include/isc/assertions.h +++ b/lib/isc/include/isc/assertions.h @@ -17,9 +17,6 @@ #pragma once #include -#include - -ISC_LANG_BEGINDECLS /*% isc assertion type */ typedef enum { @@ -69,5 +66,3 @@ isc_assertion_typetotext(isc_assertiontype_t type); (isc_assertion_failed(__FILE__, __LINE__, isc_assertiontype_insist, \ "unreachable"), \ __builtin_unreachable()) - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/async.h b/lib/isc/include/isc/async.h index 2b94cd78e0..78e16c2d96 100644 --- a/lib/isc/include/isc/async.h +++ b/lib/isc/include/isc/async.h @@ -26,13 +26,10 @@ #include #include -#include #include #include #include -ISC_LANG_BEGINDECLS - void isc_async_run(isc_loop_t *loop, isc_job_cb cb, void *cbarg); /*%< @@ -49,5 +46,3 @@ isc_async_run(isc_loop_t *loop, isc_job_cb cb, void *cbarg); /*%< * Helper macro to run the job on the current loop */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/backtrace.h b/lib/isc/include/isc/backtrace.h index 2198f2a408..dbb6f2b7f0 100644 --- a/lib/isc/include/isc/backtrace.h +++ b/lib/isc/include/isc/backtrace.h @@ -46,7 +46,6 @@ *** Functions ***/ -ISC_LANG_BEGINDECLS int isc_backtrace(void **addrs, int maxaddrs); /*%< @@ -111,5 +110,3 @@ isc_backtrace_log(isc_logcategory_t category, isc_logmodule_t module, /* * Write a backtrace to the log. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/base32.h b/lib/isc/include/isc/base32.h index 1faa6296ea..31ef37aed3 100644 --- a/lib/isc/include/isc/base32.h +++ b/lib/isc/include/isc/base32.h @@ -25,11 +25,8 @@ * Base 32 hex "np" is base 32 hex but no padding is produced or accepted. */ -#include #include -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -139,5 +136,3 @@ isc_base32hexnp_decoderegion(isc_region_t *source, isc_buffer_t *target); * fit in 'target'. *\li #ISC_R_BADBASE32 -- 'source' is not a valid base32 encoding. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/base64.h b/lib/isc/include/isc/base64.h index b1bc0892df..8eba7826ab 100644 --- a/lib/isc/include/isc/base64.h +++ b/lib/isc/include/isc/base64.h @@ -15,11 +15,8 @@ /*! \file isc/base64.h */ -#include #include -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -94,5 +91,3 @@ isc_base64_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length); * be read, if `length` is non-negative. The 'used' pointer in * 'target' will be advanced as necessary. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h index 6d62415461..9cd508bfd3 100644 --- a/lib/isc/include/isc/buffer.h +++ b/lib/isc/include/isc/buffer.h @@ -106,7 +106,6 @@ #include #include #include -#include #include #include #include @@ -115,8 +114,6 @@ #include #include -ISC_LANG_BEGINDECLS - /*@{*/ /*! *** Magic numbers @@ -1257,5 +1254,3 @@ isc_buffer_printf(isc_buffer_t *restrict b, const char *restrict format, ...) { return ISC_R_SUCCESS; } - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h index ac721359ff..2caec1f1d1 100644 --- a/lib/isc/include/isc/commandline.h +++ b/lib/isc/include/isc/commandline.h @@ -17,7 +17,6 @@ #include -#include #include #include @@ -34,8 +33,6 @@ extern bool isc_commandline_errprint; /*% Reset getopt. */ extern bool isc_commandline_reset; -ISC_LANG_BEGINDECLS - int isc_commandline_parse(int argc, char *const *argv, const char *options); /*%< @@ -52,5 +49,3 @@ isc_commandline_strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, * must free the array using isc_mem_free(). The string * is modified in-place. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/condition.h b/lib/isc/include/isc/condition.h index 4d820ab4b8..27f2b80c73 100644 --- a/lib/isc/include/isc/condition.h +++ b/lib/isc/include/isc/condition.h @@ -19,15 +19,12 @@ #include #include -#include #include #include #include #include #include -ISC_LANG_BEGINDECLS - /* * We use macros instead of static inline functions so that the exact code * location can be reported when PTHREADS_RUNTIME_CHECK() fails or when mutrace @@ -98,5 +95,3 @@ typedef pthread_cond_t isc_condition_t; isc_result_t isc__condition_waituntil(pthread_cond_t *, pthread_mutex_t *, isc_time_t *); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/counter.h b/lib/isc/include/isc/counter.h index 385b08cd4f..68fbf0ade4 100644 --- a/lib/isc/include/isc/counter.h +++ b/lib/isc/include/isc/counter.h @@ -30,7 +30,6 @@ *** Imports. ***/ -#include #include #include @@ -38,8 +37,6 @@ ***** Types. *****/ -ISC_LANG_BEGINDECLS - isc_result_t isc_counter_create(isc_mem_t *mctx, int limit, isc_counter_t **counterp); /*%< @@ -86,5 +83,3 @@ isc_counter_detach(isc_counter_t **counterp); * Detach (and destroy if reference counter has dropped to zero) * a counter object. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/dir.h b/lib/isc/include/isc/dir.h index 51db17f75a..2b25b4164f 100644 --- a/lib/isc/include/isc/dir.h +++ b/lib/isc/include/isc/dir.h @@ -19,7 +19,6 @@ #include #include /* Required on some systems. */ -#include #include #ifndef NAME_MAX @@ -44,8 +43,6 @@ typedef struct isc_dir { DIR *handle; } isc_dir_t; -ISC_LANG_BEGINDECLS - void isc_dir_init(isc_dir_t *dir); @@ -66,5 +63,3 @@ isc_dir_chdir(const char *dirname); isc_result_t isc_dir_chroot(const char *dirname); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h index 4e2dc5f884..81c2ed7cac 100644 --- a/lib/isc/include/isc/entropy.h +++ b/lib/isc/include/isc/entropy.h @@ -15,8 +15,6 @@ #include -#include - /*! \file isc/entropy.h * \brief Implements wrapper around CSPRNG cryptographic library calls * for getting cryptographically secure pseudo-random numbers. @@ -24,12 +22,8 @@ * Uses synchronous version of uv_random(). */ -ISC_LANG_BEGINDECLS - void isc_entropy_get(void *buf, size_t buflen); /*!< * \brief Get cryptographically-secure pseudo-random data. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/errno.h b/lib/isc/include/isc/errno.h index 0151df38ea..fb62149468 100644 --- a/lib/isc/include/isc/errno.h +++ b/lib/isc/include/isc/errno.h @@ -17,11 +17,8 @@ #include -ISC_LANG_BEGINDECLS - isc_result_t isc_errno_toresult(int err); /*!< * \brief Convert a POSIX errno value to an ISC result code. */ -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h index fe7b5c6208..b6eb7d5920 100644 --- a/lib/isc/include/isc/error.h +++ b/lib/isc/include/isc/error.h @@ -19,9 +19,6 @@ #include #include -#include - -ISC_LANG_BEGINDECLS typedef void (*isc_errorcallback_t)(const char *, int, const char *, const char *, va_list); @@ -41,5 +38,3 @@ isc_error_unexpected(const char *, int, const char *, const char *, ...) ISC_NORETURN void isc_error_fatal(const char *, int, const char *, const char *, ...) ISC_FORMAT_PRINTF(4, 5); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h index 61365a32d2..5db3a9cb44 100644 --- a/lib/isc/include/isc/file.h +++ b/lib/isc/include/isc/file.h @@ -19,11 +19,8 @@ #include #include -#include #include -ISC_LANG_BEGINDECLS - isc_result_t isc_file_settime(const char *file, isc_time_t *time); @@ -369,5 +366,3 @@ isc_file_isdirwritable(const char *path); /*%< * Return true if the path is a directory and is writable */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/fips.h b/lib/isc/include/isc/fips.h index c75ac71361..087197b8d3 100644 --- a/lib/isc/include/isc/fips.h +++ b/lib/isc/include/isc/fips.h @@ -21,11 +21,8 @@ *** Imports ***/ -#include #include -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -41,5 +38,3 @@ isc_fips_set_mode(int mode); /* * Enable FIPS mode. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/getaddresses.h b/lib/isc/include/isc/getaddresses.h index 00b405161b..8fe3e3c1bb 100644 --- a/lib/isc/include/isc/getaddresses.h +++ b/lib/isc/include/isc/getaddresses.h @@ -15,12 +15,9 @@ /*! \file isc/getaddresses.h */ -#include #include #include -ISC_LANG_BEGINDECLS - isc_result_t isc_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, int addrsize, int *addrcount); @@ -48,5 +45,3 @@ isc_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, *\li #ISC_R_FAMILYNOSUPPORT - 'hostname' is an IPv6 address, and IPv6 is * not supported. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h index bee5a8332d..676df77de8 100644 --- a/lib/isc/include/isc/hash.h +++ b/lib/isc/include/isc/hash.h @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -33,7 +32,6 @@ typedef struct isc_siphash24 isc_hash64_t; /*** *** Functions ***/ -ISC_LANG_BEGINDECLS void isc__hash_initialize(void); @@ -118,5 +116,3 @@ isc_hash_bits32(uint32_t val, unsigned int bits) { /* High bits are more random. */ return val * ISC_HASH_GOLDENRATIO_32 >> (32 - bits); } - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h index 98ae74c3f7..d0c4f8e11a 100644 --- a/lib/isc/include/isc/heap.h +++ b/lib/isc/include/isc/heap.h @@ -17,11 +17,8 @@ #include -#include #include -ISC_LANG_BEGINDECLS - /*% * The comparison function returns true if the first argument has * higher priority than the second argument, and false otherwise. @@ -157,5 +154,3 @@ isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap); *\li The heap structure CANNOT be modified during this iteration. The only * safe function to call while iterating the heap is isc_heap_element(). */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/helper.h b/lib/isc/include/isc/helper.h index fa13f0baf2..e13ec9b5c0 100644 --- a/lib/isc/include/isc/helper.h +++ b/lib/isc/include/isc/helper.h @@ -18,13 +18,10 @@ #include #include -#include #include #include #include -ISC_LANG_BEGINDECLS - void isc_helper_run(isc_loop_t *loop, isc_job_cb cb, void *cbarg); /*%< @@ -41,5 +38,3 @@ isc_helper_run(isc_loop_t *loop, isc_job_cb cb, void *cbarg); /*%< * Helper macro to run the job on the current loop */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/hex.h b/lib/isc/include/isc/hex.h index 4599bfc893..dd36f94391 100644 --- a/lib/isc/include/isc/hex.h +++ b/lib/isc/include/isc/hex.h @@ -15,11 +15,8 @@ /*! \file isc/hex.h */ -#include #include -ISC_LANG_BEGINDECLS - /* * An `isc__hex_char` table entry is non-zero if the character is a hex digit; * You can subtract the table entry from the character to convert the hex digit @@ -107,5 +104,3 @@ isc_hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length); * be read, if `length` is non-negative. The 'used' pointer in * 'target' will be advanced as necessary. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/hmac.h b/lib/isc/include/isc/hmac.h index 68b63d478a..0a6ba8c4ff 100644 --- a/lib/isc/include/isc/hmac.h +++ b/lib/isc/include/isc/hmac.h @@ -18,7 +18,6 @@ #pragma once -#include #include #include #include diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h index c696091bbb..9aad357402 100644 --- a/lib/isc/include/isc/interfaceiter.h +++ b/lib/isc/include/isc/interfaceiter.h @@ -35,7 +35,6 @@ #include -#include #include #include @@ -66,8 +65,6 @@ struct isc_interface { *** Functions ***/ -ISC_LANG_BEGINDECLS - isc_result_t isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp); /*!< @@ -123,5 +120,3 @@ isc_interfaceiter_destroy(isc_interfaceiter_t **iterp); /*!< * \brief Destroy the iterator. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/iterated_hash.h b/lib/isc/include/isc/iterated_hash.h index cb21761c96..c96753b632 100644 --- a/lib/isc/include/isc/iterated_hash.h +++ b/lib/isc/include/isc/iterated_hash.h @@ -13,8 +13,6 @@ #pragma once -#include - /* * The maximal hash length that can be encoded in a name * using base32hex. floor(255/8)*5 @@ -27,8 +25,6 @@ */ #define NSEC3_MAX_LABEL_HASH 35 -ISC_LANG_BEGINDECLS - int isc_iterated_hash(unsigned char *out, const unsigned int hashalg, const int iterations, const unsigned char *salt, @@ -43,5 +39,3 @@ void isc__iterated_hash_initialize(void); void isc__iterated_hash_shutdown(void); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/job.h b/lib/isc/include/isc/job.h index 9a44974c25..3a92aa0c72 100644 --- a/lib/isc/include/isc/job.h +++ b/lib/isc/include/isc/job.h @@ -24,7 +24,6 @@ #include -#include #include #include #include @@ -47,8 +46,6 @@ struct isc_job { .link = ISC_LINK_INITIALIZER, \ } -ISC_LANG_BEGINDECLS - void isc_job_run(isc_loop_t *loop, isc_job_t *job, isc_job_cb cb, void *cbarg); /*%< @@ -62,5 +59,3 @@ isc_job_run(isc_loop_t *loop, isc_job_t *job, isc_job_cb cb, void *cbarg); *\li 'cb' is a callback function, must be non-NULL *\li 'cbarg' is passed to the 'cb' as the only argument, may be NULL */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h deleted file mode 100644 index b7e88a5dca..0000000000 --- a/lib/isc/include/isc/lang.h +++ /dev/null @@ -1,24 +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/lang.h */ - -#ifdef __cplusplus -#define ISC_LANG_BEGINDECLS extern "C" { -#define ISC_LANG_ENDDECLS } -#else /* ifdef __cplusplus */ -#define ISC_LANG_BEGINDECLS -#define ISC_LANG_ENDDECLS -#endif /* ifdef __cplusplus */ diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h index 2579ea4647..9ce051c6f3 100644 --- a/lib/isc/include/isc/lex.h +++ b/lib/isc/include/isc/lex.h @@ -47,12 +47,9 @@ #include #include -#include #include #include -ISC_LANG_BEGINDECLS - /*** *** Options ***/ @@ -440,5 +437,3 @@ isc_lex_isfile(isc_lex_t *lex); * \li #true if the current input is a file, *\li #false otherwise. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h index 3469c4bded..c076aff901 100644 --- a/lib/isc/include/isc/log.h +++ b/lib/isc/include/isc/log.h @@ -22,7 +22,6 @@ #include /* XXXDCL NT */ #include -#include #include #include @@ -297,8 +296,6 @@ extern isc_logcategory_t isc_categories[]; extern isc_logmodule_t isc_modules[]; /*@}*/ -ISC_LANG_BEGINDECLS - void isc_logconfig_create(isc_logconfig_t **lcfgp); /*%< @@ -768,5 +765,3 @@ isc__log_shutdown(void); /*%< * Library constructor/destructor */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/loop.h b/lib/isc/include/isc/loop.h index fe3545115a..ae263d4e83 100644 --- a/lib/isc/include/isc/loop.h +++ b/lib/isc/include/isc/loop.h @@ -16,7 +16,6 @@ #include #include -#include #include #include #include @@ -25,8 +24,6 @@ typedef void (*isc_job_cb)(void *); /* Add -DISC_LOOP_TRACE=1 to CFLAGS for detailed reference tracing */ -ISC_LANG_BEGINDECLS - /*%< * Returns the current running loop. */ @@ -225,4 +222,3 @@ isc_loop_shuttingdown(isc_loop_t *loop); * * \li 'loop' is a valid loop and the loop tid matches the current tid. */ -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/md.h b/lib/isc/include/isc/md.h index e2ecb76dd0..41c3447565 100644 --- a/lib/isc/include/isc/md.h +++ b/lib/isc/include/isc/md.h @@ -19,7 +19,6 @@ #pragma once #include -#include #include #include diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h index 2ee8c9e200..789efee2cb 100644 --- a/lib/isc/include/isc/mem.h +++ b/lib/isc/include/isc/mem.h @@ -19,14 +19,11 @@ #include #include -#include #include #include #include #include -ISC_LANG_BEGINDECLS - /*% * Define ISC_MEM_TRACKLINES=1 to turn on detailed tracing of memory * allocation and freeing by file and line number. @@ -548,5 +545,3 @@ isc__mempool_put(isc_mempool_t *, void *_ISC_MEM_FLARG); */ #pragma pop_macro("malloc") #endif - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/meminfo.h b/lib/isc/include/isc/meminfo.h index fc39e26843..dfea93a078 100644 --- a/lib/isc/include/isc/meminfo.h +++ b/lib/isc/include/isc/meminfo.h @@ -15,16 +15,11 @@ #include -#include #include -ISC_LANG_BEGINDECLS - uint64_t isc_meminfo_totalphys(void); /*%< * Return total available physical memory in bytes, or 0 if this cannot * be determined */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/mutex.h b/lib/isc/include/isc/mutex.h index df24922336..a975b0d065 100644 --- a/lib/isc/include/isc/mutex.h +++ b/lib/isc/include/isc/mutex.h @@ -19,12 +19,9 @@ #include #include -#include #include /* for ISC_R_ codes */ #include -ISC_LANG_BEGINDECLS - /* * We use macros instead of static inline functions so that the exact code * location can be reported when PTHREADS_RUNTIME_CHECK() fails or when mutrace @@ -89,5 +86,3 @@ extern pthread_mutexattr_t isc__mutex_init_attr; int _ret = pthread_mutex_destroy(mp); \ PTHREADS_RUNTIME_CHECK(pthread_mutex_destroy, _ret); \ } - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h index f5f2e32e8e..7251efe0e5 100644 --- a/lib/isc/include/isc/mutexblock.h +++ b/lib/isc/include/isc/mutexblock.h @@ -15,12 +15,9 @@ /*! \file isc/mutexblock.h */ -#include #include #include -ISC_LANG_BEGINDECLS - void isc_mutexblock_init(isc_mutex_t *block, unsigned int count); /*%< @@ -50,5 +47,3 @@ isc_mutexblock_destroy(isc_mutex_t *block, unsigned int count); * the whole block was initialized via isc_mutex_initblock(). * */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h index 7d7ad6b7e1..4c83db2a1b 100644 --- a/lib/isc/include/isc/net.h +++ b/lib/isc/include/isc/net.h @@ -72,7 +72,6 @@ #include /* Contractual promise. */ #include -#include #include #ifndef IN6ADDR_LOOPBACK_INIT @@ -183,8 +182,6 @@ *** Functions. ***/ -ISC_LANG_BEGINDECLS - isc_result_t isc_net_probeipv4(void); /*%< @@ -235,5 +232,3 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high); *\li *low and *high will be the ports specifying the low and high ends of * the range. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h index d8797776f3..6e7004a9a9 100644 --- a/lib/isc/include/isc/netaddr.h +++ b/lib/isc/include/isc/netaddr.h @@ -20,12 +20,9 @@ #include #include -#include #include #include -ISC_LANG_BEGINDECLS - /* * Any updates to this structure should also be applied in * https://gitlab.isc.org/isc-projects/dlz-modules/-/raw/main/modules/include/dlz_minimal.h @@ -190,4 +187,3 @@ isc_netaddr_isloopback(const isc_netaddr_t *na); * Test whether the netaddr 'na' is a loopback IPv4 or IPv6 address (in * 127.0.0.0/8 or ::1). */ -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/netscope.h b/lib/isc/include/isc/netscope.h index 307864af76..8cb66a991a 100644 --- a/lib/isc/include/isc/netscope.h +++ b/lib/isc/include/isc/netscope.h @@ -17,8 +17,6 @@ #include -ISC_LANG_BEGINDECLS - /*% * Convert a string of an IPv6 scope zone to zone index. If the conversion * succeeds, 'zoneid' will store the index value. @@ -32,5 +30,3 @@ ISC_LANG_BEGINDECLS */ isc_result_t isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/nonce.h b/lib/isc/include/isc/nonce.h index b593e41445..ce15b7e12a 100644 --- a/lib/isc/include/isc/nonce.h +++ b/lib/isc/include/isc/nonce.h @@ -15,19 +15,13 @@ #include -#include - /*! \file isc/nonce.h * \brief Provides a function for generating an arbitrarily long nonce. */ -ISC_LANG_BEGINDECLS - void isc_nonce_buf(void *buf, size_t buflen); /*!< * Fill 'buf', up to 'buflen' bytes, with random data from the * crypto provider's random function. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/os.h b/lib/isc/include/isc/os.h index 32770b992f..85b5d80746 100644 --- a/lib/isc/include/isc/os.h +++ b/lib/isc/include/isc/os.h @@ -16,11 +16,8 @@ /*! \file isc/os.h */ #include -#include #include -ISC_LANG_BEGINDECLS - /*%< * Hardcode the L1 cacheline size of the CPU to 64, this is checked in * the os.c library constructor if operating system provide means to @@ -48,5 +45,3 @@ isc_os_umask(void); /*%< * Return umask of the current process as initialized at the program start */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/parseint.h b/lib/isc/include/isc/parseint.h index aa54772a79..9565d5f32a 100644 --- a/lib/isc/include/isc/parseint.h +++ b/lib/isc/include/isc/parseint.h @@ -15,7 +15,6 @@ #include -#include #include /*! \file isc/parseint.h @@ -26,8 +25,6 @@ *** Functions ***/ -ISC_LANG_BEGINDECLS - isc_result_t isc_parse_uint32(uint32_t *uip, const char *string, int base); @@ -53,5 +50,3 @@ isc_parse_uint8(uint8_t *uip, const char *string, int base); *\li #ISC_R_BADNUMBER The string is not numeric (in the given base) *\li #ISC_R_RANGE The number is not representable as the requested type. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/portset.h b/lib/isc/include/isc/portset.h index fa5d51e5d6..30aa11f838 100644 --- a/lib/isc/include/isc/portset.h +++ b/lib/isc/include/isc/portset.h @@ -37,8 +37,6 @@ *** Functions ***/ -ISC_LANG_BEGINDECLS - isc_result_t isc_portset_create(isc_mem_t *mctx, isc_portset_t **portsetp); /*%< @@ -131,5 +129,3 @@ isc_portset_removerange(isc_portset_t *portset, in_port_t port_lo, *\li 'portlist' to be valid. *\li port_lo <= port_hi */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/proxy2.h b/lib/isc/include/isc/proxy2.h index b831ee74ca..175e5052ce 100644 --- a/lib/isc/include/isc/proxy2.h +++ b/lib/isc/include/isc/proxy2.h @@ -50,8 +50,6 @@ #define ISC_PROXY2_TLS_SUBHEADER_MIN_SIZE \ (1 /* client_flags */ + 4 /* verify */) -ISC_LANG_BEGINDECLS - typedef enum isc_proxy2_command { ISC_PROXY2_CMD_ILLEGAL = -1, /* @@ -851,5 +849,3 @@ isc_proxy2_append_tlv_string(isc_buffer_t *restrict outbuf, const uint8_t type, *\li 'ISC_R_NOSPACE' - not enough data in the output buffer *\li 'ISC_R_RANGE' - too much data for PROXYv2 header. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h index 5597b9fda1..da5b3465c1 100644 --- a/lib/isc/include/isc/quota.h +++ b/lib/isc/include/isc/quota.h @@ -32,7 +32,6 @@ #include #include -#include #include #include #include @@ -46,8 +45,6 @@ /* Add -DISC_QUOTA_TRACE=1 to CFLAGS for detailed reference tracing */ -ISC_LANG_BEGINDECLS - /*% * isc_quota structure * @@ -142,5 +139,3 @@ isc_quota_release(isc_quota_t *quota); /*%< * Release one unit of quota. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h index 79f1f9de2c..213e979ec6 100644 --- a/lib/isc/include/isc/random.h +++ b/lib/isc/include/isc/random.h @@ -16,7 +16,6 @@ #include #include -#include #include /*! \file isc/random.h @@ -25,8 +24,6 @@ * */ -ISC_LANG_BEGINDECLS - uint8_t isc_random8(void); /*!< @@ -67,5 +64,3 @@ isc_random_uniform(uint32_t upper_bound); * resample is very small when the upper_bound is small, rising to 0.5 * when upper_bound is UINT32_MAX/2. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/ratelimiter.h b/lib/isc/include/isc/ratelimiter.h index d5510cf978..d4834bf4fd 100644 --- a/lib/isc/include/isc/ratelimiter.h +++ b/lib/isc/include/isc/ratelimiter.h @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -44,8 +43,6 @@ struct isc_rlevent { ISC_LINK(isc_rlevent_t) link; }; -ISC_LANG_BEGINDECLS - /***** ***** Functions. *****/ @@ -138,5 +135,3 @@ ISC_REFCOUNT_DECL(isc_ratelimiter); /*%< * The rate limiter reference counting. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h index 82f5796bd6..eb4efed401 100644 --- a/lib/isc/include/isc/refcount.h +++ b/lib/isc/include/isc/refcount.h @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -30,8 +29,6 @@ * counting. The isc_refcount_t type must not be accessed directly. */ -ISC_LANG_BEGINDECLS - typedef atomic_uint_fast32_t isc_refcount_t; #define ISC_REFCOUNT_INITIALIZER(a) (a) @@ -235,5 +232,3 @@ typedef atomic_uint_fast32_t isc_refcount_t; ISC__REFCOUNT_IMPL(name, destroy, ISC_REFCOUNT_BLANK) #define ISC_REFCOUNT_STATIC_IMPL(name, destroy) \ ISC__REFCOUNT_IMPL(name, destroy, static inline) - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/regex.h b/lib/isc/include/isc/regex.h index 989d7b1219..ca7ff8499f 100644 --- a/lib/isc/include/isc/regex.h +++ b/lib/isc/include/isc/regex.h @@ -15,11 +15,8 @@ /*! \file isc/regex.h */ -#include #include -ISC_LANG_BEGINDECLS - int isc_regex_validate(const char *expression); /*%< @@ -29,5 +26,3 @@ isc_regex_validate(const char *expression); *\li -1 on error. *\li the number of groups in the expression. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h index 536451142f..4767b5f890 100644 --- a/lib/isc/include/isc/region.h +++ b/lib/isc/include/isc/region.h @@ -15,7 +15,6 @@ /*! \file isc/region.h */ -#include #include struct isc_region { @@ -75,8 +74,6 @@ struct isc_consttextregion { } while (0) /*@}*/ -ISC_LANG_BEGINDECLS - int isc_region_compare(isc_region_t *r1, isc_region_t *r2); /*%< @@ -93,5 +90,3 @@ isc_region_compare(isc_region_t *r1, isc_region_t *r2); *\li = 0 if r1 is lexicographically identical to r2 *\li > 0 if r1 is lexicographically greater than r2 */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h index 6db606ee78..e93c002ad4 100644 --- a/lib/isc/include/isc/result.h +++ b/lib/isc/include/isc/result.h @@ -17,8 +17,6 @@ #include -#include - typedef enum isc_result { ISC_R_SUCCESS, /*%< success */ ISC_R_NOMEMORY, /*%< out of memory */ @@ -280,8 +278,6 @@ typedef enum isc_result { ISC_R_MAKE_ENUM_32BIT = INT32_MAX, } isc_result_t; -ISC_LANG_BEGINDECLS - const char *isc_result_totext(isc_result_t); /*%< * Convert an isc_result_t into a string message describing the result. @@ -292,5 +288,3 @@ const char *isc_result_toid(isc_result_t); * Convert an isc_result_t into a string identifier such as * "ISC_R_SUCCESS". */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h index 3ae93d6a3a..16cbe536d8 100644 --- a/lib/isc/include/isc/rwlock.h +++ b/lib/isc/include/isc/rwlock.h @@ -18,12 +18,9 @@ /*! \file isc/rwlock.h */ -#include #include #include -ISC_LANG_BEGINDECLS - typedef enum { isc_rwlocktype_none = 0, isc_rwlocktype_read, @@ -260,5 +257,3 @@ isc_rwlock_setworkers(uint16_t workers); } #endif /* USE_PTHREAD_RWLOCK */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/safe.h b/lib/isc/include/isc/safe.h index 35e775980b..b5abbaff21 100644 --- a/lib/isc/include/isc/safe.h +++ b/lib/isc/include/isc/safe.h @@ -15,10 +15,6 @@ /*! \file isc/safe.h */ -#include - -ISC_LANG_BEGINDECLS - int isc_safe_memequal(const void *, const void *, size_t); @@ -40,5 +36,3 @@ isc_safe_memwipe(void *, size_t); * function to perform the memset operation so that the compiler cannot * infer about what the function does and optimize the call away. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h index b7bfa5f304..43d8f0e2c7 100644 --- a/lib/isc/include/isc/serial.h +++ b/lib/isc/include/isc/serial.h @@ -16,7 +16,6 @@ #include #include -#include #include /*! \file isc/serial.h @@ -28,8 +27,6 @@ *** Functions ***/ -ISC_LANG_BEGINDECLS - bool isc_serial_lt(uint32_t a, uint32_t b); /*%< @@ -65,5 +62,3 @@ isc_serial_ne(uint32_t a, uint32_t b); /*%< * Return true if 'a' != 'b' otherwise false. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/signal.h b/lib/isc/include/isc/signal.h index af13d723ea..d6c19bca22 100644 --- a/lib/isc/include/isc/signal.h +++ b/lib/isc/include/isc/signal.h @@ -15,13 +15,10 @@ #include -#include #include typedef void (*isc_signal_cb)(void *, int); -ISC_LANG_BEGINDECLS - isc_signal_t * isc_signal_new(isc_loopmgr_t *loopmgr, isc_signal_cb cb, void *cbarg, int signum); @@ -52,4 +49,3 @@ isc_signal_stop(isc_signal_t *signal); * Stop using the signal handler 'signal'. (It can be restarted with * isc_signal_start().) */ -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/siphash.h b/lib/isc/include/isc/siphash.h index 1cb3582f01..c066a85f16 100644 --- a/lib/isc/include/isc/siphash.h +++ b/lib/isc/include/isc/siphash.h @@ -31,7 +31,6 @@ #include #include -#include #include #include @@ -80,8 +79,6 @@ #define U8TO64_ONE(case_sensitive, byte) \ (uint64_t)(case_sensitive ? byte : isc__ascii_tolower1(byte)) -ISC_LANG_BEGINDECLS - typedef struct isc_siphash24 { uint64_t k0; uint64_t k1; @@ -429,5 +426,3 @@ isc_halfsiphash24(const uint8_t *k, const uint8_t *in, const size_t inlen, isc_halfsiphash24_hash(&state, in, inlen, case_sensitive); isc_halfsiphash24_finalize(&state, out); } - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h index be735cb770..00c0d56eb4 100644 --- a/lib/isc/include/isc/sockaddr.h +++ b/lib/isc/include/isc/sockaddr.h @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -50,8 +49,6 @@ struct isc_sockaddr { 0x0008 /*%< when comparing scopes \ * zero scopes always match */ -ISC_LANG_BEGINDECLS - bool isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, unsigned int flags); @@ -247,5 +244,3 @@ isc_sockaddr_disabled(const isc_sockaddr_t *sockaddr); * Report whether or not the address family of 'sockaddr' * has been disabled. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/spinlock.h b/lib/isc/include/isc/spinlock.h index e8b5432e9c..3333836af5 100644 --- a/lib/isc/include/isc/spinlock.h +++ b/lib/isc/include/isc/spinlock.h @@ -19,11 +19,8 @@ #include #include -#include #include -ISC_LANG_BEGINDECLS - /* * We use macros instead of static inline functions so that the exact code * location can be reported when PTHREADS_RUNTIME_CHECK() fails or when mutrace @@ -121,5 +118,3 @@ typedef atomic_uint_fast32_t isc_spinlock_t; } #endif - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/stats.h b/lib/isc/include/isc/stats.h index f6520969c8..e070f1f13f 100644 --- a/lib/isc/include/isc/stats.h +++ b/lib/isc/include/isc/stats.h @@ -83,8 +83,6 @@ enum { isc_sockstatscounter_max, }; -ISC_LANG_BEGINDECLS - /*%< * Flag(s) for isc_stats_dump(). */ @@ -224,5 +222,3 @@ isc_stats_resize(isc_stats_t **stats, int ncounters); *\li 'stats' is a valid isc_stats_t. *\li 'ncounters' is a non-zero positive number. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h index c8bac4d251..a220154320 100644 --- a/lib/isc/include/isc/stdio.h +++ b/lib/isc/include/isc/stdio.h @@ -26,11 +26,8 @@ #include -#include #include -ISC_LANG_BEGINDECLS - /*% Open */ isc_result_t isc_stdio_open(const char *filename, const char *mode, FILE **fp); @@ -67,5 +64,3 @@ isc_stdio_sync(FILE *f); * equivalent system-dependent operation. Note that this function has no * direct counterpart in the stdio library. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/stdtime.h b/lib/isc/include/isc/stdtime.h index 59cd058b5c..338b36b3ed 100644 --- a/lib/isc/include/isc/stdtime.h +++ b/lib/isc/include/isc/stdtime.h @@ -18,7 +18,6 @@ #include #include -#include #include /*% @@ -28,8 +27,6 @@ */ typedef uint32_t isc_stdtime_t; -ISC_LANG_BEGINDECLS - isc_stdtime_t isc_stdtime_now(void); /*%< @@ -49,5 +46,3 @@ isc_stdtime_tostring(isc_stdtime_t t, char *out, size_t outlen); * 'out' is a valid pointer. * 'outlen' is at least 26. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h index fbf6129cbe..9b8381f72b 100644 --- a/lib/isc/include/isc/string.h +++ b/lib/isc/include/isc/string.h @@ -17,10 +17,6 @@ #include -#include - -ISC_LANG_BEGINDECLS - #if !defined(HAVE_STRLCPY) size_t strlcpy(char *dst, const char *src, size_t size); @@ -38,5 +34,3 @@ strnstr(const char *s, const char *find, size_t slen); int isc_string_strerror_r(int errnum, char *buf, size_t buflen); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h index 2be3a8b5b1..3cc9b9b0cc 100644 --- a/lib/isc/include/isc/symtab.h +++ b/lib/isc/include/isc/symtab.h @@ -80,7 +80,6 @@ #include -#include #include /* @@ -103,8 +102,6 @@ typedef enum { isc_symexists_add = 2 /*%< Add the new tuple */ } isc_symexists_t; -ISC_LANG_BEGINDECLS - /*% Create a symbol table. */ isc_result_t isc_symtab_create(isc_mem_t *mctx, unsigned int size, @@ -132,4 +129,3 @@ isc_symtab_undefine(isc_symtab_t *symtab, const char *key, unsigned int type); /*% Return the number of items in a symbol table. */ unsigned int isc_symtab_count(isc_symtab_t *symtab); -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/syslog.h b/lib/isc/include/isc/syslog.h index 021f7fa596..bc1432eedb 100644 --- a/lib/isc/include/isc/syslog.h +++ b/lib/isc/include/isc/syslog.h @@ -15,11 +15,8 @@ /*! \file */ -#include #include -ISC_LANG_BEGINDECLS - isc_result_t isc_syslog_facilityfromstring(const char *str, int *facilityp); /*%< @@ -34,5 +31,3 @@ isc_syslog_facilityfromstring(const char *str, int *facilityp); * \li #ISC_R_SUCCESS * \li #ISC_R_NOTFOUND */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/thread.h b/lib/isc/include/isc/thread.h index 8920ca2f19..17c0fff9b1 100644 --- a/lib/isc/include/isc/thread.h +++ b/lib/isc/include/isc/thread.h @@ -27,11 +27,8 @@ #include #endif /* if defined(HAVE_PTHREAD_NP_H) */ -#include #include -ISC_LANG_BEGINDECLS - typedef pthread_t isc_thread_t; typedef void *(*isc_threadfunc_t)(void *); @@ -55,5 +52,3 @@ void isc_thread_setname(isc_thread_t thread, const char *name); #define isc_thread_self (uintptr_t)pthread_self - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/tid.h b/lib/isc/include/isc/tid.h index 8100237031..318d09a6fd 100644 --- a/lib/isc/include/isc/tid.h +++ b/lib/isc/include/isc/tid.h @@ -15,11 +15,8 @@ #include -#include #include -ISC_LANG_BEGINDECLS - #define ISC_TID_UNKNOWN UINT32_MAX uint32_t @@ -45,5 +42,3 @@ isc__tid_init(uint32_t tid); void isc__tid_initcount(uint32_t count); - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/time.h b/lib/isc/include/isc/time.h index f08cd2e112..0ba40129fa 100644 --- a/lib/isc/include/isc/time.h +++ b/lib/isc/include/isc/time.h @@ -19,7 +19,6 @@ #include #include -#include #include /* @@ -45,8 +44,6 @@ ISC_CONSTEXPR unsigned int NS_PER_SEC = 1000 * 1000 * 1000; #define isc_interval_zero isc_time_epoch #define isc_interval_t isc_time_t -ISC_LANG_BEGINDECLS - #define isc_interval_set(i, seconds, nanoseconds) \ isc_time_set((isc_time_t *)i, seconds, nanoseconds) /*%< @@ -478,5 +475,3 @@ isc_time_formatshorttimestamp(const isc_time_t *t, char *buf, unsigned int len); *\li 'buf' points to an array of at least len chars * */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h index 0c0cf1a8d6..9d1e95a1d1 100644 --- a/lib/isc/include/isc/timer.h +++ b/lib/isc/include/isc/timer.h @@ -56,12 +56,9 @@ #include #include -#include #include #include -ISC_LANG_BEGINDECLS - /*** *** Types ***/ @@ -155,5 +152,3 @@ isc_timer_destroy(isc_timer_t **timerp); * *\li *timerp is NULL. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/tm.h b/lib/isc/include/isc/tm.h index 58feec441f..66140aedf0 100644 --- a/lib/isc/include/isc/tm.h +++ b/lib/isc/include/isc/tm.h @@ -18,11 +18,8 @@ */ #include -#include #include -ISC_LANG_BEGINDECLS - time_t isc_tm_timegm(struct tm *tm); /* @@ -35,5 +32,3 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm); /* * Parse a formatted date string into struct tm. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/utf8.h b/lib/isc/include/isc/utf8.h index 5643c5de55..c44f97b829 100644 --- a/lib/isc/include/isc/utf8.h +++ b/lib/isc/include/isc/utf8.h @@ -15,11 +15,8 @@ #pragma once -#include #include -ISC_LANG_BEGINDECLS - bool isc_utf8_bom(const unsigned char *buf, size_t len); /*< @@ -39,5 +36,3 @@ isc_utf8_valid(const unsigned char *buf, size_t len); * Requires: *\li 'buf' != NULL */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/work.h b/lib/isc/include/isc/work.h index df196e95ea..d986b2e709 100644 --- a/lib/isc/include/isc/work.h +++ b/lib/isc/include/isc/work.h @@ -15,15 +15,12 @@ #include -#include #include typedef void (*isc_work_cb)(void *arg); typedef void (*isc_after_work_cb)(void *arg); typedef struct isc_work isc_work_t; -ISC_LANG_BEGINDECLS - void isc_work_enqueue(isc_loop_t *loop, isc_work_cb work_cb, isc_after_work_cb after_work_cb, void *cbarg); @@ -37,5 +34,3 @@ isc_work_enqueue(isc_loop_t *loop, isc_work_cb work_cb, * \li 'loop' is a valid event loop. * \li 'work_cb' and 'after_work_cb' are not NULL. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isc/loop_p.h b/lib/isc/loop_p.h index a822004e88..6bfdcdf187 100644 --- a/lib/isc/loop_p.h +++ b/lib/isc/loop_p.h @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/lib/isc/tid.c b/lib/isc/tid.c index 6979f0cf66..2f4788189e 100644 --- a/lib/isc/tid.c +++ b/lib/isc/tid.c @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/lib/isccc/include/isccc/alist.h b/lib/isccc/include/isccc/alist.h index dc7004434f..d6927516f0 100644 --- a/lib/isccc/include/isccc/alist.h +++ b/lib/isccc/include/isccc/alist.h @@ -34,12 +34,8 @@ #include #include -#include - #include -ISC_LANG_BEGINDECLS - isccc_sexpr_t * isccc_alist_create(void); @@ -82,5 +78,3 @@ isccc_alist_lookupbinary(isccc_sexpr_t *alist, const char *key, void isccc_alist_prettyprint(isccc_sexpr_t *sexpr, unsigned int indent, FILE *stream); - -ISC_LANG_ENDDECLS diff --git a/lib/isccc/include/isccc/base64.h b/lib/isccc/include/isccc/base64.h index 641dd4e003..192e1f679d 100644 --- a/lib/isccc/include/isccc/base64.h +++ b/lib/isccc/include/isccc/base64.h @@ -31,12 +31,8 @@ /*! \file isccc/base64.h */ -#include - #include -ISC_LANG_BEGINDECLS - /*** *** Functions ***/ @@ -75,5 +71,3 @@ isccc_base64_decode(const char *cstr, isccc_region_t *target); *\li #ISC_R_BADBASE64 -- 'cstr' is not a valid base64 encoding. *\li #ISC_R_NOSPACE -- 'target' is not big enough. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h index 20fe17b7db..edf89df041 100644 --- a/lib/isccc/include/isccc/cc.h +++ b/lib/isccc/include/isccc/cc.h @@ -35,14 +35,11 @@ #include #include -#include #include #include -ISC_LANG_BEGINDECLS - /*% * The HMAC algorithms supported by isccc_cc_fromwire and * isccc_cc_towire as implemented in DST. @@ -128,5 +125,3 @@ isccc_cc_cleansymtab(isccc_symtab_t *symtab, isccc_time_t now); isc_result_t isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message, isccc_time_t now); - -ISC_LANG_ENDDECLS diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h index 07ca331f1e..75a10070ea 100644 --- a/lib/isccc/include/isccc/ccmsg.h +++ b/lib/isccc/include/isccc/ccmsg.h @@ -34,7 +34,6 @@ #include #include -#include #include #include @@ -55,8 +54,6 @@ typedef struct isccc_ccmsg { void *send_cbarg; } isccc_ccmsg_t; -ISC_LANG_BEGINDECLS - void isccc_ccmsg_init(isc_mem_t *mctx, isc_nmhandle_t *handle, isccc_ccmsg_t *ccmsg); /*% @@ -141,5 +138,3 @@ isccc_ccmsg_invalidate(isccc_ccmsg_t *ccmsg); void isccc_ccmsg_toregion(isccc_ccmsg_t *ccmsg, isccc_region_t *ccregion); - -ISC_LANG_ENDDECLS diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h index 133d06d869..0e96172b4d 100644 --- a/lib/isccc/include/isccc/sexpr.h +++ b/lib/isccc/include/isccc/sexpr.h @@ -34,12 +34,8 @@ #include #include -#include - #include -ISC_LANG_BEGINDECLS - /*% dotted pair structure */ struct isccc_dottedpair { isccc_sexpr_t *car; @@ -115,5 +111,3 @@ isccc_sexpr_tostring(isccc_sexpr_t *sexpr); isccc_region_t * isccc_sexpr_tobinary(isccc_sexpr_t *sexpr); - -ISC_LANG_ENDDECLS diff --git a/lib/isccc/include/isccc/symtab.h b/lib/isccc/include/isccc/symtab.h index a156c061b7..96dc9429fe 100644 --- a/lib/isccc/include/isccc/symtab.h +++ b/lib/isccc/include/isccc/symtab.h @@ -75,8 +75,6 @@ #include -#include - #include /*** @@ -103,8 +101,6 @@ typedef enum { isccc_symexists_add = 2 } isccc_symexists_t; -ISC_LANG_BEGINDECLS - isc_result_t isccc_symtab_create(unsigned int size, isccc_symtabundefaction_t undefine_action, @@ -129,5 +125,3 @@ isccc_symtab_undefine(isccc_symtab_t *symtab, const char *key, void isccc_symtab_foreach(isccc_symtab_t *symtab, isccc_symtabforeachaction_t action, void *arg); - -ISC_LANG_ENDDECLS diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h index f40cbb60ed..ad99e2452b 100644 --- a/lib/isccfg/include/isccfg/aclconf.h +++ b/lib/isccfg/include/isccfg/aclconf.h @@ -15,8 +15,6 @@ #include -#include - #include #include @@ -35,8 +33,6 @@ typedef struct cfg_aclconfctx { *** Functions ***/ -ISC_LANG_BEGINDECLS - isc_result_t cfg_aclconfctx_create(isc_mem_t *mctx, cfg_aclconfctx_t **ret); /* @@ -76,5 +72,3 @@ cfg_acl_fromconfig(const cfg_obj_t *caml, const cfg_obj_t *cctx, * 'ctx' to be non NULL. * '*target' to be NULL or a valid dns_acl_t. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h index 537f8073ca..5a43e36e31 100644 --- a/lib/isccfg/include/isccfg/cfg.h +++ b/lib/isccfg/include/isccfg/cfg.h @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -78,8 +77,6 @@ typedef isc_result_t (*cfg_parsecallback_t)(const char *clausename, *** Functions ***/ -ISC_LANG_BEGINDECLS - void cfg_parser_attach(cfg_parser_t *src, cfg_parser_t **dest); /*%< @@ -623,5 +620,3 @@ cfg_pluginlist_foreach(const cfg_obj_t *config, const cfg_obj_t *list, * 'list' * \li first 'callback' return value which was not #ISC_R_SUCCESS otherwise */ - -ISC_LANG_ENDDECLS diff --git a/lib/isccfg/include/isccfg/check.h b/lib/isccfg/include/isccfg/check.h index 053ed3e995..c4e5d2b3a2 100644 --- a/lib/isccfg/include/isccfg/check.h +++ b/lib/isccfg/include/isccfg/check.h @@ -15,7 +15,6 @@ /*! \file isccfg/check.h */ -#include #include #include @@ -42,8 +41,6 @@ * supported by the crypto provider. */ -ISC_LANG_BEGINDECLS - isc_result_t isccfg_check_namedconf(const cfg_obj_t *config, unsigned int flags, isc_mem_t *mctx); @@ -69,5 +66,3 @@ isccfg_check_key(const cfg_obj_t *config); /*%< * Same as isccfg_check_namedconf(), but for a single 'key' statement. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isccfg/include/isccfg/duration.h b/lib/isccfg/include/isccfg/duration.h index bd0c35bad8..44012b4a1a 100644 --- a/lib/isccfg/include/isccfg/duration.h +++ b/lib/isccfg/include/isccfg/duration.h @@ -19,11 +19,8 @@ #include #include -#include #include -ISC_LANG_BEGINDECLS - #define CFG_DURATION_MAXLEN 80 /*% @@ -83,5 +80,3 @@ isccfg_duration_toseconds(const isccfg_duration_t *duration); * Returns: *\li The duration in seconds. */ - -ISC_LANG_ENDDECLS diff --git a/lib/isccfg/include/isccfg/kaspconf.h b/lib/isccfg/include/isccfg/kaspconf.h index d717998ba0..1818ef3199 100644 --- a/lib/isccfg/include/isccfg/kaspconf.h +++ b/lib/isccfg/include/isccfg/kaspconf.h @@ -13,16 +13,12 @@ #pragma once -#include - #include /*** *** Functions ***/ -ISC_LANG_BEGINDECLS - isc_result_t cfg_kasp_fromconfig(const cfg_obj_t *config, dns_kasp_t *default_kasp, bool check_algorithms, isc_mem_t *mctx, @@ -87,5 +83,3 @@ cfg_keystore_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, * *\li Other errors are possible. */ - -ISC_LANG_ENDDECLS diff --git a/util/check-includes.pl b/util/check-includes.pl index d2ffe3cbf2..3f15a0701c 100644 --- a/util/check-includes.pl +++ b/util/check-includes.pl @@ -81,11 +81,6 @@ for (<>) { # check use of macros without having included proper header for them. - if (/^(\Uisc\E_LANG_(BEGIN|END)DECLS)$/m && - ! m%^#include $%m) { - print "$file has $1 without \n"; - } - if (/$nocomment.*ISC_EVENTCLASS_/m && ! m%^#include %m) { print "$file has ISC_EVENTCLASS_ without \n" unless $file =~ m%isc/eventclass.h%; @@ -104,11 +99,6 @@ for (<>) { unless $file =~ m%\L$1\E/result.h%m; } - if (/^$nocomment(?!#define)[a-z].*([a-zA-Z0-9]\([^;]*\);)/m && - ! m%^#include %m) { - print "$file has declarations without \n"; - } - # # First see whether it can be compiled without any additional includes. # Only bother doing this for files that will be installed as public @@ -181,19 +171,6 @@ for (<>) { } } - if ($elided eq "") { - if (! /^\Uisc\E_LANG_BEGINDECLS$/m) { - print "$file includes but " . - "has no \Uisc\E_LANG_BEGINDECLS\n"; - } elsif (! /^\Uisc\E_LANG_ENDDECLS$/m) { - print "$file has \Uisc\E_LANG_BEGINDECLS but " . - "has no \Uisc\E_LANG_ENDDECLS\n"; - } elsif (! /^$nocomment(?!#define)[a-z].*([a-zA-Z0-9]\()/m) { - print "$file has apparently not function declarations\n"; - } - next; - } - if ($elided eq "") { if (! /$nocomment.*ISC_EVENTCLASS_/m) { print "$file has without ISC_EVENTCLASS_\n";