From: Ondřej Surý Date: Tue, 5 Oct 2021 14:49:47 +0000 (+0200) Subject: Use #pragma once as header guards X-Git-Tag: v9.17.20~52^2~2 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=f3635bcc146d98efe47ced6bd2b28e5823459be4;p=thirdparty%2Fbind9.git Use #pragma once as header guards Unify the header guard style and replace the inconsistent include guards with #pragma once. The #pragma once is widely and very well supported in all compilers that BIND 9 supports, and #pragma once was already in use in several new or refactored headers. Using simpler method will also allow us to automate header guard checks as this is simpler to programatically check. For reference, here are the reasons for the change taken from Wikipedia[1]: > In the C and C++ programming languages, #pragma once is a non-standard > but widely supported preprocessor directive designed to cause the > current source file to be included only once in a single compilation. > > Thus, #pragma once serves the same purpose as include guards, but with > several advantages, including: less code, avoidance of name clashes, > and sometimes improvement in compilation speed. On the other hand, > #pragma once is not necessarily available in all compilers and its > implementation is tricky and might not always be reliable. 1. https://en.wikipedia.org/wiki/Pragma_once --- diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h index 6e9e483f54c..ad316998810 100644 --- a/bin/check/check-tool.h +++ b/bin/check/check-tool.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef CHECK_TOOL_H -#define CHECK_TOOL_H +#pragma once /*! \file */ @@ -49,5 +48,3 @@ extern bool dochecksrv; extern dns_zoneopt_t zone_options; ISC_LANG_ENDDECLS - -#endif /* ifndef CHECK_TOOL_H */ diff --git a/bin/confgen/include/confgen/os.h b/bin/confgen/include/confgen/os.h index acb50ae7180..9d5c98b4db4 100644 --- a/bin/confgen/include/confgen/os.h +++ b/bin/confgen/include/confgen/os.h @@ -11,8 +11,7 @@ /*! \file */ -#ifndef RNDC_OS_H -#define RNDC_OS_H 1 +#pragma once #include @@ -30,5 +29,3 @@ set_user(FILE *fd, const char *user); */ ISC_LANG_ENDDECLS - -#endif /* ifndef RNDC_OS_H */ diff --git a/bin/confgen/keygen.h b/bin/confgen/keygen.h index c9bc05b1701..d0e5ae3026c 100644 --- a/bin/confgen/keygen.h +++ b/bin/confgen/keygen.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef RNDC_KEYGEN_H -#define RNDC_KEYGEN_H 1 +#pragma once /*! \file */ @@ -38,5 +37,3 @@ int alg_bits(dns_secalg_t alg); ISC_LANG_ENDDECLS - -#endif /* RNDC_KEYGEN_H */ diff --git a/bin/confgen/util.h b/bin/confgen/util.h index f5479438afa..01598900e96 100644 --- a/bin/confgen/util.h +++ b/bin/confgen/util.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef RNDC_UTIL_H -#define RNDC_UTIL_H 1 +#pragma once /*! \file */ @@ -39,5 +38,3 @@ ISC_NORETURN void fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); ISC_LANG_ENDDECLS - -#endif /* RNDC_UTIL_H */ diff --git a/bin/dig/dighost.h b/bin/dig/dighost.h index 4486e61d53c..b808b92c704 100644 --- a/bin/dig/dighost.h +++ b/bin/dig/dighost.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DIG_H -#define DIG_H +#pragma once /*! \file */ @@ -446,5 +445,3 @@ void dig_shutdown(void); ISC_LANG_ENDDECLS - -#endif /* ifndef DIG_H */ diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h index d8825f2a7a8..7694f362c0e 100644 --- a/bin/dnssec/dnssectool.h +++ b/bin/dnssec/dnssectool.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNSSECTOOL_H -#define DNSSECTOOL_H 1 +#pragma once #include #include @@ -105,5 +104,3 @@ key_collision(dst_key_t *key, dns_name_t *name, const char *dir, bool isoptarg(const char *arg, char **argv, void (*usage)(void)); - -#endif /* DNSSEC_DNSSECTOOL_H */ diff --git a/bin/named/include/dlz/dlz_dlopen_driver.h b/bin/named/include/dlz/dlz_dlopen_driver.h index b60f1637479..ebe2bbe6919 100644 --- a/bin/named/include/dlz/dlz_dlopen_driver.h +++ b/bin/named/include/dlz/dlz_dlopen_driver.h @@ -9,12 +9,10 @@ * information regarding copyright ownership. */ -#ifndef DLZ_DLOPEN_DRIVER_H -#define DLZ_DLOPEN_DRIVER_H +#pragma once isc_result_t dlz_dlopen_init(isc_mem_t *mctx); void dlz_dlopen_clear(void); -#endif /* ifndef DLZ_DLOPEN_DRIVER_H */ diff --git a/bin/named/include/named/builtin.h b/bin/named/include/named/builtin.h index a05371e5e5c..880c1ff4550 100644 --- a/bin/named/include/named/builtin.h +++ b/bin/named/include/named/builtin.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_BUILTIN_H -#define NAMED_BUILTIN_H 1 +#pragma once /*! \file */ @@ -21,5 +20,3 @@ named_builtin_init(void); void named_builtin_deinit(void); - -#endif /* NAMED_BUILTIN_H */ diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h index 7c48ff0bb79..0ed3a408165 100644 --- a/bin/named/include/named/config.h +++ b/bin/named/include/named/config.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_CONFIG_H -#define NAMED_CONFIG_H 1 +#pragma once /*! \file */ @@ -80,5 +79,3 @@ named_config_getkeyalgorithm2(const char *str, const dns_name_t **name, isc_result_t named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp); - -#endif /* NAMED_CONFIG_H */ diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h index 8c009d5c56d..0de2ebd7bd4 100644 --- a/bin/named/include/named/control.h +++ b/bin/named/include/named/control.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_CONTROL_H -#define NAMED_CONTROL_H 1 +#pragma once /*! \file * \brief @@ -105,5 +104,3 @@ named_controls_shutdown(named_controls_t *controls); isc_result_t named_control_docommand(isccc_sexpr_t *message, bool readonly, isc_buffer_t **text); - -#endif /* NAMED_CONTROL_H */ diff --git a/bin/named/include/named/fuzz.h b/bin/named/include/named/fuzz.h index 4284cab9047..272ec143b81 100644 --- a/bin/named/include/named/fuzz.h +++ b/bin/named/include/named/fuzz.h @@ -11,13 +11,10 @@ #include -#ifndef NAMED_FUZZ_H -#define NAMED_FUZZ_H +#pragma once void named_fuzz_notify(void); void named_fuzz_setup(void); - -#endif /* NAMED_FUZZ_H */ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h index 45cb118c367..b7798265dbe 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_GLOBALS_H -#define NAMED_GLOBALS_H 1 +#pragma once /*! \file */ @@ -162,5 +161,3 @@ EXTERN dns_acl_t *named_g_mapped INIT(NULL); #undef EXTERN #undef INIT - -#endif /* NAMED_GLOBALS_H */ diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h index cf43d1c47c7..3b1767c5067 100644 --- a/bin/named/include/named/log.h +++ b/bin/named/include/named/log.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_LOG_H -#define NAMED_LOG_H 1 +#pragma once /*! \file */ @@ -73,5 +72,3 @@ named_log_setunmatchedcategory(isc_logconfig_t *lcfg); void named_log_shutdown(void); - -#endif /* NAMED_LOG_H */ diff --git a/bin/named/include/named/logconf.h b/bin/named/include/named/logconf.h index 216a882f581..0902e2c4535 100644 --- a/bin/named/include/named/logconf.h +++ b/bin/named/include/named/logconf.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_LOGCONF_H -#define NAMED_LOGCONF_H 1 +#pragma once /*! \file */ @@ -22,5 +21,3 @@ named_logconfig(isc_logconfig_t *logconf, const cfg_obj_t *logstmt); * Set up the logging configuration in '*logconf' according to * the named.conf data in 'logstmt'. */ - -#endif /* NAMED_LOGCONF_H */ diff --git a/bin/named/include/named/os.h b/bin/named/include/named/os.h index 3ae48adc24e..cc800e20180 100644 --- a/bin/named/include/named/os.h +++ b/bin/named/include/named/os.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_OS_H -#define NAMED_OS_H 1 +#pragma once /*! \file */ @@ -75,5 +74,3 @@ named_os_started(void); const char * named_os_uname(void); - -#endif /* NAMED_OS_H */ diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index 99bcc6fe001..089145c29c1 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_SERVER_H -#define NAMED_SERVER_H 1 +#pragma once /*! \file */ @@ -389,5 +388,3 @@ named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text); isc_result_t named_server_servestale(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text); - -#endif /* NAMED_SERVER_H */ diff --git a/bin/named/include/named/smf_globals.h b/bin/named/include/named/smf_globals.h index 850f6d3c916..bb639f9b659 100644 --- a/bin/named/include/named/smf_globals.h +++ b/bin/named/include/named/smf_globals.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_SMF_GLOBALS_H -#define NAMED_SMF_GLOBALS_H 1 +#pragma once #include @@ -35,5 +34,3 @@ named_smf_get_instance(char **name, int debug, isc_mem_t *mctx); #undef EXTERN #undef INIT - -#endif /* NAMED_SMF_GLOBALS_H */ diff --git a/bin/named/include/named/statschannel.h b/bin/named/include/named/statschannel.h index 9779d336d88..bea8f501983 100644 --- a/bin/named/include/named/statschannel.h +++ b/bin/named/include/named/statschannel.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_STATSCHANNEL_H -#define NAMED_STATSCHANNEL_H 1 +#pragma once /*! \file * \brief @@ -48,5 +47,3 @@ named_stats_dump(named_server_t *server, FILE *fp); /*%< * Dump statistics counters managed by the server to the file fp. */ - -#endif /* NAMED_STATSCHANNEL_H */ diff --git a/bin/named/include/named/tkeyconf.h b/bin/named/include/named/tkeyconf.h index 968b09dd708..64ef91d3792 100644 --- a/bin/named/include/named/tkeyconf.h +++ b/bin/named/include/named/tkeyconf.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_TKEYCONF_H -#define NAMED_TKEYCONF_H 1 +#pragma once /*! \file */ @@ -40,5 +39,3 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, */ ISC_LANG_ENDDECLS - -#endif /* NAMED_TKEYCONF_H */ diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h index 27edf48c8c1..a016e571a1f 100644 --- a/bin/named/include/named/tsigconf.h +++ b/bin/named/include/named/tsigconf.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_TSIGCONF_H -#define NAMED_TSIGCONF_H 1 +#pragma once /*! \file */ @@ -38,5 +37,3 @@ named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, */ ISC_LANG_ENDDECLS - -#endif /* NAMED_TSIGCONF_H */ diff --git a/bin/named/include/named/types.h b/bin/named/include/named/types.h index e7c4296dd90..bc6f66753df 100644 --- a/bin/named/include/named/types.h +++ b/bin/named/include/named/types.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_TYPES_H -#define NAMED_TYPES_H 1 +#pragma once /*! \file */ @@ -35,5 +34,3 @@ typedef enum { NAMED_RELOAD_IN_PROGRESS, NAMED_RELOAD_FAILED, } named_reload_t; - -#endif /* NAMED_TYPES_H */ diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h index fadb3e1f38d..8dbc14a2315 100644 --- a/bin/named/include/named/zoneconf.h +++ b/bin/named/include/named/zoneconf.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NAMED_ZONECONF_H -#define NAMED_ZONECONF_H 1 +#pragma once /*! \file */ @@ -77,5 +76,3 @@ named_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, */ ISC_LANG_ENDDECLS - -#endif /* NAMED_ZONECONF_H */ diff --git a/bin/rndc/util.h b/bin/rndc/util.h index f5479438afa..01598900e96 100644 --- a/bin/rndc/util.h +++ b/bin/rndc/util.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef RNDC_UTIL_H -#define RNDC_UTIL_H 1 +#pragma once /*! \file */ @@ -39,5 +38,3 @@ ISC_NORETURN void fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); ISC_LANG_ENDDECLS - -#endif /* RNDC_UTIL_H */ diff --git a/bin/tests/system/dyndb/driver/instance.h b/bin/tests/system/dyndb/driver/instance.h index d91f5b11392..31a5a4c497f 100644 --- a/bin/tests/system/dyndb/driver/instance.h +++ b/bin/tests/system/dyndb/driver/instance.h @@ -4,8 +4,7 @@ * Copyright (C) 2009-2015 Red Hat ; see COPYRIGHT for license */ -#ifndef _LD_INSTANCE_H_ -#define _LD_INSTANCE_H_ +#pragma once #include @@ -45,5 +44,3 @@ load_sample_instance_zones(sample_instance_t *inst); void destroy_sample_instance(sample_instance_t **sample_instp); - -#endif /* !_LD_INSTANCE_H_ */ diff --git a/bin/tests/system/dyndb/driver/lock.h b/bin/tests/system/dyndb/driver/lock.h index 35c9c84e81b..6d9b0bd8a3b 100644 --- a/bin/tests/system/dyndb/driver/lock.h +++ b/bin/tests/system/dyndb/driver/lock.h @@ -2,8 +2,7 @@ * Copyright (C) 2014-2015 Red Hat ; see COPYRIGHT for license */ -#ifndef LOCK_H_ -#define LOCK_H_ +#pragma once #include "instance.h" #include "util.h" @@ -13,5 +12,3 @@ run_exclusive_enter(sample_instance_t *inst, isc_result_t *statep); void run_exclusive_exit(sample_instance_t *inst, isc_result_t state); - -#endif /* LOCK_H_ */ diff --git a/bin/tests/system/dyndb/driver/log.h b/bin/tests/system/dyndb/driver/log.h index e0d9e660174..ed25ede5774 100644 --- a/bin/tests/system/dyndb/driver/log.h +++ b/bin/tests/system/dyndb/driver/log.h @@ -2,8 +2,7 @@ * Copyright (C) 2009--2015 Red Hat ; see COPYRIGHT for license */ -#ifndef _LD_LOG_H_ -#define _LD_LOG_H_ +#pragma once #include #include @@ -21,5 +20,3 @@ void log_write(int level, const char *format, ...) ISC_FORMAT_PRINTF(2, 3); - -#endif /* !_LD_LOG_H_ */ diff --git a/bin/tests/system/dyndb/driver/util.h b/bin/tests/system/dyndb/driver/util.h index 5bc3b5058b3..c7e409e458c 100644 --- a/bin/tests/system/dyndb/driver/util.h +++ b/bin/tests/system/dyndb/driver/util.h @@ -4,8 +4,7 @@ * Copyright (C) 2009-2015 Red Hat ; see COPYRIGHT for license */ -#ifndef _LD_UTIL_H_ -#define _LD_UTIL_H_ +#pragma once #include @@ -54,5 +53,3 @@ #define MEM_PUT_AND_DETACH(target_ptr) \ isc_mem_putanddetach(&(target_ptr)->mctx, target_ptr, \ sizeof(*(target_ptr))) - -#endif /* !_LD_UTIL_H_ */ diff --git a/conftools/perllib/dnsconf/DNSConf-macros.h b/conftools/perllib/dnsconf/DNSConf-macros.h index 35d63ebe341..71dd27baf48 100644 --- a/conftools/perllib/dnsconf/DNSConf-macros.h +++ b/conftools/perllib/dnsconf/DNSConf-macros.h @@ -9,6 +9,8 @@ * information regarding copyright ownership. */ +#pragma once + #define CONCAT(a, b) a##b #define DNSCONF_SET_STRING(FIELD) \ void CONCAT(DNSConf_set, FIELD)(DNSConf * cfg, const char *arg) { \ diff --git a/contrib/dlz/modules/filesystem/dir.h b/contrib/dlz/modules/filesystem/dir.h index c8be683bfda..2d062646e15 100644 --- a/contrib/dlz/modules/filesystem/dir.h +++ b/contrib/dlz/modules/filesystem/dir.h @@ -14,6 +14,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#pragma once + #include #include diff --git a/contrib/dlz/modules/include/dlz_dbi.h b/contrib/dlz/modules/include/dlz_dbi.h index c4ce143718b..237dc08ecd1 100644 --- a/contrib/dlz/modules/include/dlz_dbi.h +++ b/contrib/dlz/modules/include/dlz_dbi.h @@ -39,8 +39,7 @@ #include #include -#ifndef DLZ_DBI_H -#define DLZ_DBI_H 1 +#pragma once /* * Types @@ -116,5 +115,3 @@ destroy_dbinstance(dbinstance_t *dbi); char * get_parameter_value(const char *input, const char *key); - -#endif /* DLZ_DBI_H */ diff --git a/contrib/dlz/modules/include/dlz_list.h b/contrib/dlz/modules/include/dlz_list.h index 74940d0254d..af1830f8749 100644 --- a/contrib/dlz/modules/include/dlz_list.h +++ b/contrib/dlz/modules/include/dlz_list.h @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef DLZ_LIST_H -#define DLZ_LIST_H 1 +#pragma once #define DLZ_LIST(type) \ struct { \ @@ -46,5 +45,3 @@ #define DLZ_LIST_PREV(elt, link) ((elt)->link.prev) #define DLZ_LIST_NEXT(elt, link) ((elt)->link.next) - -#endif /* DLZ_LIST_H */ diff --git a/contrib/dlz/modules/include/dlz_minimal.h b/contrib/dlz/modules/include/dlz_minimal.h index 4259039bd41..4e4760fe409 100644 --- a/contrib/dlz/modules/include/dlz_minimal.h +++ b/contrib/dlz/modules/include/dlz_minimal.h @@ -23,8 +23,7 @@ * tree. */ -#ifndef DLZ_MINIMAL_H -#define DLZ_MINIMAL_H 1 +#pragma once #include #include @@ -287,5 +286,3 @@ dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, isc_result_t dlz_delrdataset(const char *name, const char *type, void *dbdata, void *version); - -#endif /* DLZ_MINIMAL_H */ diff --git a/contrib/dlz/modules/include/dlz_pthread.h b/contrib/dlz/modules/include/dlz_pthread.h index fd8d5fe899a..08f4b5232f5 100644 --- a/contrib/dlz/modules/include/dlz_pthread.h +++ b/contrib/dlz/modules/include/dlz_pthread.h @@ -14,8 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifndef DLZ_PTHREAD_H -#define DLZ_PTHREAD_H 1 +#pragma once #ifndef PTHREADS #define PTHREADS 1 @@ -37,5 +36,3 @@ #define dlz_mutex_trylock(a) (0) #define dlz_mutex_unlock(a) (0) #endif /* ifdef PTHREADS */ - -#endif /* DLZ_PTHREAD_H */ diff --git a/contrib/dlz/modules/perl/dlz_perl_driver.h b/contrib/dlz/modules/perl/dlz_perl_driver.h index 1db8e2833db..3ffcacf984a 100644 --- a/contrib/dlz/modules/perl/dlz_perl_driver.h +++ b/contrib/dlz/modules/perl/dlz_perl_driver.h @@ -15,6 +15,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#pragma once + #include /* This is the only part that differs from dlz_minimal.h. */ diff --git a/fuzz/fuzz.h b/fuzz/fuzz.h index abbce372edc..796791209cb 100644 --- a/fuzz/fuzz.h +++ b/fuzz/fuzz.h @@ -9,6 +9,8 @@ * information regarding copyright ownership. */ +#pragma once + #include #include #include diff --git a/lib/bind9/include/bind9/check.h b/lib/bind9/include/bind9/check.h index 9e7318a813c..3d0b1183522 100644 --- a/lib/bind9/include/bind9/check.h +++ b/lib/bind9/include/bind9/check.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef BIND9_CHECK_H -#define BIND9_CHECK_H 1 +#pragma once /*! \file bind9/check.h */ @@ -60,5 +59,3 @@ bind9_check_key(const cfg_obj_t *config, isc_log_t *logctx); */ ISC_LANG_ENDDECLS - -#endif /* BIND9_CHECK_H */ diff --git a/lib/bind9/include/bind9/getaddresses.h b/lib/bind9/include/bind9/getaddresses.h index fff72839934..119964fd4c0 100644 --- a/lib/bind9/include/bind9/getaddresses.h +++ b/lib/bind9/include/bind9/getaddresses.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef BIND9_GETADDRESSES_H -#define BIND9_GETADDRESSES_H 1 +#pragma once /*! \file bind9/getaddresses.h */ @@ -48,5 +47,3 @@ bind9_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, */ ISC_LANG_ENDDECLS - -#endif /* BIND9_GETADDRESSES_H */ diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h index 34b06d4e021..e0ba4cdb410 100644 --- a/lib/dns/dst_openssl.h +++ b/lib/dns/dst_openssl.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DST_OPENSSL_H -#define DST_OPENSSL_H 1 +#pragma once #include #include @@ -67,6 +66,3 @@ dst__openssl_getengine(const char *engine); #endif /* if !defined(OPENSSL_NO_ENGINE) */ ISC_LANG_ENDDECLS - -#endif /* DST_OPENSSL_H */ -/*! \file */ diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h index dc7e312ca89..159eb758cc1 100644 --- a/lib/dns/dst_parse.h +++ b/lib/dns/dst_parse.h @@ -24,8 +24,7 @@ */ /*! \file */ -#ifndef DST_DST_PARSE_H -#define DST_DST_PARSE_H 1 +#pragma once #include @@ -126,5 +125,3 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, const char *directory); ISC_LANG_ENDDECLS - -#endif /* DST_DST_PARSE_H */ diff --git a/lib/dns/gen.h b/lib/dns/gen.h index 2db0a8820af..f5688a13bc4 100644 --- a/lib/dns/gen.h +++ b/lib/dns/gen.h @@ -22,8 +22,7 @@ * The dir stuff was shrunk to fit the needs of gen.c. */ -#ifndef DNS_GEN_UNIX_H -#define DNS_GEN_UNIX_H 1 +#pragma once #include #include @@ -100,5 +99,3 @@ end_directory(isc_dir_t *dir) { } ISC_LANG_ENDDECLS - -#endif /* DNS_GEN_UNIX_H */ diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h index a5f2e34e435..e122340d1be 100644 --- a/lib/dns/include/dns/acl.h +++ b/lib/dns/include/dns/acl.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ACL_H -#define DNS_ACL_H 1 +#pragma once /***** ***** Module Info @@ -272,5 +271,3 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, */ ISC_LANG_ENDDECLS - -#endif /* DNS_ACL_H */ diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index 635569f7a31..747930e3a03 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ADB_H -#define DNS_ADB_H 1 +#pragma once /***** ***** Module Info @@ -803,5 +802,3 @@ dns_adb_endudpfetch(dns_adb_t *adb, dns_adbaddrinfo_t *addr); */ ISC_LANG_ENDDECLS - -#endif /* DNS_ADB_H */ diff --git a/lib/dns/include/dns/badcache.h b/lib/dns/include/dns/badcache.h index 305588b0140..161beb8d854 100644 --- a/lib/dns/include/dns/badcache.h +++ b/lib/dns/include/dns/badcache.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_BADCACHE_H -#define DNS_BADCACHE_H 1 +#pragma once /***** ***** Module Info @@ -146,5 +145,3 @@ dns_badcache_print(dns_badcache_t *bc, const char *cachename, FILE *fp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_BADCACHE_H */ diff --git a/lib/dns/include/dns/bit.h b/lib/dns/include/dns/bit.h index 63da46243b2..c9e4adab5bd 100644 --- a/lib/dns/include/dns/bit.h +++ b/lib/dns/include/dns/bit.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_BIT_H -#define DNS_BIT_H 1 +#pragma once /*! \file dns/bit.h */ @@ -22,5 +21,3 @@ typedef uint64_t dns_bitset_t; #define DNS_BIT_CLEAR(bit, bitset) (*(bitset) &= ~((dns_bitset_t)1 << (bit))) #define DNS_BIT_CHECK(bit, bitset) \ ((*(bitset) & ((dns_bitset_t)1 << (bit))) == ((dns_bitset_t)1 << (bit))) - -#endif /* DNS_BIT_H */ diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h index 8d9998c2f86..738c368fd44 100644 --- a/lib/dns/include/dns/byaddr.h +++ b/lib/dns/include/dns/byaddr.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_BYADDR_H -#define DNS_BYADDR_H 1 +#pragma once /***** ***** Module Info @@ -146,5 +145,3 @@ dns_byaddr_createptrname(const isc_netaddr_t *address, unsigned int options, */ ISC_LANG_ENDDECLS - -#endif /* DNS_BYADDR_H */ diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h index 383eccf1897..3fbf653baef 100644 --- a/lib/dns/include/dns/cache.h +++ b/lib/dns/include/dns/cache.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_CACHE_H -#define DNS_CACHE_H 1 +#pragma once /***** ***** Module Info @@ -299,5 +298,3 @@ dns_cache_renderjson(dns_cache_t *cache, void *cstats0); #endif /* HAVE_JSON_C */ ISC_LANG_ENDDECLS - -#endif /* DNS_CACHE_H */ diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h index 5d9fbcf39b8..cb496c7d525 100644 --- a/lib/dns/include/dns/callbacks.h +++ b/lib/dns/include/dns/callbacks.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_CALLBACKS_H -#define DNS_CALLBACKS_H 1 +#pragma once /*! \file dns/callbacks.h */ @@ -90,5 +89,3 @@ dns_rdatacallbacks_init_stdio(dns_rdatacallbacks_t *callbacks); */ ISC_LANG_ENDDECLS - -#endif /* DNS_CALLBACKS_H */ diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h index f7183822250..54f57e4f71d 100644 --- a/lib/dns/include/dns/catz.h +++ b/lib/dns/include/dns/catz.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_CATZ_H -#define DNS_CATZ_H 1 +#pragma once #include #include @@ -470,5 +469,3 @@ dns_catz_get_iterator(dns_catz_zone_t *catz, isc_ht_iter_t **itp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_CATZ_H_ */ diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h index 588ee472973..21b3fe92b2d 100644 --- a/lib/dns/include/dns/cert.h +++ b/lib/dns/include/dns/cert.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_CERT_H -#define DNS_CERT_H 1 +#pragma once /*! \file dns/cert.h */ @@ -57,5 +56,3 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target); */ ISC_LANG_ENDDECLS - -#endif /* DNS_CERT_H */ diff --git a/lib/dns/include/dns/client.h b/lib/dns/include/dns/client.h index 9c3114dbd0a..037b33431d5 100644 --- a/lib/dns/include/dns/client.h +++ b/lib/dns/include/dns/client.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_CLIENT_H -#define DNS_CLIENT_H 1 +#pragma once /***** ***** Module Info @@ -290,5 +289,3 @@ dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, */ ISC_LANG_ENDDECLS - -#endif /* DNS_CLIENT_H */ diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h index 40615065277..c5788a08aa8 100644 --- a/lib/dns/include/dns/clientinfo.h +++ b/lib/dns/include/dns/clientinfo.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_CLIENTINFO_H -#define DNS_CLIENTINFO_H 1 +#pragma once /***** ***** Module Info @@ -77,5 +76,3 @@ void dns_clientinfo_init(dns_clientinfo_t *ci, void *data, void *versionp); ISC_LANG_ENDDECLS - -#endif /* DNS_CLIENTINFO_H */ diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h index dc17e143601..3be0cace180 100644 --- a/lib/dns/include/dns/compress.h +++ b/lib/dns/include/dns/compress.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_COMPRESS_H -#define DNS_COMPRESS_H 1 +#pragma once #include #include @@ -296,5 +295,3 @@ dns_decompress_type(dns_decompress_t *dctx); */ ISC_LANG_ENDDECLS - -#endif /* DNS_COMPRESS_H */ diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 5c9d1ed2479..4ed5a12778e 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DB_H -#define DNS_DB_H 1 +#pragma once /***** ***** Module Info @@ -1746,5 +1745,3 @@ dns_db_setgluecachestats(dns_db_t *db, isc_stats_t *stats); */ ISC_LANG_ENDDECLS - -#endif /* DNS_DB_H */ diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h index 7750a2f2514..63cb00ce336 100644 --- a/lib/dns/include/dns/dbiterator.h +++ b/lib/dns/include/dns/dbiterator.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DBITERATOR_H -#define DNS_DBITERATOR_H 1 +#pragma once /***** ***** Module Info @@ -287,5 +286,3 @@ dns_dbiterator_setcleanmode(dns_dbiterator_t *iterator, bool mode); */ ISC_LANG_ENDDECLS - -#endif /* DNS_DBITERATOR_H */ diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h index 39fb1a9c056..cbe25ef5155 100644 --- a/lib/dns/include/dns/diff.h +++ b/lib/dns/include/dns/diff.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DIFF_H -#define DNS_DIFF_H 1 +#pragma once /***** ***** Module Info @@ -276,5 +275,3 @@ dns_diff_print(dns_diff_t *diff, FILE *file); */ ISC_LANG_ENDDECLS - -#endif /* DNS_DIFF_H */ diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h index 549b74415f2..3a9d0e68fea 100644 --- a/lib/dns/include/dns/dlz.h +++ b/lib/dns/include/dns/dlz.h @@ -46,8 +46,7 @@ /*! \file dns/dlz.h */ -#ifndef DLZ_H -#define DLZ_H 1 +#pragma once /***** ***** Module Info @@ -330,5 +329,3 @@ dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, const dns_name_t *signer, */ ISC_LANG_ENDDECLS - -#endif /* DLZ_H */ diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h index 1066156e228..293645da385 100644 --- a/lib/dns/include/dns/dlz_dlopen.h +++ b/lib/dns/include/dns/dlz_dlopen.h @@ -11,8 +11,7 @@ /*! \file dns/dlz_dlopen.h */ -#ifndef DLZ_DLOPEN_H -#define DLZ_DLOPEN_H +#pragma once #include #include @@ -153,5 +152,3 @@ dlz_dlopen_delrdataset_t(const char *name, const char *type, void *dbdata, void *version); ISC_LANG_ENDDECLS - -#endif /* ifndef DLZ_DLOPEN_H */ diff --git a/lib/dns/include/dns/dns64.h b/lib/dns/include/dns/dns64.h index c1960f0031c..4a7facc382b 100644 --- a/lib/dns/include/dns/dns64.h +++ b/lib/dns/include/dns/dns64.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DNS64_H -#define DNS_DNS64_H 1 +#pragma once #include @@ -189,5 +188,3 @@ dns_dns64_findprefix(dns_rdataset_t *rdataset, isc_netprefix_t *prefix, */ ISC_LANG_ENDDECLS - -#endif /* DNS_DNS64_H */ diff --git a/lib/dns/include/dns/dnsrps.h b/lib/dns/include/dns/dnsrps.h index a9af86f3bb4..3e2144f856e 100644 --- a/lib/dns/include/dns/dnsrps.h +++ b/lib/dns/include/dns/dnsrps.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DNSRPS_H -#define DNS_DNSRPS_H +#pragma once #include #include @@ -109,5 +108,3 @@ dns_dnsrps_rewrite_init(librpz_emsg_t *emsg, dns_rpz_st_t *st, #endif /* USE_DNSRPS */ ISC_LANG_ENDDECLS - -#endif /* DNS_DNSRPS_H */ diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h index cd83a2a1f43..4126d7dbde8 100644 --- a/lib/dns/include/dns/dnssec.h +++ b/lib/dns/include/dns/dnssec.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DNSSEC_H -#define DNS_DNSSEC_H 1 +#pragma once /*! \file dns/dnssec.h */ @@ -392,5 +391,3 @@ dns_dnssec_matchdskey(dns_name_t *name, dns_rdata_t *dsrdata, *\li Other values indicate error */ ISC_LANG_ENDDECLS - -#endif /* DNS_DNSSEC_H */ diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h index 14e042c3c61..9facef6ab19 100644 --- a/lib/dns/include/dns/dnstap.h +++ b/lib/dns/include/dns/dnstap.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef _DNSTAP_H -#define _DNSTAP_H +#pragma once /***** ***** Module Info @@ -390,5 +389,3 @@ dns_dt_close(dns_dthandle_t **handlep); * *\li '*handlep' is not NULL */ - -#endif /* _DNSTAP_H */ diff --git a/lib/dns/include/dns/ds.h b/lib/dns/include/dns/ds.h index 0674413c3d2..009aa7f7111 100644 --- a/lib/dns/include/dns/ds.h +++ b/lib/dns/include/dns/ds.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DS_H -#define DNS_DS_H 1 +#pragma once #include @@ -62,5 +61,3 @@ dns_ds_buildrdata(dns_name_t *owner, dns_rdata_t *key, */ ISC_LANG_ENDDECLS - -#endif /* DNS_DS_H */ diff --git a/lib/dns/include/dns/dsdigest.h b/lib/dns/include/dns/dsdigest.h index 89750dab1ab..0d58c68f096 100644 --- a/lib/dns/include/dns/dsdigest.h +++ b/lib/dns/include/dns/dsdigest.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DSDIGEST_H -#define DNS_DSDIGEST_H 1 +#pragma once /*! \file dns/dsdigest.h */ @@ -66,5 +65,3 @@ dns_dsdigest_format(dns_dsdigest_t typ, char *cp, unsigned int size); */ ISC_LANG_ENDDECLS - -#endif /* DNS_DSDIGEST_H */ diff --git a/lib/dns/include/dns/dyndb.h b/lib/dns/include/dns/dyndb.h index 3291c1e3790..1db7a241ef4 100644 --- a/lib/dns/include/dns/dyndb.h +++ b/lib/dns/include/dns/dyndb.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_DYNDB_H -#define DNS_DYNDB_H +#pragma once #include @@ -156,5 +155,3 @@ dns_dyndb_destroyctx(dns_dyndbctx_t **dctxp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_DYNDB_H */ diff --git a/lib/dns/include/dns/ecs.h b/lib/dns/include/dns/ecs.h index 40f04ed70b7..f6d7fbecc8d 100644 --- a/lib/dns/include/dns/ecs.h +++ b/lib/dns/include/dns/ecs.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ECS_H -#define DNS_ECS_H 1 +#pragma once #include @@ -53,5 +52,3 @@ dns_ecs_format(dns_ecs_t *ecs, char *buf, size_t size); */ ISC_LANG_ENDDECLS - -#endif /* DNS_ECS_H */ diff --git a/lib/dns/include/dns/edns.h b/lib/dns/include/dns/edns.h index 0bae0b5aca1..c2a70931c27 100644 --- a/lib/dns/include/dns/edns.h +++ b/lib/dns/include/dns/edns.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_EDNS_H -#define DNS_EDNS_H 1 +#pragma once /*% * The maximum version on EDNS supported by this build. @@ -23,5 +22,3 @@ */ #define DNS_EDNS_VERSION 1 /* draft-andrews-edns1 */ #endif /* ifdef DRAFT_ANDREWS_EDNS1 */ - -#endif /* ifndef DNS_EDNS_H */ diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h index 32af3d954c4..58af42c4011 100644 --- a/lib/dns/include/dns/events.h +++ b/lib/dns/include/dns/events.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_EVENTS_H -#define DNS_EVENTS_H 1 +#pragma once #include @@ -84,5 +83,3 @@ #define DNS_EVENT_FIRSTEVENT (ISC_EVENTCLASS_DNS + 0) #define DNS_EVENT_LASTEVENT (ISC_EVENTCLASS_DNS + 65535) - -#endif /* DNS_EVENTS_H */ diff --git a/lib/dns/include/dns/fixedname.h b/lib/dns/include/dns/fixedname.h index e4f354aacc1..708baab0855 100644 --- a/lib/dns/include/dns/fixedname.h +++ b/lib/dns/include/dns/fixedname.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_FIXEDNAME_H -#define DNS_FIXEDNAME_H 1 +#pragma once /***** ***** Module Info @@ -79,5 +78,3 @@ dns_name_t * dns_fixedname_initname(dns_fixedname_t *fixed); ISC_LANG_ENDDECLS - -#endif /* DNS_FIXEDNAME_H */ diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h index 371c104993c..47d36570a9a 100644 --- a/lib/dns/include/dns/forward.h +++ b/lib/dns/include/dns/forward.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_FORWARD_H -#define DNS_FORWARD_H 1 +#pragma once /*! \file dns/forward.h */ @@ -118,5 +117,3 @@ dns_fwdtable_destroy(dns_fwdtable_t **fwdtablep); */ ISC_LANG_ENDDECLS - -#endif /* DNS_FORWARD_H */ diff --git a/lib/dns/include/dns/geoip.h b/lib/dns/include/dns/geoip.h index 45c9b9ea790..65822750c52 100644 --- a/lib/dns/include/dns/geoip.h +++ b/lib/dns/include/dns/geoip.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_GEOIP_H -#define DNS_GEOIP_H 1 +#pragma once /***** ***** Module Info @@ -108,5 +107,3 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, ISC_LANG_ENDDECLS #endif /* HAVE_GEOIP2 */ - -#endif /* DNS_GEOIP_H */ diff --git a/lib/dns/include/dns/ipkeylist.h b/lib/dns/include/dns/ipkeylist.h index 45af1af1c1c..614d9006780 100644 --- a/lib/dns/include/dns/ipkeylist.h +++ b/lib/dns/include/dns/ipkeylist.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_IPKEYLIST_H -#define DNS_IPKEYLIST_H 1 +#pragma once #include @@ -85,5 +84,3 @@ dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n); * \li #ISC_R_SUCCESS if success * \li #ISC_R_NOMEMORY if there's no memory, ipkeylist is left untouched */ - -#endif /* ifndef DNS_IPKEYLIST_H */ diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h index 86255e6bdc6..9723faf8f7d 100644 --- a/lib/dns/include/dns/iptable.h +++ b/lib/dns/include/dns/iptable.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_IPTABLE_H -#define DNS_IPTABLE_H 1 +#pragma once #include #include @@ -64,5 +63,3 @@ void dns_iptable_detach(dns_iptable_t **tabp); ISC_LANG_ENDDECLS - -#endif /* DNS_IPTABLE_H */ diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h index c2d86970200..9c6982675d4 100644 --- a/lib/dns/include/dns/journal.h +++ b/lib/dns/include/dns/journal.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_JOURNAL_H -#define DNS_JOURNAL_H 1 +#pragma once /***** ***** Module Info @@ -335,5 +334,3 @@ dns_journal_set_sourceserial(dns_journal_t *j, uint32_t sourceserial); */ ISC_LANG_ENDDECLS - -#endif /* DNS_JOURNAL_H */ diff --git a/lib/dns/include/dns/kasp.h b/lib/dns/include/dns/kasp.h index 84fed27c683..3103787151b 100644 --- a/lib/dns/include/dns/kasp.h +++ b/lib/dns/include/dns/kasp.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_KASP_H -#define DNS_KASP_H 1 +#pragma once /***** ***** Module Info @@ -711,5 +710,3 @@ dns_kasp_setnsec3param(dns_kasp_t *kasp, uint8_t iter, bool optout, */ ISC_LANG_ENDDECLS - -#endif /* DNS_KASP_H */ diff --git a/lib/dns/include/dns/keydata.h b/lib/dns/include/dns/keydata.h index 7fbac386394..c1bbe945898 100644 --- a/lib/dns/include/dns/keydata.h +++ b/lib/dns/include/dns/keydata.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_KEYDATA_H -#define DNS_KEYDATA_H 1 +#pragma once /***** ***** Module Info @@ -45,5 +44,3 @@ dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, isc_mem_t *mctx); ISC_LANG_ENDDECLS - -#endif /* DNS_KEYDATA_H */ diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h index e0a6b4e89d7..a7143cbe147 100644 --- a/lib/dns/include/dns/keyflags.h +++ b/lib/dns/include/dns/keyflags.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_KEYFLAGS_H -#define DNS_KEYFLAGS_H 1 +#pragma once /*! \file dns/keyflags.h */ @@ -42,5 +41,3 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source); */ ISC_LANG_ENDDECLS - -#endif /* DNS_KEYFLAGS_H */ diff --git a/lib/dns/include/dns/keymgr.h b/lib/dns/include/dns/keymgr.h index ae4ab5da135..e84b5a18b1f 100644 --- a/lib/dns/include/dns/keymgr.h +++ b/lib/dns/include/dns/keymgr.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_KEYMGR_H -#define DNS_KEYMGR_H 1 +#pragma once /*! \file dns/keymgr.h */ @@ -128,5 +127,3 @@ dns_keymgr_status(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring, */ ISC_LANG_ENDDECLS - -#endif /* DNS_KEYMGR_H */ diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h index dbb4f01a780..e2a3309c7dc 100644 --- a/lib/dns/include/dns/keytable.h +++ b/lib/dns/include/dns/keytable.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_KEYTABLE_H -#define DNS_KEYTABLE_H 1 +#pragma once /***** ***** Module Info @@ -344,5 +343,3 @@ dns_keytable_forall(dns_keytable_t *keytable, dns_name_t *, void *), void *arg); ISC_LANG_ENDDECLS - -#endif /* DNS_KEYTABLE_H */ diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h index db63d401504..eb1157def38 100644 --- a/lib/dns/include/dns/keyvalues.h +++ b/lib/dns/include/dns/keyvalues.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_KEYVALUES_H -#define DNS_KEYVALUES_H 1 +#pragma once /*! \file dns/keyvalues.h */ @@ -101,5 +100,3 @@ #define DNS_KEY_ED25519SIZE 32 #define DNS_KEY_ED448SIZE 57 - -#endif /* DNS_KEYVALUES_H */ diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h index 7ae95f31334..c6afa343796 100644 --- a/lib/dns/include/dns/librpz.h +++ b/lib/dns/include/dns/librpz.h @@ -32,8 +32,7 @@ * version 1.2.12 */ -#ifndef LIBRPZ_H -#define LIBRPZ_H +#pragma once #include #include @@ -950,5 +949,3 @@ librpz_lib_open(librpz_emsg_t *emsg, void **dl_handle, const char *path) { #endif /* LIBRPZ_LIB_OPEN */ } #endif /* LIBRPZ_LIB_OPEN */ - -#endif /* LIBRPZ_H */ diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index 9efd19d7dcc..9a0ea662593 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -12,8 +12,7 @@ /*! \file dns/log.h */ -#ifndef DNS_LOG_H -#define DNS_LOG_H 1 +#pragma once #include #include @@ -109,5 +108,3 @@ dns_log_setcontext(isc_log_t *lctx); */ ISC_LANG_ENDDECLS - -#endif /* DNS_LOG_H */ diff --git a/lib/dns/include/dns/lookup.h b/lib/dns/include/dns/lookup.h index 618c1b1791c..d1290467251 100644 --- a/lib/dns/include/dns/lookup.h +++ b/lib/dns/include/dns/lookup.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_LOOKUP_H -#define DNS_LOOKUP_H 1 +#pragma once /***** ***** Module Info @@ -125,5 +124,3 @@ dns_lookup_destroy(dns_lookup_t **lookupp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_LOOKUP_H */ diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index 4db7e37f667..11c45675044 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_MASTER_H -#define DNS_MASTER_H 1 +#pragma once /*! \file dns/master.h */ @@ -256,5 +255,3 @@ dns_master_initrawheader(dns_masterrawheader_t *header); * values to zero. */ ISC_LANG_ENDDECLS - -#endif /* DNS_MASTER_H */ diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h index 40aa6a4200a..0c1879b928a 100644 --- a/lib/dns/include/dns/masterdump.h +++ b/lib/dns/include/dns/masterdump.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_MASTERDUMP_H -#define DNS_MASTERDUMP_H 1 +#pragma once /*! \file dns/masterdump.h */ @@ -356,5 +355,3 @@ void dns_master_styledestroy(dns_master_style_t **style, isc_mem_t *mctx); ISC_LANG_ENDDECLS - -#endif /* DNS_MASTERDUMP_H */ diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 326bf76d765..66db60b78b7 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_NAME_H -#define DNS_NAME_H 1 +#pragma once /***** ***** Module Info @@ -1383,5 +1382,3 @@ ISC_LANG_ENDDECLS #define dns_name_split(n, l, p, s) DNS_NAME_SPLIT(n, l, p, s) #endif /* DNS_NAME_USEINLINE */ - -#endif /* DNS_NAME_H */ diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h index 160c28de962..8feadf0299b 100644 --- a/lib/dns/include/dns/ncache.h +++ b/lib/dns/include/dns/ncache.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_NCACHE_H -#define DNS_NCACHE_H 1 +#pragma once /***** ***** Module Info @@ -181,5 +180,3 @@ dns_ncache_current(dns_rdataset_t *ncacherdataset, dns_name_t *found, */ ISC_LANG_ENDDECLS - -#endif /* DNS_NCACHE_H */ diff --git a/lib/dns/include/dns/nsec.h b/lib/dns/include/dns/nsec.h index 8dc28f6914a..f6844cf82cb 100644 --- a/lib/dns/include/dns/nsec.h +++ b/lib/dns/include/dns/nsec.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_NSEC_H -#define DNS_NSEC_H 1 +#pragma once /*! \file dns/nsec.h */ @@ -108,5 +107,3 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, */ ISC_LANG_ENDDECLS - -#endif /* DNS_NSEC_H */ diff --git a/lib/dns/include/dns/nsec3.h b/lib/dns/include/dns/nsec3.h index bfcc81c0507..5a5cf20bbe1 100644 --- a/lib/dns/include/dns/nsec3.h +++ b/lib/dns/include/dns/nsec3.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_NSEC3_H -#define DNS_NSEC3_H 1 +#pragma once #include @@ -266,5 +265,3 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, dns_name_t *nearest, dns_nseclog_t logit, void *arg); ISC_LANG_ENDDECLS - -#endif /* DNS_NSEC3_H */ diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h index df5bf471303..94421b815fc 100644 --- a/lib/dns/include/dns/nta.h +++ b/lib/dns/include/dns/nta.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_NTA_H -#define DNS_NTA_H 1 +#pragma once /***** ***** Module Info @@ -206,5 +205,3 @@ dns_ntatable_shutdown(dns_ntatable_t *ntatable); */ ISC_LANG_ENDDECLS - -#endif /* DNS_NTA_H */ diff --git a/lib/dns/include/dns/opcode.h b/lib/dns/include/dns/opcode.h index e81f574bc88..2c99b92d9cc 100644 --- a/lib/dns/include/dns/opcode.h +++ b/lib/dns/include/dns/opcode.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_OPCODE_H -#define DNS_OPCODE_H 1 +#pragma once /*! \file dns/opcode.h */ @@ -40,5 +39,3 @@ dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target); */ ISC_LANG_ENDDECLS - -#endif /* DNS_OPCODE_H */ diff --git a/lib/dns/include/dns/order.h b/lib/dns/include/dns/order.h index 248f8abf1dd..2d48b197130 100644 --- a/lib/dns/include/dns/order.h +++ b/lib/dns/include/dns/order.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ORDER_H -#define DNS_ORDER_H 1 +#pragma once /*! \file dns/order.h */ @@ -87,5 +86,3 @@ dns_order_detach(dns_order_t **orderp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_ORDER_H */ diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h index 652afc02afa..facbf2dc230 100644 --- a/lib/dns/include/dns/peer.h +++ b/lib/dns/include/dns/peer.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_PEER_H -#define DNS_PEER_H 1 +#pragma once /***** ***** Module Info @@ -223,5 +222,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 - -#endif /* DNS_PEER_H */ diff --git a/lib/dns/include/dns/private.h b/lib/dns/include/dns/private.h index 62521a83602..84126c8c03e 100644 --- a/lib/dns/include/dns/private.h +++ b/lib/dns/include/dns/private.h @@ -17,8 +17,7 @@ #include #include -#ifndef DNS_PRIVATE_H -#define DNS_PRIVATE_H +#pragma once ISC_LANG_BEGINDECLS @@ -63,5 +62,3 @@ dns_private_totext(dns_rdata_t *privaterdata, isc_buffer_t *buffer); */ ISC_LANG_ENDDECLS - -#endif /* ifndef DNS_PRIVATE_H */ diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index 17fe783cf9a..26e26b59d9f 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RBT_H -#define DNS_RBT_H 1 +#pragma once /*! \file dns/rbt.h */ @@ -992,5 +991,3 @@ dns__rbtnode_namelen(dns_rbtnode_t *node); * and in unit tests. */ ISC_LANG_ENDDECLS - -#endif /* DNS_RBT_H */ diff --git a/lib/dns/include/dns/rcode.h b/lib/dns/include/dns/rcode.h index 93f3ed339d1..2866ca88d89 100644 --- a/lib/dns/include/dns/rcode.h +++ b/lib/dns/include/dns/rcode.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RCODE_H -#define DNS_RCODE_H 1 +#pragma once /*! \file dns/rcode.h */ @@ -104,5 +103,3 @@ dns_hashalg_fromtext(unsigned char *hashalg, isc_textregion_t *source); */ ISC_LANG_ENDDECLS - -#endif /* DNS_RCODE_H */ diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index d842b815430..8f579530da9 100644 --- a/lib/dns/include/dns/rdata.h +++ b/lib/dns/include/dns/rdata.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATA_H -#define DNS_RDATA_H 1 +#pragma once /***** ***** Module Info @@ -806,5 +805,3 @@ const char * dns_rdata_updateop(dns_rdata_t *rdata, dns_section_t section); ISC_LANG_ENDDECLS - -#endif /* DNS_RDATA_H */ diff --git a/lib/dns/include/dns/rdataclass.h b/lib/dns/include/dns/rdataclass.h index 254d9dd5cb7..9c7ddde79ab 100644 --- a/lib/dns/include/dns/rdataclass.h +++ b/lib/dns/include/dns/rdataclass.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATACLASS_H -#define DNS_RDATACLASS_H 1 +#pragma once /*! \file dns/rdataclass.h */ @@ -88,5 +87,3 @@ dns_rdataclass_format(dns_rdataclass_t rdclass, char *array, unsigned int size); */ ISC_LANG_ENDDECLS - -#endif /* DNS_RDATACLASS_H */ diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h index 9dc9a8db6fe..727300e33fb 100644 --- a/lib/dns/include/dns/rdatalist.h +++ b/lib/dns/include/dns/rdatalist.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATALIST_H -#define DNS_RDATALIST_H 1 +#pragma once /***** ***** Module Info @@ -117,5 +116,3 @@ dns_rdatalist_fromrdataset(dns_rdataset_t *rdataset, */ ISC_LANG_ENDDECLS - -#endif /* DNS_RDATALIST_H */ diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index d8c69fb00ae..f786501b794 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATASET_H -#define DNS_RDATASET_H 1 +#pragma once /***** ***** Module Info @@ -605,5 +604,3 @@ dns_trust_totext(dns_trust_t trust); */ ISC_LANG_ENDDECLS - -#endif /* DNS_RDATASET_H */ diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h index 8705dfc4c25..7c6fcea5d7a 100644 --- a/lib/dns/include/dns/rdatasetiter.h +++ b/lib/dns/include/dns/rdatasetiter.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATASETITER_H -#define DNS_RDATASETITER_H 1 +#pragma once /***** ***** Module Info @@ -157,5 +156,3 @@ dns_rdatasetiter_current(dns_rdatasetiter_t *iterator, */ ISC_LANG_ENDDECLS - -#endif /* DNS_RDATASETITER_H */ diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h index 5a22f099c3c..159a2e8903d 100644 --- a/lib/dns/include/dns/rdataslab.h +++ b/lib/dns/include/dns/rdataslab.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATASLAB_H -#define DNS_RDATASLAB_H 1 +#pragma once /*! \file dns/rdataslab.h * \brief @@ -167,5 +166,3 @@ dns_rdataslab_equalx(unsigned char *slab1, unsigned char *slab2, */ ISC_LANG_ENDDECLS - -#endif /* DNS_RDATASLAB_H */ diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h index 481ea82e9a0..44b088347f3 100644 --- a/lib/dns/include/dns/rdatatype.h +++ b/lib/dns/include/dns/rdatatype.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATATYPE_H -#define DNS_RDATATYPE_H 1 +#pragma once /*! \file dns/rdatatype.h */ @@ -91,5 +90,3 @@ dns_rdatatype_format(dns_rdatatype_t rdtype, char *array, unsigned int size); */ ISC_LANG_ENDDECLS - -#endif /* DNS_RDATATYPE_H */ diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h index 9554603b50b..fb555bfdbe1 100644 --- a/lib/dns/include/dns/request.h +++ b/lib/dns/include/dns/request.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_REQUEST_H -#define DNS_REQUEST_H 1 +#pragma once /***** ***** Module Info @@ -355,5 +354,3 @@ dns_request_destroy(dns_request_t **requestp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_REQUEST_H */ diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index 85d81c0c8a5..63edb077740 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RESOLVER_H -#define DNS_RESOLVER_H 1 +#pragma once /***** ***** Module Info @@ -736,5 +735,3 @@ dns_resolver_setfuzzing(void); #endif /* ifdef ENABLE_AFL */ ISC_LANG_ENDDECLS - -#endif /* DNS_RESOLVER_H */ diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h index a4dbc9cff62..e201799b9ae 100644 --- a/lib/dns/include/dns/result.h +++ b/lib/dns/include/dns/result.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RESULT_H -#define DNS_RESULT_H 1 +#pragma once /*! \file dns/result.h */ @@ -28,5 +27,3 @@ isc_result_t dns_result_fromrcode(dns_rcode_t rcode); ISC_LANG_ENDDECLS - -#endif /* DNS_RESULT_H */ diff --git a/lib/dns/include/dns/rootns.h b/lib/dns/include/dns/rootns.h index 0452ec197ca..10712136004 100644 --- a/lib/dns/include/dns/rootns.h +++ b/lib/dns/include/dns/rootns.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ROOTNS_H -#define DNS_ROOTNS_H 1 +#pragma once /*! \file dns/rootns.h */ @@ -33,5 +32,3 @@ dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db); */ ISC_LANG_ENDDECLS - -#endif /* DNS_ROOTNS_H */ diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h index a0a59390a1f..601a2dd6c54 100644 --- a/lib/dns/include/dns/rpz.h +++ b/lib/dns/include/dns/rpz.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RPZ_H -#define DNS_RPZ_H 1 +#pragma once #include #include @@ -430,5 +429,3 @@ 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 - -#endif /* DNS_RPZ_H */ diff --git a/lib/dns/include/dns/rriterator.h b/lib/dns/include/dns/rriterator.h index 2adc67c5680..8f982dd5269 100644 --- a/lib/dns/include/dns/rriterator.h +++ b/lib/dns/include/dns/rriterator.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RRITERATOR_H -#define DNS_RRITERATOR_H 1 +#pragma once /***** ***** Module Info @@ -176,5 +175,3 @@ dns_rriterator_destroy(dns_rriterator_t *it); */ ISC_LANG_ENDDECLS - -#endif /* DNS_RRITERATOR_H */ diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h index a98649801c0..7dd42f0684b 100644 --- a/lib/dns/include/dns/rrl.h +++ b/lib/dns/include/dns/rrl.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RRL_H -#define DNS_RRL_H 1 +#pragma once /* * Rate limit DNS responses. @@ -266,5 +265,3 @@ isc_result_t dns_rrl_init(dns_rrl_t **rrlp, dns_view_t *view, int min_entries); ISC_LANG_ENDDECLS - -#endif /* DNS_RRL_H */ diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h index b37872b9f9a..63fae5dd3c6 100644 --- a/lib/dns/include/dns/sdb.h +++ b/lib/dns/include/dns/sdb.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_SDB_H -#define DNS_SDB_H 1 +#pragma once /***** ***** Module Info @@ -208,5 +207,3 @@ dns_sdb_putsoa(dns_sdblookup_t *lookup, const char *mname, const char *rname, */ ISC_LANG_ENDDECLS - -#endif /* DNS_SDB_H */ diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h index ef403eaa5d4..18ebb967c74 100644 --- a/lib/dns/include/dns/sdlz.h +++ b/lib/dns/include/dns/sdlz.h @@ -46,8 +46,7 @@ /*! \file dns/sdlz.h */ -#ifndef SDLZ_H -#define SDLZ_H 1 +#pragma once #include #include @@ -353,5 +352,3 @@ dns_sdlz_setdb_t dns_sdlz_setdb; */ ISC_LANG_ENDDECLS - -#endif /* SDLZ_H */ diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h index 8df35e071e8..af65fe9a5e5 100644 --- a/lib/dns/include/dns/secalg.h +++ b/lib/dns/include/dns/secalg.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_SECALG_H -#define DNS_SECALG_H 1 +#pragma once /*! \file dns/secalg.h */ @@ -66,5 +65,3 @@ dns_secalg_format(dns_secalg_t alg, char *cp, unsigned int size); */ ISC_LANG_ENDDECLS - -#endif /* DNS_SECALG_H */ diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h index 5d67840adf9..425eea6874a 100644 --- a/lib/dns/include/dns/secproto.h +++ b/lib/dns/include/dns/secproto.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_SECPROTO_H -#define DNS_SECPROTO_H 1 +#pragma once /*! \file dns/secproto.h */ @@ -59,5 +58,3 @@ dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target); */ ISC_LANG_ENDDECLS - -#endif /* DNS_SECPROTO_H */ diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h index 52ee3aadd29..57951464008 100644 --- a/lib/dns/include/dns/soa.h +++ b/lib/dns/include/dns/soa.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_SOA_H -#define DNS_SOA_H 1 +#pragma once /***** ***** Module Info @@ -90,5 +89,3 @@ dns_soa_setminimum(uint32_t val, dns_rdata_t *rdata); */ ISC_LANG_ENDDECLS - -#endif /* DNS_SOA_H */ diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h index 4b6ead69f57..6b3b8ee7b86 100644 --- a/lib/dns/include/dns/ssu.h +++ b/lib/dns/include/dns/ssu.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_SSU_H -#define DNS_SSU_H 1 +#pragma once /*! \file dns/ssu.h */ @@ -255,5 +254,3 @@ dns_ssu_mtypefromstring(const char *str, dns_ssumatchtype_t *mtype); */ ISC_LANG_ENDDECLS - -#endif /* DNS_SSU_H */ diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h index 8c973fe5e04..4342fe41c5d 100644 --- a/lib/dns/include/dns/stats.h +++ b/lib/dns/include/dns/stats.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_STATS_H -#define DNS_STATS_H 1 +#pragma once /*! \file dns/stats.h */ @@ -820,5 +819,3 @@ dns_stats_freecounters(isc_mem_t *mctx, uint64_t **ctrp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_STATS_H */ diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h index b0d710cc649..eaf64a291ee 100644 --- a/lib/dns/include/dns/time.h +++ b/lib/dns/include/dns/time.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_TIME_H -#define DNS_TIME_H 1 +#pragma once /*! \file dns/time.h */ @@ -67,5 +66,3 @@ dns_time64_from32(uint32_t value); */ ISC_LANG_ENDDECLS - -#endif /* DNS_TIME_H */ diff --git a/lib/dns/include/dns/timer.h b/lib/dns/include/dns/timer.h index 6bbb4ee29bc..1ce86d66d23 100644 --- a/lib/dns/include/dns/timer.h +++ b/lib/dns/include/dns/timer.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_TIMER_H -#define DNS_TIMER_H 1 +#pragma once /*! \file dns/timer.h */ @@ -42,5 +41,3 @@ dns_timer_setidle(isc_timer_t *timer, unsigned int maxtime, */ ISC_LANG_ENDDECLS - -#endif /* DNS_TIMER_H */ diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h index 11d758ec447..d8e77e66d52 100644 --- a/lib/dns/include/dns/tkey.h +++ b/lib/dns/include/dns/tkey.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_TKEY_H -#define DNS_TKEY_H 1 +#pragma once /*! \file dns/tkey.h */ @@ -240,5 +239,3 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, */ ISC_LANG_ENDDECLS - -#endif /* DNS_TKEY_H */ diff --git a/lib/dns/include/dns/tsec.h b/lib/dns/include/dns/tsec.h index 13519d31f90..aa899c03780 100644 --- a/lib/dns/include/dns/tsec.h +++ b/lib/dns/include/dns/tsec.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_TSEC_H -#define DNS_TSEC_H 1 +#pragma once /***** ***** Module Info @@ -126,5 +125,3 @@ dns_tsec_getkey(dns_tsec_t *tsec, void *keyp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_TSEC_H */ diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h index 443736a857c..78b59970bb7 100644 --- a/lib/dns/include/dns/tsig.h +++ b/lib/dns/include/dns/tsig.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_TSIG_H -#define DNS_TSIG_H 1 +#pragma once /*! \file dns/tsig.h */ @@ -290,5 +289,3 @@ void dns_keyring_restore(dns_tsig_keyring_t *ring, FILE *fp); ISC_LANG_ENDDECLS - -#endif /* DNS_TSIG_H */ diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h index 1cceb503a5f..4ad28cfa232 100644 --- a/lib/dns/include/dns/ttl.h +++ b/lib/dns/include/dns/ttl.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_TTL_H -#define DNS_TTL_H 1 +#pragma once /*! \file dns/ttl.h */ @@ -74,5 +73,3 @@ dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl); */ ISC_LANG_ENDDECLS - -#endif /* DNS_TTL_H */ diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h index 59d2fb28bdd..9a617e1b7f8 100644 --- a/lib/dns/include/dns/types.h +++ b/lib/dns/include/dns/types.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_TYPES_H -#define DNS_TYPES_H 1 +#pragma once /*! \file dns/types.h * \brief @@ -420,5 +419,3 @@ typedef bool (*dns_isselffunc_t)(dns_view_t *, dns_tsigkey_t *, dns_rdataclass_t, void *); typedef void (*dns_nseclog_t)(void *val, int, const char *, ...); - -#endif /* DNS_TYPES_H */ diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h index f566488e3ec..49f08bfd089 100644 --- a/lib/dns/include/dns/update.h +++ b/lib/dns/include/dns/update.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_UPDATE_H -#define DNS_UPDATE_H 1 +#pragma once /*! \file dns/update.h */ @@ -69,5 +68,3 @@ dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_update_state_t **state); ISC_LANG_ENDDECLS - -#endif /* DNS_UPDATE_H */ diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h index 47440145983..43da2b4c269 100644 --- a/lib/dns/include/dns/validator.h +++ b/lib/dns/include/dns/validator.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_VALIDATOR_H -#define DNS_VALIDATOR_H 1 +#pragma once /***** ***** Module Info @@ -237,5 +236,3 @@ dns_validator_destroy(dns_validator_t **validatorp); */ ISC_LANG_ENDDECLS - -#endif /* DNS_VALIDATOR_H */ diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h index cd8cd0b006b..f1ec93877f3 100644 --- a/lib/dns/include/dns/view.h +++ b/lib/dns/include/dns/view.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_VIEW_H -#define DNS_VIEW_H 1 +#pragma once /***** ***** Module Info @@ -1362,5 +1361,3 @@ dns_view_staleanswerenabled(dns_view_t *view); */ ISC_LANG_ENDDECLS - -#endif /* DNS_VIEW_H */ diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h index 17858b917c7..d080b089cb3 100644 --- a/lib/dns/include/dns/xfrin.h +++ b/lib/dns/include/dns/xfrin.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_XFRIN_H -#define DNS_XFRIN_H 1 +#pragma once /***** ***** Module Info @@ -91,5 +90,3 @@ dns_xfrin_attach(dns_xfrin_ctx_t *source, dns_xfrin_ctx_t **target); */ ISC_LANG_ENDDECLS - -#endif /* DNS_XFRIN_H */ diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index da3ebc8a6e3..e05b653d6cd 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ZONE_H -#define DNS_ZONE_H 1 +#pragma once /*! \file dns/zone.h */ @@ -2730,5 +2729,3 @@ dns_zonetype_name(dns_zonetype_t type); /*%< * Return the name of the zone type 'type'. */ - -#endif /* DNS_ZONE_H */ diff --git a/lib/dns/include/dns/zonekey.h b/lib/dns/include/dns/zonekey.h index 0235d1d70e6..9a63874baca 100644 --- a/lib/dns/include/dns/zonekey.h +++ b/lib/dns/include/dns/zonekey.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ZONEKEY_H -#define DNS_ZONEKEY_H 1 +#pragma once /*! \file dns/zonekey.h */ @@ -32,5 +31,3 @@ dns_zonekey_iszonekey(dns_rdata_t *keyrdata); */ ISC_LANG_ENDDECLS - -#endif /* DNS_ZONEKEY_H */ diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h index ef451362a7b..03ead096e11 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ZT_H -#define DNS_ZT_H 1 +#pragma once /*! \file dns/zt.h */ @@ -217,5 +216,3 @@ dns_zt_setviewrevert(dns_zt_t *zt); */ ISC_LANG_ENDDECLS - -#endif /* DNS_ZT_H */ diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h index f454ebbf783..aac4607f0e8 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DST_DST_H -#define DST_DST_H 1 +#pragma once /*! \file dst/dst.h */ @@ -1201,5 +1200,3 @@ dst_key_copy_metadata(dst_key_t *to, dst_key_t *from); */ ISC_LANG_ENDDECLS - -#endif /* DST_DST_H */ diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h index e691c643882..c01a5c662f9 100644 --- a/lib/dns/rbtdb.h +++ b/lib/dns/rbtdb.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RBTDB_H -#define DNS_RBTDB_H 1 +#pragma once #include @@ -46,5 +45,3 @@ dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type, */ ISC_LANG_ENDDECLS - -#endif /* DNS_RBTDB_H */ diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h index 634319cc300..245efe815d0 100644 --- a/lib/dns/rdata/any_255/tsig_250.h +++ b/lib/dns/rdata/any_255/tsig_250.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ANY_255_TSIG_250_H -#define ANY_255_TSIG_250_H 1 +#pragma once /*% RFC2845 */ typedef struct dns_rdata_any_tsig { @@ -26,5 +25,3 @@ typedef struct dns_rdata_any_tsig { uint16_t otherlen; unsigned char *other; } dns_rdata_any_tsig_t; - -#endif /* ANY_255_TSIG_250_H */ diff --git a/lib/dns/rdata/ch_3/a_1.h b/lib/dns/rdata/ch_3/a_1.h index 5f37804abf6..67acfde948f 100644 --- a/lib/dns/rdata/ch_3/a_1.h +++ b/lib/dns/rdata/ch_3/a_1.h @@ -12,8 +12,7 @@ /* by Bjorn.Victor@it.uu.se, 2005-05-07 */ /* Based on generic/mx_15.h */ -#ifndef CH_3_A_1_H -#define CH_3_A_1_H 1 +#pragma once typedef uint16_t ch_addr_t; @@ -25,5 +24,3 @@ typedef struct dns_rdata_ch_a { ch_addr_t ch_addr; /* chaos address (16 bit) network * order */ } dns_rdata_ch_a_t; - -#endif /* CH_3_A_1_H */ diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h index 0f78b37a51b..8d7353a0f44 100644 --- a/lib/dns/rdata/generic/afsdb_18.h +++ b/lib/dns/rdata/generic/afsdb_18.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_AFSDB_18_H -#define GENERIC_AFSDB_18_H 1 +#pragma once /*! * \brief Per RFC1183 */ @@ -21,5 +20,3 @@ typedef struct dns_rdata_afsdb { uint16_t subtype; dns_name_t server; } dns_rdata_afsdb_t; - -#endif /* GENERIC_AFSDB_18_H */ diff --git a/lib/dns/rdata/generic/amtrelay_260.h b/lib/dns/rdata/generic/amtrelay_260.h index b8256b8a5f7..1c6c3b8c910 100644 --- a/lib/dns/rdata/generic/amtrelay_260.h +++ b/lib/dns/rdata/generic/amtrelay_260.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_AMTRELAY_260_H -#define GENERIC_AMTRELAY_260_H 1 +#pragma once typedef struct dns_rdata_amtrelay { dns_rdatacommon_t common; @@ -24,5 +23,3 @@ typedef struct dns_rdata_amtrelay { unsigned char *data; /* gateway type > 3 */ uint16_t length; } dns_rdata_amtrelay_t; - -#endif /* GENERIC_AMTRELAY_260_H */ diff --git a/lib/dns/rdata/generic/avc_258.h b/lib/dns/rdata/generic/avc_258.h index 5ee851e2253..b0ead3e6db2 100644 --- a/lib/dns/rdata/generic/avc_258.h +++ b/lib/dns/rdata/generic/avc_258.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_AVC_258_H -#define GENERIC_AVC_258_H 1 +#pragma once typedef dns_rdata_txt_string_t dns_rdata_avc_string_t; @@ -27,4 +26,3 @@ typedef struct dns_rdata_avc { * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done * via rdatastructpre.h and rdatastructsuf.h. */ -#endif /* GENERIC_AVC_258_H */ diff --git a/lib/dns/rdata/generic/caa_257.h b/lib/dns/rdata/generic/caa_257.h index c444c2912ce..5b8e2bde3b3 100644 --- a/lib/dns/rdata/generic/caa_257.h +++ b/lib/dns/rdata/generic/caa_257.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_CAA_257_H -#define GENERIC_CAA_257_H 1 +#pragma once typedef struct dns_rdata_caa { dns_rdatacommon_t common; @@ -21,5 +20,3 @@ typedef struct dns_rdata_caa { unsigned char *value; uint16_t value_len; } dns_rdata_caa_t; - -#endif /* GENERIC_CAA_257_H */ diff --git a/lib/dns/rdata/generic/cdnskey_60.h b/lib/dns/rdata/generic/cdnskey_60.h index 84a6c9739c5..a9ee0b8a7da 100644 --- a/lib/dns/rdata/generic/cdnskey_60.h +++ b/lib/dns/rdata/generic/cdnskey_60.h @@ -9,10 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_CDNSKEY_60_H -#define GENERIC_CDNSKEY_60_H 1 +#pragma once /* CDNSKEY records have the same RDATA fields as DNSKEY records. */ typedef struct dns_rdata_key dns_rdata_cdnskey_t; - -#endif /* GENERIC_CDNSKEY_60_H */ diff --git a/lib/dns/rdata/generic/cds_59.h b/lib/dns/rdata/generic/cds_59.h index a248266cc26..a31c320d6b9 100644 --- a/lib/dns/rdata/generic/cds_59.h +++ b/lib/dns/rdata/generic/cds_59.h @@ -9,10 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_CDS_59_H -#define GENERIC_CDS_59_H 1 +#pragma once /* CDS records have the same RDATA fields as DS records. */ typedef struct dns_rdata_ds dns_rdata_cds_t; - -#endif /* GENERIC_CDS_59_H */ diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h index 7eb5ee7cbda..748ea05bde5 100644 --- a/lib/dns/rdata/generic/cert_37.h +++ b/lib/dns/rdata/generic/cert_37.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_CERT_37_H -#define GENERIC_CERT_37_H 1 +#pragma once /*% RFC2538 */ typedef struct dns_rdata_cert { @@ -22,5 +21,3 @@ typedef struct dns_rdata_cert { uint16_t length; unsigned char *certificate; } dns_rdata_cert_t; - -#endif /* GENERIC_CERT_37_H */ diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h index 2daadba9ba5..5c8e2c9c1ca 100644 --- a/lib/dns/rdata/generic/cname_5.h +++ b/lib/dns/rdata/generic/cname_5.h @@ -9,13 +9,10 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_CNAME_5_H -#define GENERIC_CNAME_5_H 1 +#pragma once typedef struct dns_rdata_cname { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t cname; } dns_rdata_cname_t; - -#endif /* GENERIC_CNAME_5_H */ diff --git a/lib/dns/rdata/generic/csync_62.h b/lib/dns/rdata/generic/csync_62.h index a06e94c7708..6258973acd8 100644 --- a/lib/dns/rdata/generic/csync_62.h +++ b/lib/dns/rdata/generic/csync_62.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_CSYNC_62_H -#define GENERIC_CSYNC_62_H 1 +#pragma once /*! * \brief Per RFC 7477 @@ -24,5 +23,3 @@ typedef struct dns_rdata_csync { unsigned char *typebits; uint16_t len; } dns_rdata_csync_t; - -#endif /* GENERIC_CSYNC_62_H */ diff --git a/lib/dns/rdata/generic/dlv_32769.h b/lib/dns/rdata/generic/dlv_32769.h index 25622966350..91d408cbc94 100644 --- a/lib/dns/rdata/generic/dlv_32769.h +++ b/lib/dns/rdata/generic/dlv_32769.h @@ -10,9 +10,6 @@ */ /* draft-ietf-dnsext-delegation-signer-05.txt */ -#ifndef GENERIC_DLV_32769_H -#define GENERIC_DLV_32769_H 1 +#pragma once typedef struct dns_rdata_ds dns_rdata_dlv_t; - -#endif /* GENERIC_DLV_32769_H */ diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h index ff370bee1ec..c2dad23ff88 100644 --- a/lib/dns/rdata/generic/dname_39.h +++ b/lib/dns/rdata/generic/dname_39.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_DNAME_39_H -#define GENERIC_DNAME_39_H 1 +#pragma once /*! * \brief per RFC2672 */ @@ -20,5 +19,3 @@ typedef struct dns_rdata_dname { isc_mem_t *mctx; dns_name_t dname; } dns_rdata_dname_t; - -#endif /* GENERIC_DNAME_39_H */ diff --git a/lib/dns/rdata/generic/dnskey_48.h b/lib/dns/rdata/generic/dnskey_48.h index a57c9f6fac6..6151ed2a3ad 100644 --- a/lib/dns/rdata/generic/dnskey_48.h +++ b/lib/dns/rdata/generic/dnskey_48.h @@ -9,13 +9,10 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_DNSKEY_48_H -#define GENERIC_DNSKEY_48_H 1 +#pragma once /*! * \brief per RFC2535 */ typedef struct dns_rdata_key dns_rdata_dnskey_t; - -#endif /* GENERIC_DNSKEY_48_H */ diff --git a/lib/dns/rdata/generic/doa_259.h b/lib/dns/rdata/generic/doa_259.h index 85c8d4b5c0b..701c626597a 100644 --- a/lib/dns/rdata/generic/doa_259.h +++ b/lib/dns/rdata/generic/doa_259.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_DOA_259_H -#define GENERIC_DOA_259_H 1 +#pragma once typedef struct dns_rdata_doa { dns_rdatacommon_t common; @@ -23,5 +22,3 @@ typedef struct dns_rdata_doa { uint8_t location; uint8_t mediatype_len; } dns_rdata_doa_t; - -#endif /* GENERIC_DOA_259_H */ diff --git a/lib/dns/rdata/generic/ds_43.h b/lib/dns/rdata/generic/ds_43.h index beead6becbc..e4b30827ce5 100644 --- a/lib/dns/rdata/generic/ds_43.h +++ b/lib/dns/rdata/generic/ds_43.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_DS_43_H -#define GENERIC_DS_43_H 1 +#pragma once /*! * \brief per draft-ietf-dnsext-delegation-signer-05.txt */ @@ -23,5 +22,3 @@ typedef struct dns_rdata_ds { uint16_t length; unsigned char *digest; } dns_rdata_ds_t; - -#endif /* GENERIC_DS_43_H */ diff --git a/lib/dns/rdata/generic/eui48_108.h b/lib/dns/rdata/generic/eui48_108.h index 012c5239816..e804a2dfd28 100644 --- a/lib/dns/rdata/generic/eui48_108.h +++ b/lib/dns/rdata/generic/eui48_108.h @@ -10,12 +10,9 @@ */ /* */ -#ifndef GENERIC_EUI48_108_H -#define GENERIC_EUI48_108_H 1 +#pragma once typedef struct dns_rdata_eui48 { dns_rdatacommon_t common; unsigned char eui48[6]; } dns_rdata_eui48_t; - -#endif /* GENERIC_EUI48_10k_H */ diff --git a/lib/dns/rdata/generic/eui64_109.h b/lib/dns/rdata/generic/eui64_109.h index 8173262d023..2b1762d4065 100644 --- a/lib/dns/rdata/generic/eui64_109.h +++ b/lib/dns/rdata/generic/eui64_109.h @@ -10,12 +10,9 @@ */ /* */ -#ifndef GENERIC_EUI64_109_H -#define GENERIC_EUI64_109_H 1 +#pragma once typedef struct dns_rdata_eui64 { dns_rdatacommon_t common; unsigned char eui64[8]; } dns_rdata_eui64_t; - -#endif /* GENERIC_EUI64_10k_H */ diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h index 6b41c08ed5a..a17c30f6b43 100644 --- a/lib/dns/rdata/generic/gpos_27.h +++ b/lib/dns/rdata/generic/gpos_27.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_GPOS_27_H -#define GENERIC_GPOS_27_H 1 +#pragma once /*! * \brief per RFC1712 */ @@ -25,5 +24,3 @@ typedef struct dns_rdata_gpos { uint8_t lat_len; uint8_t alt_len; } dns_rdata_gpos_t; - -#endif /* GENERIC_GPOS_27_H */ diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c index 2e8a032bded..98dbe1fd627 100644 --- a/lib/dns/rdata/generic/hinfo_13.c +++ b/lib/dns/rdata/generic/hinfo_13.c @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef RDATA_GENERIC_HINFO_13_C -#define RDATA_GENERIC_HINFO_13_C +#pragma once #define RRTYPE_HINFO_ATTRIBUTES (0) @@ -215,4 +214,3 @@ static inline int casecompare_hinfo(ARGS_COMPARE) { return (compare_hinfo(rdata1, rdata2)); } -#endif /* RDATA_GENERIC_HINFO_13_C */ diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h index 14dda601696..b1e889078b7 100644 --- a/lib/dns/rdata/generic/hinfo_13.h +++ b/lib/dns/rdata/generic/hinfo_13.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_HINFO_13_H -#define GENERIC_HINFO_13_H 1 +#pragma once typedef struct dns_rdata_hinfo { dns_rdatacommon_t common; @@ -20,5 +19,3 @@ typedef struct dns_rdata_hinfo { uint8_t cpu_len; uint8_t os_len; } dns_rdata_hinfo_t; - -#endif /* GENERIC_HINFO_13_H */ diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c index 77d774e37be..6487c555a99 100644 --- a/lib/dns/rdata/generic/hip_55.c +++ b/lib/dns/rdata/generic/hip_55.c @@ -11,8 +11,7 @@ /* RFC 5205 */ -#ifndef RDATA_GENERIC_HIP_5_C -#define RDATA_GENERIC_HIP_5_C +#pragma once #define RRTYPE_HIP_ATTRIBUTES (0) @@ -518,5 +517,3 @@ casecompare_hip(ARGS_COMPARE) { } return (isc_region_compare(&r1, &r2)); } - -#endif /* RDATA_GENERIC_HIP_5_C */ diff --git a/lib/dns/rdata/generic/hip_55.h b/lib/dns/rdata/generic/hip_55.h index 35adcfc19dd..ec6543f7f3c 100644 --- a/lib/dns/rdata/generic/hip_55.h +++ b/lib/dns/rdata/generic/hip_55.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_HIP_5_H -#define GENERIC_HIP_5_H 1 +#pragma once /* RFC 5205 */ @@ -36,5 +35,3 @@ dns_rdata_hip_next(dns_rdata_hip_t *); void dns_rdata_hip_current(dns_rdata_hip_t *, dns_name_t *); - -#endif /* GENERIC_HIP_5_H */ diff --git a/lib/dns/rdata/generic/ipseckey_45.h b/lib/dns/rdata/generic/ipseckey_45.h index b9e6b993850..1af4ca69e80 100644 --- a/lib/dns/rdata/generic/ipseckey_45.h +++ b/lib/dns/rdata/generic/ipseckey_45.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_IPSECKEY_45_H -#define GENERIC_IPSECKEY_45_H 1 +#pragma once typedef struct dns_rdata_ipseckey { dns_rdatacommon_t common; @@ -24,5 +23,3 @@ typedef struct dns_rdata_ipseckey { unsigned char *key; uint16_t keylength; } dns_rdata_ipseckey_t; - -#endif /* GENERIC_IPSECKEY_45_H */ diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h index 9213f39aad2..e4add140231 100644 --- a/lib/dns/rdata/generic/isdn_20.h +++ b/lib/dns/rdata/generic/isdn_20.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_ISDN_20_H -#define GENERIC_ISDN_20_H 1 +#pragma once /*! * \brief Per RFC1183 */ @@ -23,5 +22,3 @@ typedef struct dns_rdata_isdn { uint8_t isdn_len; uint8_t subaddress_len; } dns_rdata_isdn_t; - -#endif /* GENERIC_ISDN_20_H */ diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h index 9b2678fbd94..0daa6eebffc 100644 --- a/lib/dns/rdata/generic/key_25.h +++ b/lib/dns/rdata/generic/key_25.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_KEY_25_H -#define GENERIC_KEY_25_H 1 +#pragma once /*! * \brief Per RFC2535 */ @@ -24,5 +23,3 @@ typedef struct dns_rdata_key { uint16_t datalen; unsigned char *data; } dns_rdata_key_t; - -#endif /* GENERIC_KEY_25_H */ diff --git a/lib/dns/rdata/generic/keydata_65533.h b/lib/dns/rdata/generic/keydata_65533.h index a854d5e31c0..d0d5444c1ae 100644 --- a/lib/dns/rdata/generic/keydata_65533.h +++ b/lib/dns/rdata/generic/keydata_65533.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_KEYDATA_65533_H -#define GENERIC_KEYDATA_65533_H 1 +#pragma once typedef struct dns_rdata_keydata { dns_rdatacommon_t common; @@ -24,5 +23,3 @@ typedef struct dns_rdata_keydata { uint16_t datalen; unsigned char *data; } dns_rdata_keydata_t; - -#endif /* GENERIC_KEYDATA_65533_H */ diff --git a/lib/dns/rdata/generic/l32_105.h b/lib/dns/rdata/generic/l32_105.h index ababafa6f5b..fde8655acfc 100644 --- a/lib/dns/rdata/generic/l32_105.h +++ b/lib/dns/rdata/generic/l32_105.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_L32_105_H -#define GENERIC_L32_105_H 1 +#pragma once typedef struct dns_rdata_l32 { dns_rdatacommon_t common; uint16_t pref; struct in_addr l32; } dns_rdata_l32_t; - -#endif /* GENERIC_L32_105_H */ diff --git a/lib/dns/rdata/generic/l64_106.h b/lib/dns/rdata/generic/l64_106.h index fcbaa454050..9456d846ae3 100644 --- a/lib/dns/rdata/generic/l64_106.h +++ b/lib/dns/rdata/generic/l64_106.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_L64_106_H -#define GENERIC_L64_106_H 1 +#pragma once typedef struct dns_rdata_l64 { dns_rdatacommon_t common; uint16_t pref; unsigned char l64[8]; } dns_rdata_l64_t; - -#endif /* GENERIC_L64_106_H */ diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h index a9ec6857be2..caebf89b29a 100644 --- a/lib/dns/rdata/generic/loc_29.h +++ b/lib/dns/rdata/generic/loc_29.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_LOC_29_H -#define GENERIC_LOC_29_H 1 +#pragma once /*! * \brief Per RFC1876 */ @@ -31,5 +30,3 @@ typedef struct dns_rdata_loc { dns_rdata_loc_0_t v0; } v; } dns_rdata_loc_t; - -#endif /* GENERIC_LOC_29_H */ diff --git a/lib/dns/rdata/generic/lp_107.h b/lib/dns/rdata/generic/lp_107.h index ff660df75df..e4fa5345750 100644 --- a/lib/dns/rdata/generic/lp_107.h +++ b/lib/dns/rdata/generic/lp_107.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef GENERIC_LP_107_H -#define GENERIC_LP_107_H 1 +#pragma once typedef struct dns_rdata_lp { dns_rdatacommon_t common; @@ -19,5 +18,3 @@ typedef struct dns_rdata_lp { uint16_t pref; dns_name_t lp; } dns_rdata_lp_t; - -#endif /* GENERIC_LP_107_H */ diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h index b9d5b90b8a5..fa39541fe6e 100644 --- a/lib/dns/rdata/generic/mb_7.h +++ b/lib/dns/rdata/generic/mb_7.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_MB_7_H -#define GENERIC_MB_7_H 1 +#pragma once typedef struct dns_rdata_mb { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t mb; } dns_rdata_mb_t; - -#endif /* GENERIC_MB_7_H */ diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h index ae6369f430d..8f434c03e7e 100644 --- a/lib/dns/rdata/generic/md_3.h +++ b/lib/dns/rdata/generic/md_3.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_MD_3_H -#define GENERIC_MD_3_H 1 +#pragma once typedef struct dns_rdata_md { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t md; } dns_rdata_md_t; - -#endif /* GENERIC_MD_3_H */ diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h index 4b00afcba0b..20c96265085 100644 --- a/lib/dns/rdata/generic/mf_4.h +++ b/lib/dns/rdata/generic/mf_4.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_MF_4_H -#define GENERIC_MF_4_H 1 +#pragma once typedef struct dns_rdata_mf { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t mf; } dns_rdata_mf_t; - -#endif /* GENERIC_MF_4_H */ diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h index 195f842e6dc..7811901f16f 100644 --- a/lib/dns/rdata/generic/mg_8.h +++ b/lib/dns/rdata/generic/mg_8.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_MG_8_H -#define GENERIC_MG_8_H 1 +#pragma once typedef struct dns_rdata_mg { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t mg; } dns_rdata_mg_t; - -#endif /* GENERIC_MG_8_H */ diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h index 8cfecad2f9d..464275ea35e 100644 --- a/lib/dns/rdata/generic/minfo_14.h +++ b/lib/dns/rdata/generic/minfo_14.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef GENERIC_MINFO_14_H -#define GENERIC_MINFO_14_H 1 +#pragma once typedef struct dns_rdata_minfo { dns_rdatacommon_t common; @@ -19,5 +18,3 @@ typedef struct dns_rdata_minfo { dns_name_t rmailbox; dns_name_t emailbox; } dns_rdata_minfo_t; - -#endif /* GENERIC_MINFO_14_H */ diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h index 61cfd8e6d86..90761f4ca26 100644 --- a/lib/dns/rdata/generic/mr_9.h +++ b/lib/dns/rdata/generic/mr_9.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_MR_9_H -#define GENERIC_MR_9_H 1 +#pragma once typedef struct dns_rdata_mr { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t mr; } dns_rdata_mr_t; - -#endif /* GENERIC_MR_9_H */ diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h index 9c71f9f60bc..23121e0a2a4 100644 --- a/lib/dns/rdata/generic/mx_15.h +++ b/lib/dns/rdata/generic/mx_15.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef GENERIC_MX_15_H -#define GENERIC_MX_15_H 1 +#pragma once typedef struct dns_rdata_mx { dns_rdatacommon_t common; @@ -19,5 +18,3 @@ typedef struct dns_rdata_mx { uint16_t pref; dns_name_t mx; } dns_rdata_mx_t; - -#endif /* GENERIC_MX_15_H */ diff --git a/lib/dns/rdata/generic/naptr_35.h b/lib/dns/rdata/generic/naptr_35.h index 708d07b9385..59a4b9c0554 100644 --- a/lib/dns/rdata/generic/naptr_35.h +++ b/lib/dns/rdata/generic/naptr_35.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_NAPTR_35_H -#define GENERIC_NAPTR_35_H 1 +#pragma once /*! * \brief Per RFC2915 */ @@ -28,5 +27,3 @@ typedef struct dns_rdata_naptr { uint8_t regexp_len; dns_name_t replacement; } dns_rdata_naptr_t; - -#endif /* GENERIC_NAPTR_35_H */ diff --git a/lib/dns/rdata/generic/nid_104.h b/lib/dns/rdata/generic/nid_104.h index 603623c4f9f..92f5f3affce 100644 --- a/lib/dns/rdata/generic/nid_104.h +++ b/lib/dns/rdata/generic/nid_104.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_NID_104_H -#define GENERIC_NID_104_H 1 +#pragma once typedef struct dns_rdata_nid { dns_rdatacommon_t common; uint16_t pref; unsigned char nid[8]; } dns_rdata_nid_t; - -#endif /* GENERIC_NID_104_H */ diff --git a/lib/dns/rdata/generic/ninfo_56.h b/lib/dns/rdata/generic/ninfo_56.h index 26ca2e2fb56..bbd5b83a882 100644 --- a/lib/dns/rdata/generic/ninfo_56.h +++ b/lib/dns/rdata/generic/ninfo_56.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef GENERIC_NINFO_56_H -#define GENERIC_NINFO_56_H 1 +#pragma once typedef struct dns_rdata_txt_string dns_rdata_ninfo_string_t; @@ -30,5 +29,3 @@ dns_rdata_ninfo_next(dns_rdata_ninfo_t *); isc_result_t dns_rdata_ninfo_current(dns_rdata_ninfo_t *, dns_rdata_ninfo_string_t *); - -#endif /* GENERIC_NINFO_16_H */ diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h index bd0984d023d..ead5f553099 100644 --- a/lib/dns/rdata/generic/ns_2.h +++ b/lib/dns/rdata/generic/ns_2.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_NS_2_H -#define GENERIC_NS_2_H 1 +#pragma once typedef struct dns_rdata_ns { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t name; } dns_rdata_ns_t; - -#endif /* GENERIC_NS_2_H */ diff --git a/lib/dns/rdata/generic/nsec3_50.h b/lib/dns/rdata/generic/nsec3_50.h index 459123cf253..6494f36f923 100644 --- a/lib/dns/rdata/generic/nsec3_50.h +++ b/lib/dns/rdata/generic/nsec3_50.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_NSEC3_50_H -#define GENERIC_NSEC3_50_H 1 +#pragma once /*! * \brief Per RFC 5155 */ @@ -106,5 +105,3 @@ typedef struct dns_rdata_nsec3 { * nameservers. */ #define DNS_NSEC3FLAG_NONSEC 0x10U - -#endif /* GENERIC_NSEC3_50_H */ diff --git a/lib/dns/rdata/generic/nsec3param_51.h b/lib/dns/rdata/generic/nsec3param_51.h index b92f6180944..114291800ac 100644 --- a/lib/dns/rdata/generic/nsec3param_51.h +++ b/lib/dns/rdata/generic/nsec3param_51.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_NSEC3PARAM_51_H -#define GENERIC_NSEC3PARAM_51_H 1 +#pragma once /*! * \brief Per RFC 5155 */ @@ -26,5 +25,3 @@ typedef struct dns_rdata_nsec3param { unsigned char salt_length; unsigned char *salt; } dns_rdata_nsec3param_t; - -#endif /* GENERIC_NSEC3PARAM_51_H */ diff --git a/lib/dns/rdata/generic/nsec_47.h b/lib/dns/rdata/generic/nsec_47.h index a142a811c1b..66f96852d4b 100644 --- a/lib/dns/rdata/generic/nsec_47.h +++ b/lib/dns/rdata/generic/nsec_47.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_NSEC_47_H -#define GENERIC_NSEC_47_H 1 +#pragma once /*! * \brief Per RFC 3845 */ @@ -22,5 +21,3 @@ typedef struct dns_rdata_nsec { unsigned char *typebits; uint16_t len; } dns_rdata_nsec_t; - -#endif /* GENERIC_NSEC_47_H */ diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h index c0253c74a01..fe0fbd16e0d 100644 --- a/lib/dns/rdata/generic/null_10.h +++ b/lib/dns/rdata/generic/null_10.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef GENERIC_NULL_10_H -#define GENERIC_NULL_10_H 1 +#pragma once typedef struct dns_rdata_null { dns_rdatacommon_t common; @@ -19,5 +18,3 @@ typedef struct dns_rdata_null { uint16_t length; unsigned char *data; } dns_rdata_null_t; - -#endif /* GENERIC_NULL_10_H */ diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h index 6875313d8c4..5acbd6a5334 100644 --- a/lib/dns/rdata/generic/nxt_30.h +++ b/lib/dns/rdata/generic/nxt_30.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_NXT_30_H -#define GENERIC_NXT_30_H 1 +#pragma once /*! * \brief RFC2535 */ @@ -22,5 +21,3 @@ typedef struct dns_rdata_nxt { unsigned char *typebits; uint16_t len; } dns_rdata_nxt_t; - -#endif /* GENERIC_NXT_30_H */ diff --git a/lib/dns/rdata/generic/openpgpkey_61.h b/lib/dns/rdata/generic/openpgpkey_61.h index c5caba2cd69..11763301061 100644 --- a/lib/dns/rdata/generic/openpgpkey_61.h +++ b/lib/dns/rdata/generic/openpgpkey_61.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_OPENPGPKEY_61_H -#define GENERIC_OPENPGPKEY_61_H 1 +#pragma once typedef struct dns_rdata_openpgpkey { dns_rdatacommon_t common; @@ -18,5 +17,3 @@ typedef struct dns_rdata_openpgpkey { uint16_t length; unsigned char *keyring; } dns_rdata_openpgpkey_t; - -#endif /* GENERIC_OPENPGPKEY_61_H */ diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h index 57ddfc07652..43e16c09386 100644 --- a/lib/dns/rdata/generic/opt_41.h +++ b/lib/dns/rdata/generic/opt_41.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_OPT_41_H -#define GENERIC_OPT_41_H 1 +#pragma once /*! * \brief Per RFC2671 */ @@ -43,5 +42,3 @@ dns_rdata_opt_next(dns_rdata_opt_t *); isc_result_t dns_rdata_opt_current(dns_rdata_opt_t *, dns_rdata_opt_opcode_t *); - -#endif /* GENERIC_OPT_41_H */ diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h index 080957cbaf8..d8aa03706f7 100644 --- a/lib/dns/rdata/generic/proforma.h +++ b/lib/dns/rdata/generic/proforma.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef GENERIC_PROFORMA_H -#define GENERIC_PROFORMA_H 1 +#pragma once typedef struct dns_rdata_ #{ dns_rdatacommon_t common; @@ -19,5 +18,3 @@ typedef struct dns_rdata_ #{ /* type & class specific elements */ } dns_rdata_ #_t; - -#endif /* GENERIC_PROFORMA_H */ diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h index 28c80d3e358..381b98f7b0a 100644 --- a/lib/dns/rdata/generic/ptr_12.h +++ b/lib/dns/rdata/generic/ptr_12.h @@ -10,13 +10,10 @@ */ /* */ -#ifndef GENERIC_PTR_12_H -#define GENERIC_PTR_12_H 1 +#pragma once typedef struct dns_rdata_ptr { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t ptr; } dns_rdata_ptr_t; - -#endif /* GENERIC_PTR_12_H */ diff --git a/lib/dns/rdata/generic/rkey_57.h b/lib/dns/rdata/generic/rkey_57.h index 8408b3d9a60..dac2093c8d8 100644 --- a/lib/dns/rdata/generic/rkey_57.h +++ b/lib/dns/rdata/generic/rkey_57.h @@ -9,9 +9,6 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_RKEY_57_H -#define GENERIC_RKEY_57_H 1 +#pragma once typedef struct dns_rdata_key dns_rdata_rkey_t; - -#endif /* GENERIC_RKEY_57_H */ diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h index d846902a88a..5e2af0b5eff 100644 --- a/lib/dns/rdata/generic/rp_17.h +++ b/lib/dns/rdata/generic/rp_17.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_RP_17_H -#define GENERIC_RP_17_H 1 +#pragma once /*! * \brief Per RFC1183 */ @@ -21,5 +20,3 @@ typedef struct dns_rdata_rp { dns_name_t mail; dns_name_t text; } dns_rdata_rp_t; - -#endif /* GENERIC_RP_17_H */ diff --git a/lib/dns/rdata/generic/rrsig_46.h b/lib/dns/rdata/generic/rrsig_46.h index fd2f6e56e99..de3b3446079 100644 --- a/lib/dns/rdata/generic/rrsig_46.h +++ b/lib/dns/rdata/generic/rrsig_46.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_DNSSIG_46_H -#define GENERIC_DNSSIG_46_H 1 +#pragma once /*! * \brief Per RFC2535 */ @@ -28,5 +27,3 @@ typedef struct dns_rdata_rrsig { uint16_t siglen; unsigned char *signature; } dns_rdata_rrsig_t; - -#endif /* GENERIC_DNSSIG_46_H */ diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h index 21152a0dcd8..8338105f28a 100644 --- a/lib/dns/rdata/generic/rt_21.h +++ b/lib/dns/rdata/generic/rt_21.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_RT_21_H -#define GENERIC_RT_21_H 1 +#pragma once /*! * \brief Per RFC1183 */ @@ -21,5 +20,3 @@ typedef struct dns_rdata_rt { uint16_t preference; dns_name_t host; } dns_rdata_rt_t; - -#endif /* GENERIC_RT_21_H */ diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h index ca71f4a4a47..88c453e93d4 100644 --- a/lib/dns/rdata/generic/sig_24.h +++ b/lib/dns/rdata/generic/sig_24.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_SIG_24_H -#define GENERIC_SIG_24_H 1 +#pragma once /*! * \brief Per RFC2535 */ @@ -29,5 +28,3 @@ typedef struct dns_rdata_sig_t { uint16_t siglen; unsigned char *signature; } dns_rdata_sig_t; - -#endif /* GENERIC_SIG_24_H */ diff --git a/lib/dns/rdata/generic/sink_40.h b/lib/dns/rdata/generic/sink_40.h index ad53f188478..379bf227fdb 100644 --- a/lib/dns/rdata/generic/sink_40.h +++ b/lib/dns/rdata/generic/sink_40.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_SINK_40_H -#define GENERIC_SINK_40_H 1 +#pragma once typedef struct dns_rdata_sink_t { dns_rdatacommon_t common; @@ -21,5 +20,3 @@ typedef struct dns_rdata_sink_t { uint16_t datalen; unsigned char *data; } dns_rdata_sink_t; - -#endif /* GENERIC_SINK_40_H */ diff --git a/lib/dns/rdata/generic/smimea_53.h b/lib/dns/rdata/generic/smimea_53.h index e23dd3bbb05..9fd03a899f0 100644 --- a/lib/dns/rdata/generic/smimea_53.h +++ b/lib/dns/rdata/generic/smimea_53.h @@ -9,9 +9,6 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_SMIMEA_53_H -#define GENERIC_SMIMEA_53_H 1 +#pragma once typedef struct dns_rdata_tlsa dns_rdata_smimea_t; - -#endif /* GENERIC_SMIMEA_53_H */ diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h index 2d91670f781..1636065b687 100644 --- a/lib/dns/rdata/generic/soa_6.h +++ b/lib/dns/rdata/generic/soa_6.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef GENERIC_SOA_6_H -#define GENERIC_SOA_6_H 1 +#pragma once typedef struct dns_rdata_soa { dns_rdatacommon_t common; @@ -24,5 +23,3 @@ typedef struct dns_rdata_soa { uint32_t expire; /*%< host order */ uint32_t minimum; /*%< host order */ } dns_rdata_soa_t; - -#endif /* GENERIC_SOA_6_H */ diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h index 533e1e295c2..27f9dcf023a 100644 --- a/lib/dns/rdata/generic/spf_99.h +++ b/lib/dns/rdata/generic/spf_99.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_SPF_99_H -#define GENERIC_SPF_99_H 1 +#pragma once typedef struct dns_rdata_spf_string { uint8_t length; @@ -30,4 +29,3 @@ typedef struct dns_rdata_spf { * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done * via rdatastructpre.h and rdatastructsuf.h. */ -#endif /* GENERIC_SPF_99_H */ diff --git a/lib/dns/rdata/generic/sshfp_44.h b/lib/dns/rdata/generic/sshfp_44.h index 91cc0ab0dea..7d31531e2a0 100644 --- a/lib/dns/rdata/generic/sshfp_44.h +++ b/lib/dns/rdata/generic/sshfp_44.h @@ -12,8 +12,7 @@ /*! * \brief Per RFC 4255 */ -#ifndef GENERIC_SSHFP_44_H -#define GENERIC_SSHFP_44_H 1 +#pragma once typedef struct dns_rdata_sshfp { dns_rdatacommon_t common; @@ -23,5 +22,3 @@ typedef struct dns_rdata_sshfp { uint16_t length; unsigned char *digest; } dns_rdata_sshfp_t; - -#endif /* GENERIC_SSHFP_44_H */ diff --git a/lib/dns/rdata/generic/ta_32768.h b/lib/dns/rdata/generic/ta_32768.h index a25f652e15b..0bc2f284a4b 100644 --- a/lib/dns/rdata/generic/ta_32768.h +++ b/lib/dns/rdata/generic/ta_32768.h @@ -9,12 +9,9 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_TA_32768_H -#define GENERIC_TA_32768_H 1 +#pragma once /* * TA records are identical to DS records. */ typedef struct dns_rdata_ds dns_rdata_ta_t; - -#endif /* GENERIC_TA_32768_H */ diff --git a/lib/dns/rdata/generic/talink_58.h b/lib/dns/rdata/generic/talink_58.h index 501f8a676c4..201b9c979f9 100644 --- a/lib/dns/rdata/generic/talink_58.h +++ b/lib/dns/rdata/generic/talink_58.h @@ -13,8 +13,7 @@ * http://www.iana.org/assignments/dns-parameters/TALINK/talink-completed-template */ -#ifndef GENERIC_TALINK_58_H -#define GENERIC_TALINK_58_H 1 +#pragma once typedef struct dns_rdata_talink { dns_rdatacommon_t common; @@ -22,5 +21,3 @@ typedef struct dns_rdata_talink { dns_name_t prev; dns_name_t next; } dns_rdata_talink_t; - -#endif /* GENERIC_TALINK_58_H */ diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h index 220caca2e73..c115d9fd596 100644 --- a/lib/dns/rdata/generic/tkey_249.h +++ b/lib/dns/rdata/generic/tkey_249.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_TKEY_249_H -#define GENERIC_TKEY_249_H 1 +#pragma once /*! * \brief Per draft-ietf-dnsind-tkey-00.txt */ @@ -28,5 +27,3 @@ typedef struct dns_rdata_tkey { uint16_t otherlen; unsigned char *other; } dns_rdata_tkey_t; - -#endif /* GENERIC_TKEY_249_H */ diff --git a/lib/dns/rdata/generic/tlsa_52.h b/lib/dns/rdata/generic/tlsa_52.h index 68e9c5691e1..cc6e3a96fc6 100644 --- a/lib/dns/rdata/generic/tlsa_52.h +++ b/lib/dns/rdata/generic/tlsa_52.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_TLSA_52_H -#define GENERIC_TLSA_52_H 1 +#pragma once /*! * \brief per rfc6698.txt @@ -24,5 +23,3 @@ typedef struct dns_rdata_tlsa { uint16_t length; unsigned char *data; } dns_rdata_tlsa_t; - -#endif /* GENERIC_TLSA_52_H */ diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h index 3182466659d..965cf519c35 100644 --- a/lib/dns/rdata/generic/txt_16.h +++ b/lib/dns/rdata/generic/txt_16.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef GENERIC_TXT_16_H -#define GENERIC_TXT_16_H 1 +#pragma once typedef struct dns_rdata_txt_string { uint8_t length; @@ -40,5 +39,3 @@ dns_rdata_txt_next(dns_rdata_txt_t *); isc_result_t dns_rdata_txt_current(dns_rdata_txt_t *, dns_rdata_txt_string_t *); - -#endif /* GENERIC_TXT_16_H */ diff --git a/lib/dns/rdata/generic/uri_256.h b/lib/dns/rdata/generic/uri_256.h index e0978be3758..3751644b8b0 100644 --- a/lib/dns/rdata/generic/uri_256.h +++ b/lib/dns/rdata/generic/uri_256.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_URI_256_H -#define GENERIC_URI_256_H 1 +#pragma once typedef struct dns_rdata_uri { dns_rdatacommon_t common; @@ -20,5 +19,3 @@ typedef struct dns_rdata_uri { unsigned char *target; uint16_t tgt_len; } dns_rdata_uri_t; - -#endif /* GENERIC_URI_256_H */ diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h index e4c8438a510..911a495c848 100644 --- a/lib/dns/rdata/generic/x25_19.h +++ b/lib/dns/rdata/generic/x25_19.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_X25_19_H -#define GENERIC_X25_19_H 1 +#pragma once /*! * \brief Per RFC1183 */ @@ -21,5 +20,3 @@ typedef struct dns_rdata_x25 { unsigned char *x25; uint8_t x25_len; } dns_rdata_x25_t; - -#endif /* GENERIC_X25_19_H */ diff --git a/lib/dns/rdata/generic/zonemd_63.h b/lib/dns/rdata/generic/zonemd_63.h index 592d89f46ab..c1c128e378f 100644 --- a/lib/dns/rdata/generic/zonemd_63.h +++ b/lib/dns/rdata/generic/zonemd_63.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef GENERIC_ZONEMD_63_H -#define GENERIC_ZONEMD_63_H 1 +#pragma once /* Known digest type(s). */ #define DNS_ZONEMD_DIGEST_SHA384 (1) @@ -28,5 +27,3 @@ typedef struct dns_rdata_zonemd { unsigned char *digest; uint16_t length; } dns_rdata_zonemd_t; - -#endif /* GENERIC_ZONEMD_63_H */ diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c index 1df54fc6f66..484321594f6 100644 --- a/lib/dns/rdata/hs_4/a_1.c +++ b/lib/dns/rdata/hs_4/a_1.c @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef RDATA_HS_4_A_1_C -#define RDATA_HS_4_A_1_C +#pragma once #include @@ -230,5 +229,3 @@ static inline int casecompare_hs_a(ARGS_COMPARE) { return (compare_hs_a(rdata1, rdata2)); } - -#endif /* RDATA_HS_4_A_1_C */ diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h index afbf9afae72..4fdf1b93f74 100644 --- a/lib/dns/rdata/hs_4/a_1.h +++ b/lib/dns/rdata/hs_4/a_1.h @@ -10,12 +10,9 @@ */ /* */ -#ifndef HS_4_A_1_H -#define HS_4_A_1_H 1 +#pragma once typedef struct dns_rdata_hs_a { dns_rdatacommon_t common; struct in_addr in_addr; } dns_rdata_hs_a_t; - -#endif /* HS_4_A_1_H */ diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h index 3f75153a02a..03359bef061 100644 --- a/lib/dns/rdata/in_1/a6_38.h +++ b/lib/dns/rdata/in_1/a6_38.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_A6_38_H -#define IN_1_A6_38_H 1 +#pragma once /*! * \brief Per RFC2874 */ @@ -22,5 +21,3 @@ typedef struct dns_rdata_in_a6 { uint8_t prefixlen; struct in6_addr in6_addr; } dns_rdata_in_a6_t; - -#endif /* IN_1_A6_38_H */ diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h index 0aacd519870..f9054cc874d 100644 --- a/lib/dns/rdata/in_1/a_1.h +++ b/lib/dns/rdata/in_1/a_1.h @@ -10,12 +10,9 @@ */ /* */ -#ifndef IN_1_A_1_H -#define IN_1_A_1_H 1 +#pragma once typedef struct dns_rdata_in_a { dns_rdatacommon_t common; struct in_addr in_addr; } dns_rdata_in_a_t; - -#endif /* IN_1_A_1_H */ diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h index 5e09ce46f0c..3de8ac6afae 100644 --- a/lib/dns/rdata/in_1/aaaa_28.h +++ b/lib/dns/rdata/in_1/aaaa_28.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_AAAA_28_H -#define IN_1_AAAA_28_H 1 +#pragma once /*! * \brief Per RFC1886 */ @@ -19,5 +18,3 @@ typedef struct dns_rdata_in_aaaa { dns_rdatacommon_t common; struct in6_addr in6_addr; } dns_rdata_in_aaaa_t; - -#endif /* IN_1_AAAA_28_H */ diff --git a/lib/dns/rdata/in_1/apl_42.h b/lib/dns/rdata/in_1/apl_42.h index 8263f5c0340..03394aa6814 100644 --- a/lib/dns/rdata/in_1/apl_42.h +++ b/lib/dns/rdata/in_1/apl_42.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef IN_1_APL_42_H -#define IN_1_APL_42_H 1 +#pragma once typedef struct dns_rdata_apl_ent { bool negative; @@ -47,5 +46,3 @@ dns_rdata_apl_current(dns_rdata_in_apl_t *, dns_rdata_apl_ent_t *); unsigned int dns_rdata_apl_count(const dns_rdata_in_apl_t *apl); - -#endif /* IN_1_APL_42_H */ diff --git a/lib/dns/rdata/in_1/atma_34.h b/lib/dns/rdata/in_1/atma_34.h index b0ea98ee7f3..31a385eec2f 100644 --- a/lib/dns/rdata/in_1/atma_34.h +++ b/lib/dns/rdata/in_1/atma_34.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_ATMA_22_H -#define IN_1_ATMA_22_H 1 +#pragma once /*! * \brief Per RFC1706 */ @@ -22,5 +21,3 @@ typedef struct dns_rdata_in_atma { unsigned char *atma; uint16_t atma_len; } dns_rdata_in_atma_t; - -#endif /* IN_1_ATMA_22_H */ diff --git a/lib/dns/rdata/in_1/dhcid_49.h b/lib/dns/rdata/in_1/dhcid_49.h index bc5af55442e..6bb1b61dac9 100644 --- a/lib/dns/rdata/in_1/dhcid_49.h +++ b/lib/dns/rdata/in_1/dhcid_49.h @@ -10,8 +10,7 @@ */ /* */ -#ifndef IN_1_DHCID_49_H -#define IN_1_DHCID_49_H 1 +#pragma once typedef struct dns_rdata_in_dhcid { dns_rdatacommon_t common; @@ -19,5 +18,3 @@ typedef struct dns_rdata_in_dhcid { unsigned char *dhcid; unsigned int length; } dns_rdata_in_dhcid_t; - -#endif /* IN_1_DHCID_49_H */ diff --git a/lib/dns/rdata/in_1/eid_31.h b/lib/dns/rdata/in_1/eid_31.h index 37d7e5eb391..013b75588fe 100644 --- a/lib/dns/rdata/in_1/eid_31.h +++ b/lib/dns/rdata/in_1/eid_31.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_EID_31_H -#define IN_1_EID_31_H 1 +#pragma once /*! * \brief http://ana-3.lcs.mit.edu/~jnc/nimrod/dns.txt @@ -22,5 +21,3 @@ typedef struct dns_rdata_in_eid { unsigned char *eid; uint16_t eid_len; } dns_rdata_in_eid_t; - -#endif /* IN_1_EID_31_H */ diff --git a/lib/dns/rdata/in_1/https_65.c b/lib/dns/rdata/in_1/https_65.c index ff562bec6da..ed5bfb98ff6 100644 --- a/lib/dns/rdata/in_1/https_65.c +++ b/lib/dns/rdata/in_1/https_65.c @@ -11,8 +11,7 @@ /* draft-ietf-dnsop-svcb-https-02 */ -#ifndef RDATA_IN_1_HTTPS_65_C -#define RDATA_IN_1_HTTPS_65_C +#pragma once #define RRTYPE_HTTPS_ATTRIBUTES (DNS_RDATATYPEATTR_FOLLOWADDITIONAL) @@ -180,5 +179,3 @@ dns_rdata_in_https_current(dns_rdata_in_https_t *https, isc_region_t *region) { generic_rdata_in_svcb_current(https, region); } - -#endif /* RDATA_IN_1_HTTPS_65_C */ diff --git a/lib/dns/rdata/in_1/https_65.h b/lib/dns/rdata/in_1/https_65.h index 2469a359622..4509eb355e0 100644 --- a/lib/dns/rdata/in_1/https_65.h +++ b/lib/dns/rdata/in_1/https_65.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_HTTPS_65_H -#define IN_1_HTTPS_65_H 1 +#pragma once /*! * \brief Per draft-ietf-dnsop-svcb-https-02 @@ -29,5 +28,3 @@ dns_rdata_in_https_next(dns_rdata_in_https_t *); void dns_rdata_in_https_current(dns_rdata_in_https_t *, isc_region_t *); - -#endif /* IN_1_HTTPS_65_H */ diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h index bb685befed5..86261ba54bb 100644 --- a/lib/dns/rdata/in_1/kx_36.h +++ b/lib/dns/rdata/in_1/kx_36.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_KX_36_H -#define IN_1_KX_36_H 1 +#pragma once /*! * \brief Per RFC2230 */ @@ -21,5 +20,3 @@ typedef struct dns_rdata_in_kx { uint16_t preference; dns_name_t exchange; } dns_rdata_in_kx_t; - -#endif /* IN_1_KX_36_H */ diff --git a/lib/dns/rdata/in_1/nimloc_32.h b/lib/dns/rdata/in_1/nimloc_32.h index b0f0e60c44b..2ec596dda49 100644 --- a/lib/dns/rdata/in_1/nimloc_32.h +++ b/lib/dns/rdata/in_1/nimloc_32.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_NIMLOC_32_H -#define IN_1_NIMLOC_32_H 1 +#pragma once /*! * \brief http://ana-3.lcs.mit.edu/~jnc/nimrod/dns.txt @@ -22,5 +21,3 @@ typedef struct dns_rdata_in_nimloc { unsigned char *nimloc; uint16_t nimloc_len; } dns_rdata_in_nimloc_t; - -#endif /* IN_1_NIMLOC_32_H */ diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h index a8fa4ca8cbd..a08df54a270 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.h +++ b/lib/dns/rdata/in_1/nsap-ptr_23.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_NSAP_PTR_23_H -#define IN_1_NSAP_PTR_23_H 1 +#pragma once /*! * \brief Per RFC1348. Obsoleted in RFC 1706 - use PTR instead. */ @@ -20,5 +19,3 @@ typedef struct dns_rdata_in_nsap_ptr { isc_mem_t *mctx; dns_name_t owner; } dns_rdata_in_nsap_ptr_t; - -#endif /* IN_1_NSAP_PTR_23_H */ diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h index 566d5bafb2a..ade912fa63b 100644 --- a/lib/dns/rdata/in_1/nsap_22.h +++ b/lib/dns/rdata/in_1/nsap_22.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_NSAP_22_H -#define IN_1_NSAP_22_H 1 +#pragma once /*! * \brief Per RFC1706 */ @@ -21,5 +20,3 @@ typedef struct dns_rdata_in_nsap { unsigned char *nsap; uint16_t nsap_len; } dns_rdata_in_nsap_t; - -#endif /* IN_1_NSAP_22_H */ diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h index a682090f72f..979226d9a82 100644 --- a/lib/dns/rdata/in_1/px_26.h +++ b/lib/dns/rdata/in_1/px_26.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_PX_26_H -#define IN_1_PX_26_H 1 +#pragma once /*! * \brief Per RFC2163 */ @@ -22,5 +21,3 @@ typedef struct dns_rdata_in_px { dns_name_t map822; dns_name_t mapx400; } dns_rdata_in_px_t; - -#endif /* IN_1_PX_26_H */ diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h index 872d09b877e..f239e36ec07 100644 --- a/lib/dns/rdata/in_1/srv_33.h +++ b/lib/dns/rdata/in_1/srv_33.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_SRV_33_H -#define IN_1_SRV_33_H 1 +#pragma once /*! * \brief Per RFC2782 */ @@ -23,5 +22,3 @@ typedef struct dns_rdata_in_srv { uint16_t port; dns_name_t target; } dns_rdata_in_srv_t; - -#endif /* IN_1_SRV_33_H */ diff --git a/lib/dns/rdata/in_1/svcb_64.h b/lib/dns/rdata/in_1/svcb_64.h index 750b6820da8..0b0aecd9b78 100644 --- a/lib/dns/rdata/in_1/svcb_64.h +++ b/lib/dns/rdata/in_1/svcb_64.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_SVCB_64_H -#define IN_1_SVCB_64_H 1 +#pragma once /*! * \brief Per draft-ietf-dnsop-svcb-https-02 @@ -34,5 +33,3 @@ dns_rdata_in_svcb_next(dns_rdata_in_svcb_t *); void dns_rdata_in_svcb_current(dns_rdata_in_svcb_t *, isc_region_t *); - -#endif /* IN_1_SVCB_64_H */ diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h index 9729ee92ee8..465cb65285a 100644 --- a/lib/dns/rdata/in_1/wks_11.h +++ b/lib/dns/rdata/in_1/wks_11.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef IN_1_WKS_11_H -#define IN_1_WKS_11_H 1 +#pragma once typedef struct dns_rdata_in_wks { dns_rdatacommon_t common; @@ -20,5 +19,3 @@ typedef struct dns_rdata_in_wks { unsigned char *map; uint16_t map_len; } dns_rdata_in_wks_t; - -#endif /* IN_1_WKS_11_H */ diff --git a/lib/dns/rdata/rdatastructpre.h b/lib/dns/rdata/rdatastructpre.h index 372a4434100..69e5df51e29 100644 --- a/lib/dns/rdata/rdatastructpre.h +++ b/lib/dns/rdata/rdatastructpre.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATASTRUCT_H -#define DNS_RDATASTRUCT_H 1 +#pragma once #include #include diff --git a/lib/dns/rdata/rdatastructsuf.h b/lib/dns/rdata/rdatastructsuf.h index f3de54b7650..ba10cf2bc19 100644 --- a/lib/dns/rdata/rdatastructsuf.h +++ b/lib/dns/rdata/rdatastructsuf.h @@ -10,5 +10,3 @@ */ ISC_LANG_ENDDECLS - -#endif /* DNS_RDATASTRUCT_H */ diff --git a/lib/dns/rdatalist_p.h b/lib/dns/rdatalist_p.h index 536448954d6..77fa5aaeeb5 100644 --- a/lib/dns/rdatalist_p.h +++ b/lib/dns/rdatalist_p.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_RDATALIST_P_H -#define DNS_RDATALIST_P_H +#pragma once /*! \file */ @@ -59,5 +58,3 @@ void isc__rdatalist_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name); ISC_LANG_ENDDECLS - -#endif /* DNS_RDATALIST_P_H */ diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h index d638e5bf24a..3e0c9cb9474 100644 --- a/lib/dns/tests/dnstest.h +++ b/lib/dns/tests/dnstest.h @@ -9,6 +9,8 @@ * information regarding copyright ownership. */ +#pragma once + /*! \file */ #include diff --git a/lib/dns/tsig_p.h b/lib/dns/tsig_p.h index 77770e585eb..8ed31f1c521 100644 --- a/lib/dns/tsig_p.h +++ b/lib/dns/tsig_p.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_TSIG_P_H -#define DNS_TSIG_P_H +#pragma once /*! \file */ @@ -37,5 +36,3 @@ bool dns__tsig_algallocated(const dns_name_t *algorithm); ISC_LANG_ENDDECLS - -#endif /* DNS_TSIG_P_H */ diff --git a/lib/dns/zone_p.h b/lib/dns/zone_p.h index 0c1c40d109f..64fb91bb697 100644 --- a/lib/dns/zone_p.h +++ b/lib/dns/zone_p.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef DNS_ZONE_P_H -#define DNS_ZONE_P_H +#pragma once #include @@ -47,5 +46,3 @@ dns__zone_lookup_nsec3param(dns_zone_t *zone, dns_rdata_nsec3param_t *lookup, unsigned char saltbuf[255], bool resalt); ISC_LANG_ENDDECLS - -#endif /* DNS_ZONE_P_H */ diff --git a/lib/isc/errno2result.h b/lib/isc/errno2result.h index 6a7942c517a..67c02558039 100644 --- a/lib/isc/errno2result.h +++ b/lib/isc/errno2result.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef UNIX_ERRNO2RESULT_H -#define UNIX_ERRNO2RESULT_H 1 +#pragma once /*! \file */ @@ -31,5 +30,3 @@ isc___errno2result(int posixerrno, bool dolog, const char *file, unsigned int line); ISC_LANG_ENDDECLS - -#endif /* UNIX_ERRNO2RESULT_H */ diff --git a/lib/isc/include/isc/aes.h b/lib/isc/include/isc/aes.h index b8dbcb848fc..d9a12a935cf 100644 --- a/lib/isc/include/isc/aes.h +++ b/lib/isc/include/isc/aes.h @@ -11,8 +11,7 @@ /*! \file isc/aes.h */ -#ifndef ISC_AES_H -#define ISC_AES_H 1 +#pragma once #include #include @@ -37,5 +36,3 @@ isc_aes256_crypt(const unsigned char *key, const unsigned char *in, unsigned char *out); ISC_LANG_ENDDECLS - -#endif /* ISC_AES_H */ diff --git a/lib/isc/include/isc/app.h b/lib/isc/include/isc/app.h index fc58ff75a3d..99504a47b1d 100644 --- a/lib/isc/include/isc/app.h +++ b/lib/isc/include/isc/app.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_APP_H -#define ISC_APP_H 1 +#pragma once /***** ***** Module Info @@ -278,5 +277,3 @@ isc_appctx_destroy(isc_appctx_t **ctxp); */ ISC_LANG_ENDDECLS - -#endif /* ISC_APP_H */ diff --git a/lib/isc/include/isc/base32.h b/lib/isc/include/isc/base32.h index 65d79cecb65..34b0c4e5214 100644 --- a/lib/isc/include/isc/base32.h +++ b/lib/isc/include/isc/base32.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_BASE32_H -#define ISC_BASE32_H 1 +#pragma once /*! \file */ @@ -140,5 +139,3 @@ isc_base32hexnp_decoderegion(isc_region_t *source, isc_buffer_t *target); */ ISC_LANG_ENDDECLS - -#endif /* ISC_BASE32_H */ diff --git a/lib/isc/include/isc/base64.h b/lib/isc/include/isc/base64.h index 313329ada34..98f81fe058e 100644 --- a/lib/isc/include/isc/base64.h +++ b/lib/isc/include/isc/base64.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_BASE64_H -#define ISC_BASE64_H 1 +#pragma once /*! \file isc/base64.h */ @@ -95,5 +94,3 @@ isc_base64_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length); */ ISC_LANG_ENDDECLS - -#endif /* ISC_BASE64_H */ diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h index f85fd9db906..9ecdc8aea45 100644 --- a/lib/isc/include/isc/buffer.h +++ b/lib/isc/include/isc/buffer.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_BUFFER_H -#define ISC_BUFFER_H 1 +#pragma once /***** ***** Module Info @@ -1061,5 +1060,3 @@ ISC_LANG_ENDDECLS * No inline method for this one (yet). */ #define isc_buffer_putuint48 isc__buffer_putuint48 - -#endif /* ISC_BUFFER_H */ diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h index 111160242fd..a6de3790637 100644 --- a/lib/isc/include/isc/commandline.h +++ b/lib/isc/include/isc/commandline.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_COMMANDLINE_H -#define ISC_COMMANDLINE_H 1 +#pragma once /*! \file isc/commandline.h */ @@ -53,5 +52,3 @@ isc_commandline_strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, */ ISC_LANG_ENDDECLS - -#endif /* ISC_COMMANDLINE_H */ diff --git a/lib/isc/include/isc/counter.h b/lib/isc/include/isc/counter.h index 2e54d34113d..28025db80ef 100644 --- a/lib/isc/include/isc/counter.h +++ b/lib/isc/include/isc/counter.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_COUNTER_H -#define ISC_COUNTER_H 1 +#pragma once /***** ***** Module Info @@ -81,5 +80,3 @@ isc_counter_detach(isc_counter_t **counterp); */ ISC_LANG_ENDDECLS - -#endif /* ISC_COUNTER_H */ diff --git a/lib/isc/include/isc/crc64.h b/lib/isc/include/isc/crc64.h index 3e35f71f0f3..67d0a2870de 100644 --- a/lib/isc/include/isc/crc64.h +++ b/lib/isc/include/isc/crc64.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_CRC64_H -#define ISC_CRC64_H 1 +#pragma once /*! \file isc/crc64.h * \brief CRC64 in C @@ -52,5 +51,3 @@ isc_crc64_final(uint64_t *crc); */ ISC_LANG_ENDDECLS - -#endif /* ISC_CRC64_H */ diff --git a/lib/isc/include/isc/deprecated.h b/lib/isc/include/isc/deprecated.h index 8664968eb4a..9d9c9bad0b4 100644 --- a/lib/isc/include/isc/deprecated.h +++ b/lib/isc/include/isc/deprecated.h @@ -9,13 +9,10 @@ * information regarding copyright ownership. */ -#ifndef ISC_DEPRECATED_H -#define ISC_DEPRECATED_H +#pragma once #if (__GNUC__ + 0) > 3 #define ISC_DEPRECATED __attribute__((deprecated)) #else /* if (__GNUC__ + 0) > 3 */ #define ISC_DEPRECATED /* none */ #endif /* __GNUC__ > 3*/ - -#endif /* ifndef ISC_DEPRECATED_H */ diff --git a/lib/isc/include/isc/errno.h b/lib/isc/include/isc/errno.h index d0584561ec4..69135628d4e 100644 --- a/lib/isc/include/isc/errno.h +++ b/lib/isc/include/isc/errno.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_ERRNO_H -#define ISC_ERRNO_H 1 +#pragma once /*! \file isc/file.h */ @@ -24,5 +23,3 @@ isc_errno_toresult(int err); * \brief Convert a POSIX errno value to an ISC result code. */ ISC_LANG_ENDDECLS - -#endif /* ISC_ERRNO_H */ diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h index 218b3c2ca32..5c11fb153d8 100644 --- a/lib/isc/include/isc/error.h +++ b/lib/isc/include/isc/error.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_ERROR_H -#define ISC_ERROR_H 1 +#pragma once /*! \file isc/error.h */ @@ -49,5 +48,3 @@ isc_error_runtimecheck(const char *, int, const char *); ((isc_error_runtimecheck)(__FILE__, __LINE__, #cond), 0))) ISC_LANG_ENDDECLS - -#endif /* ISC_ERROR_H */ diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h index 494272194de..daea615474a 100644 --- a/lib/isc/include/isc/event.h +++ b/lib/isc/include/isc/event.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_EVENT_H -#define ISC_EVENT_H 1 +#pragma once /*! \file isc/event.h */ @@ -114,5 +113,3 @@ void isc_event_free(isc_event_t **); ISC_LANG_ENDDECLS - -#endif /* ISC_EVENT_H */ diff --git a/lib/isc/include/isc/eventclass.h b/lib/isc/include/isc/eventclass.h index 694136cbbfb..88db9284972 100644 --- a/lib/isc/include/isc/eventclass.h +++ b/lib/isc/include/isc/eventclass.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_EVENTCLASS_H -#define ISC_EVENTCLASS_H 1 +#pragma once /*! \file isc/eventclass.h ***** Registry of Predefined Event Type Classes @@ -42,5 +41,3 @@ #define ISC_EVENTCLASS_ISCCC ISC_EVENTCLASS(8) #define ISC_EVENTCLASS_NS ISC_EVENTCLASS(9) /*@}*/ - -#endif /* ISC_EVENTCLASS_H */ diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h index 6b63c6fcd19..8030582acb8 100644 --- a/lib/isc/include/isc/file.h +++ b/lib/isc/include/isc/file.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_FILE_H -#define ISC_FILE_H 1 +#pragma once /*! \file isc/file.h */ @@ -378,5 +377,3 @@ isc_file_isdirwritable(const char *path); */ ISC_LANG_ENDDECLS - -#endif /* ISC_FILE_H */ diff --git a/lib/isc/include/isc/formatcheck.h b/lib/isc/include/isc/formatcheck.h index f1313d72387..4759314bb03 100644 --- a/lib/isc/include/isc/formatcheck.h +++ b/lib/isc/include/isc/formatcheck.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_FORMATCHECK_H -#define ISC_FORMATCHECK_H 1 +#pragma once /*! \file isc/formatcheck.h */ @@ -30,5 +29,3 @@ #else /* ifdef __GNUC__ */ #define ISC_FORMAT_PRINTF(fmt, args) #endif /* ifdef __GNUC__ */ - -#endif /* ISC_FORMATCHECK_H */ diff --git a/lib/isc/include/isc/fsaccess.h b/lib/isc/include/isc/fsaccess.h index 3250799ffc7..bded351dc5d 100644 --- a/lib/isc/include/isc/fsaccess.h +++ b/lib/isc/include/isc/fsaccess.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_FSACCESS_H -#define ISC_FSACCESS_H 1 +#pragma once /*! \file isc/fsaccess.h * \brief The ISC filesystem access module encapsulates the setting of file @@ -168,5 +167,3 @@ isc_result_t isc_fsaccess_set(const char *path, isc_fsaccess_t access); ISC_LANG_ENDDECLS - -#endif /* ISC_FSACCESS_H */ diff --git a/lib/isc/include/isc/fuzz.h b/lib/isc/include/isc/fuzz.h index a16845c65cf..994b8da6059 100644 --- a/lib/isc/include/isc/fuzz.h +++ b/lib/isc/include/isc/fuzz.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_FUZZ_H -#define ISC_FUZZ_H +#pragma once typedef enum { isc_fuzz_none, @@ -20,5 +19,3 @@ typedef enum { isc_fuzz_http, isc_fuzz_rndc } isc_fuzztype_t; - -#endif /* ISC_FUZZ_H */ diff --git a/lib/isc/include/isc/glob.h b/lib/isc/include/isc/glob.h index a1847a6a0b8..deca20b8d89 100644 --- a/lib/isc/include/isc/glob.h +++ b/lib/isc/include/isc/glob.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_GLOB_H -#define ISC_GLOB_H +#pragma once #include #include @@ -40,5 +39,3 @@ void isc_globfree(glob_t *pglob); ISC_LANG_ENDDECLS - -#endif /* ISC_GLOB_H */ diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h index fcdbb3cc60e..868a1bee90a 100644 --- a/lib/isc/include/isc/hash.h +++ b/lib/isc/include/isc/hash.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_HASH_H -#define ISC_HASH_H 1 +#pragma once #include #include @@ -60,5 +59,3 @@ isc_hash64(const void *data, const size_t length, const bool case_sensitive); */ ISC_LANG_ENDDECLS - -#endif /* ISC_HASH_H */ diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h index b9a5e2615e9..9f14fa7206c 100644 --- a/lib/isc/include/isc/heap.h +++ b/lib/isc/include/isc/heap.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_HEAP_H -#define ISC_HEAP_H 1 +#pragma once /*! \file isc/heap.h */ @@ -162,5 +161,3 @@ isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap); */ ISC_LANG_ENDDECLS - -#endif /* ISC_HEAP_H */ diff --git a/lib/isc/include/isc/hex.h b/lib/isc/include/isc/hex.h index 9db99315708..47804a00a6d 100644 --- a/lib/isc/include/isc/hex.h +++ b/lib/isc/include/isc/hex.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_HEX_H -#define ISC_HEX_H 1 +#pragma once /*! \file isc/hex.h */ @@ -95,5 +94,3 @@ isc_hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length); */ ISC_LANG_ENDDECLS - -#endif /* ISC_HEX_H */ diff --git a/lib/isc/include/isc/ht.h b/lib/isc/include/isc/ht.h index 9d5ab82ee4e..5ec8466846c 100644 --- a/lib/isc/include/isc/ht.h +++ b/lib/isc/include/isc/ht.h @@ -11,8 +11,7 @@ /* ! \file */ -#ifndef ISC_HT_H -#define ISC_HT_H 1 +#pragma once #include #include @@ -181,4 +180,3 @@ isc_ht_iter_currentkey(isc_ht_iter_t *it, unsigned char **key, size_t *keysize); */ unsigned int isc_ht_count(isc_ht_t *ht); -#endif /* ifndef ISC_HT_H */ diff --git a/lib/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h index 605b9c4d3ba..22678992f00 100644 --- a/lib/isc/include/isc/httpd.h +++ b/lib/isc/include/isc/httpd.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_HTTPD_H -#define ISC_HTTPD_H 1 +#pragma once /*! \file */ @@ -59,5 +58,3 @@ isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url, bool isstatic, void isc_httpd_setfinishhook(void (*fn)(void)); - -#endif /* ISC_HTTPD_H */ diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h index b7e59cb2d68..b4d7f86d869 100644 --- a/lib/isc/include/isc/interfaceiter.h +++ b/lib/isc/include/isc/interfaceiter.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_INTERFACEITER_H -#define ISC_INTERFACEITER_H 1 +#pragma once /***** ***** Module Info @@ -124,5 +123,3 @@ isc_interfaceiter_destroy(isc_interfaceiter_t **iterp); */ ISC_LANG_ENDDECLS - -#endif /* ISC_INTERFACEITER_H */ diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h index 2e0a6c73d5f..bb1796c42a4 100644 --- a/lib/isc/include/isc/lang.h +++ b/lib/isc/include/isc/lang.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_LANG_H -#define ISC_LANG_H 1 +#pragma once /*! \file isc/lang.h */ @@ -21,5 +20,3 @@ #define ISC_LANG_BEGINDECLS #define ISC_LANG_ENDDECLS #endif /* ifdef __cplusplus */ - -#endif /* ISC_LANG_H */ diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h index b179d5052ee..87db8cabbea 100644 --- a/lib/isc/include/isc/lex.h +++ b/lib/isc/include/isc/lex.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_LEX_H -#define ISC_LEX_H 1 +#pragma once /***** ***** Module Info @@ -441,5 +440,3 @@ isc_lex_isfile(isc_lex_t *lex); */ ISC_LANG_ENDDECLS - -#endif /* ISC_LEX_H */ diff --git a/lib/isc/include/isc/likely.h b/lib/isc/include/isc/likely.h index 300e8be47a6..7daa675633f 100644 --- a/lib/isc/include/isc/likely.h +++ b/lib/isc/include/isc/likely.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_LIKELY_H -#define ISC_LIKELY_H 1 +#pragma once /*% * Performance @@ -27,5 +26,3 @@ #define ISC_UNLIKELY(x) (x) #endif /* ifdef HAVE_BUILTIN_EXPECT */ #endif /* ifdef CPPCHECK */ - -#endif /* ISC_LIKELY_H */ diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h index 4ed1f3ca318..dc2f80092d9 100644 --- a/lib/isc/include/isc/list.h +++ b/lib/isc/include/isc/list.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_LIST_H -#define ISC_LIST_H 1 +#pragma once #include @@ -197,5 +196,3 @@ __ISC_LIST_UNLINKUNSAFE_TYPE(list, elt, link, void) #define __ISC_LIST_DEQUEUEUNSAFE_TYPE(list, elt, link, type) \ __ISC_LIST_UNLINKUNSAFE_TYPE(list, elt, link, type) - -#endif /* ISC_LIST_H */ diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h index 75bde1af898..d1968e0f911 100644 --- a/lib/isc/include/isc/log.h +++ b/lib/isc/include/isc/log.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_LOG_H -#define ISC_LOG_H 1 +#pragma once /*! \file isc/log.h */ @@ -849,5 +848,3 @@ isc_log_setforcelog(bool v); */ ISC_LANG_ENDDECLS - -#endif /* ISC_LOG_H */ diff --git a/lib/isc/include/isc/magic.h b/lib/isc/include/isc/magic.h index a2fbe931c56..c5eadb1bf5d 100644 --- a/lib/isc/include/isc/magic.h +++ b/lib/isc/include/isc/magic.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_MAGIC_H -#define ISC_MAGIC_H 1 +#pragma once #include @@ -31,5 +30,3 @@ typedef struct { ISC_LIKELY(((const isc__magic_t *)(a))->magic == (b))) #define ISC_MAGIC(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d)) - -#endif /* ISC_MAGIC_H */ diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h index a513890cc75..b90c3d60170 100644 --- a/lib/isc/include/isc/mem.h +++ b/lib/isc/include/isc/mem.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_MEM_H -#define ISC_MEM_H 1 +#pragma once /*! \file isc/mem.h */ @@ -515,5 +514,3 @@ void ISCMEMPOOLFUNC(put)(isc_mempool_t *, void *_ISC_MEM_FLARG); #endif ISC_LANG_ENDDECLS - -#endif /* ISC_MEM_H */ diff --git a/lib/isc/include/isc/meminfo.h b/lib/isc/include/isc/meminfo.h index a241b1d0670..6814595f869 100644 --- a/lib/isc/include/isc/meminfo.h +++ b/lib/isc/include/isc/meminfo.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_MEMINFO_H -#define ISC_MEMINFO_H 1 +#pragma once #include @@ -27,5 +26,3 @@ isc_meminfo_totalphys(void); */ ISC_LANG_ENDDECLS - -#endif /* ISC_MEMINFO_H */ diff --git a/lib/isc/include/isc/mutex.h b/lib/isc/include/isc/mutex.h index 7192d343d81..295bef2123a 100644 --- a/lib/isc/include/isc/mutex.h +++ b/lib/isc/include/isc/mutex.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_MUTEX_H -#define ISC_MUTEX_H 1 +#pragma once /*! \file */ @@ -124,4 +123,3 @@ void isc_mutex_init_errcheck(isc_mutex_t *mp); ISC_LANG_ENDDECLS -#endif /* ISC_MUTEX_H */ diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h index de20bb5b6c8..dbcf94963d4 100644 --- a/lib/isc/include/isc/mutexblock.h +++ b/lib/isc/include/isc/mutexblock.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_MUTEXBLOCK_H -#define ISC_MUTEXBLOCK_H 1 +#pragma once /*! \file isc/mutexblock.h */ @@ -51,5 +50,3 @@ isc_mutexblock_destroy(isc_mutex_t *block, unsigned int count); */ ISC_LANG_ENDDECLS - -#endif /* ISC_MUTEXBLOCK_H */ diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h index ec910e9d0ce..9faf978e1a6 100644 --- a/lib/isc/include/isc/net.h +++ b/lib/isc/include/isc/net.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_NET_H -#define ISC_NET_H 1 +#pragma once /***** ***** Module Info @@ -303,5 +302,3 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high); */ ISC_LANG_ENDDECLS - -#endif /* ISC_NET_H */ diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h index ba666fa7d66..1388e4eb62c 100644 --- a/lib/isc/include/isc/netaddr.h +++ b/lib/isc/include/isc/netaddr.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_NETADDR_H -#define ISC_NETADDR_H 1 +#pragma once /*! \file isc/netaddr.h */ @@ -190,5 +189,3 @@ isc_netaddr_isloopback(const isc_netaddr_t *na); * 127.0.0.0/8 or ::1). */ ISC_LANG_ENDDECLS - -#endif /* ISC_NETADDR_H */ diff --git a/lib/isc/include/isc/netdb.h b/lib/isc/include/isc/netdb.h index 2e56d67db30..6c547c7c7df 100644 --- a/lib/isc/include/isc/netdb.h +++ b/lib/isc/include/isc/netdb.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_NETDB_H -#define ISC_NETDB_H 1 +#pragma once /***** ***** Module Info @@ -45,5 +44,3 @@ #include #include - -#endif /* ISC_NETDB_H */ diff --git a/lib/isc/include/isc/netscope.h b/lib/isc/include/isc/netscope.h index 4c413f3e749..add856eeb2c 100644 --- a/lib/isc/include/isc/netscope.h +++ b/lib/isc/include/isc/netscope.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_NETSCOPE_H -#define ISC_NETSCOPE_H 1 +#pragma once /*! \file isc/netscope.h */ @@ -33,5 +32,3 @@ isc_result_t isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid); ISC_LANG_ENDDECLS - -#endif /* ISC_NETSCOPE_H */ diff --git a/lib/isc/include/isc/offset.h b/lib/isc/include/isc/offset.h index 973459aeb46..5d7da9a77cc 100644 --- a/lib/isc/include/isc/offset.h +++ b/lib/isc/include/isc/offset.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_OFFSET_H -#define ISC_OFFSET_H 1 +#pragma once /*! \file * \brief @@ -22,5 +21,3 @@ #include typedef off_t isc_offset_t; - -#endif /* ISC_OFFSET_H */ diff --git a/lib/isc/include/isc/once.h b/lib/isc/include/isc/once.h index 6bfa5cc1dc1..3b5aa88f98b 100644 --- a/lib/isc/include/isc/once.h +++ b/lib/isc/include/isc/once.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_ONCE_H -#define ISC_ONCE_H 1 +#pragma once /*! \file */ @@ -26,5 +25,3 @@ typedef pthread_once_t isc_once_t; #define isc_once_do(op, f) \ ((pthread_once((op), (f)) == 0) ? ISC_R_SUCCESS : ISC_R_UNEXPECTED) - -#endif /* ISC_ONCE_H */ diff --git a/lib/isc/include/isc/os.h b/lib/isc/include/isc/os.h index ce7615a0e3f..f9e90e0d82c 100644 --- a/lib/isc/include/isc/os.h +++ b/lib/isc/include/isc/os.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_OS_H -#define ISC_OS_H 1 +#pragma once /*! \file isc/os.h */ @@ -26,5 +25,3 @@ isc_os_ncpus(void); */ ISC_LANG_ENDDECLS - -#endif /* ISC_OS_H */ diff --git a/lib/isc/include/isc/parseint.h b/lib/isc/include/isc/parseint.h index 3be4cef95e4..171d60b6bc6 100644 --- a/lib/isc/include/isc/parseint.h +++ b/lib/isc/include/isc/parseint.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_PARSEINT_H -#define ISC_PARSEINT_H 1 +#pragma once #include @@ -54,5 +53,3 @@ isc_parse_uint8(uint8_t *uip, const char *string, int base); */ ISC_LANG_ENDDECLS - -#endif /* ISC_PARSEINT_H */ diff --git a/lib/isc/include/isc/pool.h b/lib/isc/include/isc/pool.h index 1eae9685dd4..e861646528f 100644 --- a/lib/isc/include/isc/pool.h +++ b/lib/isc/include/isc/pool.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_OBJPOOL_H -#define ISC_OBJPOOL_H 1 +#pragma once /***** ***** Module Info @@ -135,5 +134,3 @@ isc_pool_destroy(isc_pool_t **poolp); */ ISC_LANG_ENDDECLS - -#endif /* ISC_OBJPOOL_H */ diff --git a/lib/isc/include/isc/portset.h b/lib/isc/include/isc/portset.h index a12432e7845..4939e03912a 100644 --- a/lib/isc/include/isc/portset.h +++ b/lib/isc/include/isc/portset.h @@ -21,8 +21,7 @@ * in a place that can be accessed from multiple threads. */ -#ifndef ISC_PORTSET_H -#define ISC_PORTSET_H 1 +#pragma once /*** *** Imports @@ -132,5 +131,3 @@ isc_portset_removerange(isc_portset_t *portset, in_port_t port_lo, */ ISC_LANG_ENDDECLS - -#endif /* ISC_PORTSET_H */ diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h index 73993c0ad40..b5cf235408a 100644 --- a/lib/isc/include/isc/print.h +++ b/lib/isc/include/isc/print.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_PRINT_H -#define ISC_PRINT_H 1 +#pragma once /*! \file isc/print.h */ @@ -26,5 +25,3 @@ ***/ #include - -#endif /* ISC_PRINT_H */ diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h index c3b8dc8c663..c48152120a8 100644 --- a/lib/isc/include/isc/quota.h +++ b/lib/isc/include/isc/quota.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_QUOTA_H -#define ISC_QUOTA_H 1 +#pragma once /***** ***** Module Info @@ -151,5 +150,3 @@ isc_quota_detach(isc_quota_t **p); */ ISC_LANG_ENDDECLS - -#endif /* ISC_QUOTA_H */ diff --git a/lib/isc/include/isc/radix.h b/lib/isc/include/isc/radix.h index 34ceb86d7e1..1087552e8f7 100644 --- a/lib/isc/include/isc/radix.h +++ b/lib/isc/include/isc/radix.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef _RADIX_H -#define _RADIX_H +#pragma once #include #include @@ -218,5 +217,3 @@ isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func); } \ } \ while (0) - -#endif /* _RADIX_H */ diff --git a/lib/isc/include/isc/ratelimiter.h b/lib/isc/include/isc/ratelimiter.h index 3598078cc44..e7d88c19649 100644 --- a/lib/isc/include/isc/ratelimiter.h +++ b/lib/isc/include/isc/ratelimiter.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_RATELIMITER_H -#define ISC_RATELIMITER_H 1 +#pragma once /***** ***** Module Info @@ -142,5 +141,3 @@ isc_ratelimiter_release(isc_ratelimiter_t *rl); */ ISC_LANG_ENDDECLS - -#endif /* ISC_RATELIMITER_H */ diff --git a/lib/isc/include/isc/regex.h b/lib/isc/include/isc/regex.h index f6dcf3f8852..4fd2b0e97e1 100644 --- a/lib/isc/include/isc/regex.h +++ b/lib/isc/include/isc/regex.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_REGEX_H -#define ISC_REGEX_H 1 +#pragma once /*! \file isc/regex.h */ @@ -30,5 +29,3 @@ isc_regex_validate(const char *expression); */ ISC_LANG_ENDDECLS - -#endif /* ISC_REGEX_H */ diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h index ab09f14693e..39ad89ff443 100644 --- a/lib/isc/include/isc/region.h +++ b/lib/isc/include/isc/region.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_REGION_H -#define ISC_REGION_H 1 +#pragma once /*! \file isc/region.h */ @@ -92,5 +91,3 @@ isc_region_compare(isc_region_t *r1, isc_region_t *r2); */ ISC_LANG_ENDDECLS - -#endif /* ISC_REGION_H */ diff --git a/lib/isc/include/isc/resource.h b/lib/isc/include/isc/resource.h index 0a33131208e..9cdb8cd036a 100644 --- a/lib/isc/include/isc/resource.h +++ b/lib/isc/include/isc/resource.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_RESOURCE_H -#define ISC_RESOURCE_H 1 +#pragma once /*! \file isc/resource.h */ @@ -84,5 +83,3 @@ isc_resource_getcurlimit(isc_resource_t resource, isc_resourcevalue_t *value); */ ISC_LANG_ENDDECLS - -#endif /* ISC_RESOURCE_H */ diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h index 9bec58742dd..3cdd1e1ed39 100644 --- a/lib/isc/include/isc/result.h +++ b/lib/isc/include/isc/result.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_RESULT_H -#define ISC_RESULT_H 1 +#pragma once /*! \file isc/result.h */ @@ -284,5 +283,3 @@ const char *isc_result_toid(isc_result_t); */ ISC_LANG_ENDDECLS - -#endif /* ISC_RESULT_H */ diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h index 82f415a24d5..f27d7d05173 100644 --- a/lib/isc/include/isc/rwlock.h +++ b/lib/isc/include/isc/rwlock.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_RWLOCK_H -#define ISC_RWLOCK_H 1 +#pragma once #include @@ -100,5 +99,3 @@ void isc_rwlock_destroy(isc_rwlock_t *rwl); ISC_LANG_ENDDECLS - -#endif /* ISC_RWLOCK_H */ diff --git a/lib/isc/include/isc/safe.h b/lib/isc/include/isc/safe.h index 434d0edd25b..91d81d99b5c 100644 --- a/lib/isc/include/isc/safe.h +++ b/lib/isc/include/isc/safe.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_SAFE_H -#define ISC_SAFE_H 1 +#pragma once /*! \file isc/safe.h */ @@ -41,5 +40,3 @@ isc_safe_memwipe(void *, size_t); */ ISC_LANG_ENDDECLS - -#endif /* ISC_SAFE_H */ diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h index fe7b59a2001..bf3b2460e14 100644 --- a/lib/isc/include/isc/serial.h +++ b/lib/isc/include/isc/serial.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_SERIAL_H -#define ISC_SERIAL_H 1 +#pragma once #include #include @@ -66,5 +65,3 @@ isc_serial_ne(uint32_t a, uint32_t b); */ ISC_LANG_ENDDECLS - -#endif /* ISC_SERIAL_H */ diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h index a0726140941..47c752c121e 100644 --- a/lib/isc/include/isc/sockaddr.h +++ b/lib/isc/include/isc/sockaddr.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_SOCKADDR_H -#define ISC_SOCKADDR_H 1 +#pragma once /*! \file isc/sockaddr.h */ @@ -241,5 +240,3 @@ isc_sockaddr_fromsockaddr(isc_sockaddr_t *isa, const struct sockaddr *sa); */ ISC_LANG_ENDDECLS - -#endif /* ISC_SOCKADDR_H */ diff --git a/lib/isc/include/isc/stat.h b/lib/isc/include/isc/stat.h index dca044267d5..f24026a6a14 100644 --- a/lib/isc/include/isc/stat.h +++ b/lib/isc/include/isc/stat.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_STAT_H -#define ISC_STAT_H 1 +#pragma once /***** ***** Module Info @@ -41,5 +40,3 @@ #include #include - -#endif /* ISC_STAT_H */ diff --git a/lib/isc/include/isc/stats.h b/lib/isc/include/isc/stats.h index f57aa1a96fa..7acf966da79 100644 --- a/lib/isc/include/isc/stats.h +++ b/lib/isc/include/isc/stats.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_STATS_H -#define ISC_STATS_H 1 +#pragma once /*! \file isc/stats.h */ @@ -250,5 +249,3 @@ isc_stats_resize(isc_stats_t **stats, int ncounters); */ ISC_LANG_ENDDECLS - -#endif /* ISC_STATS_H */ diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h index 0f0daba2c97..7023957d4e7 100644 --- a/lib/isc/include/isc/stdio.h +++ b/lib/isc/include/isc/stdio.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_STDIO_H -#define ISC_STDIO_H 1 +#pragma once /*! \file isc/stdio.h */ @@ -68,5 +67,3 @@ isc_stdio_sync(FILE *f); */ ISC_LANG_ENDDECLS - -#endif /* ISC_STDIO_H */ diff --git a/lib/isc/include/isc/stdtime.h b/lib/isc/include/isc/stdtime.h index 52557b94872..fd8c5e3df49 100644 --- a/lib/isc/include/isc/stdtime.h +++ b/lib/isc/include/isc/stdtime.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_STDTIME_H -#define ISC_STDTIME_H 1 +#pragma once /*! \file */ @@ -58,5 +57,3 @@ isc_stdtime_tostring(isc_stdtime_t t, char *out, size_t outlen); */ ISC_LANG_ENDDECLS - -#endif /* ISC_STDTIME_H */ diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h index 07000c6fed3..a8037e63228 100644 --- a/lib/isc/include/isc/symtab.h +++ b/lib/isc/include/isc/symtab.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_SYMTAB_H -#define ISC_SYMTAB_H 1 +#pragma once /***** ***** Module Info @@ -132,5 +131,3 @@ isc_symtab_undefine(isc_symtab_t *symtab, const char *key, unsigned int type); unsigned int isc_symtab_count(isc_symtab_t *symtab); ISC_LANG_ENDDECLS - -#endif /* ISC_SYMTAB_H */ diff --git a/lib/isc/include/isc/syslog.h b/lib/isc/include/isc/syslog.h index f2add8b0cc6..519316d9127 100644 --- a/lib/isc/include/isc/syslog.h +++ b/lib/isc/include/isc/syslog.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_SYSLOG_H -#define ISC_SYSLOG_H 1 +#pragma once /*! \file */ @@ -35,5 +34,3 @@ isc_syslog_facilityfromstring(const char *str, int *facilityp); */ ISC_LANG_ENDDECLS - -#endif /* ISC_SYSLOG_H */ diff --git a/lib/isc/include/isc/taskpool.h b/lib/isc/include/isc/taskpool.h index 94bd0c7873e..cbbab1ad932 100644 --- a/lib/isc/include/isc/taskpool.h +++ b/lib/isc/include/isc/taskpool.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_TASKPOOL_H -#define ISC_TASKPOOL_H 1 +#pragma once /***** ***** Module Info @@ -132,5 +131,3 @@ isc_taskpool_destroy(isc_taskpool_t **poolp); */ ISC_LANG_ENDDECLS - -#endif /* ISC_TASKPOOL_H */ diff --git a/lib/isc/include/isc/time.h b/lib/isc/include/isc/time.h index 6946ecbb3cd..b68a92ad4b9 100644 --- a/lib/isc/include/isc/time.h +++ b/lib/isc/include/isc/time.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_TIME_H -#define ISC_TIME_H 1 +#pragma once /*! \file */ @@ -456,5 +455,3 @@ isc_time_formatshorttimestamp(const isc_time_t *t, char *buf, unsigned int len); */ ISC_LANG_ENDDECLS - -#endif /* ISC_TIME_H */ diff --git a/lib/isc/include/isc/tm.h b/lib/isc/include/isc/tm.h index 021389c1e75..91e444fdd02 100644 --- a/lib/isc/include/isc/tm.h +++ b/lib/isc/include/isc/tm.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_TM_H -#define ISC_TM_H 1 +#pragma once /*! \file isc/tm.h * Provides portable conversion routines for struct tm. @@ -36,5 +35,3 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm); */ ISC_LANG_ENDDECLS - -#endif /* ISC_TIMER_H */ diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h index 3c6f89ba555..78ed309f121 100644 --- a/lib/isc/include/isc/types.h +++ b/lib/isc/include/isc/types.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_TYPES_H -#define ISC_TYPES_H 1 +#pragma once #include #include @@ -126,5 +125,3 @@ typedef enum { isc_statsformat_xml, isc_statsformat_json } isc_statsformat_t; - -#endif /* ISC_TYPES_H */ diff --git a/lib/isc/include/isc/url.h b/lib/isc/include/isc/url.h index 9dd95245c30..7917de23f79 100644 --- a/lib/isc/include/isc/url.h +++ b/lib/isc/include/isc/url.h @@ -31,6 +31,8 @@ * IN THE SOFTWARE. */ +#pragma once + #include #include diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h index ed328f55a20..89c76b6ef62 100644 --- a/lib/isc/include/isc/util.h +++ b/lib/isc/include/isc/util.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISC_UTIL_H -#define ISC_UTIL_H 1 +#pragma once #include @@ -359,5 +358,3 @@ mock_assert(const int result, const char *const expression, * Misc */ #include - -#endif /* ISC_UTIL_H */ diff --git a/lib/isc/socket_p.h b/lib/isc/socket_p.h index 53c998976bd..c99d246d500 100644 --- a/lib/isc/socket_p.h +++ b/lib/isc/socket_p.h @@ -9,6 +9,8 @@ * information regarding copyright ownership. */ +#pragma once + #include #include #include diff --git a/lib/isc/tests/isctest.h b/lib/isc/tests/isctest.h index 8551bcfd010..74196f58610 100644 --- a/lib/isc/tests/isctest.h +++ b/lib/isc/tests/isctest.h @@ -9,6 +9,8 @@ * information regarding copyright ownership. */ +#pragma once + /*! \file */ #include diff --git a/lib/isc/tests/uv_wrap.h b/lib/isc/tests/uv_wrap.h index 99cedeec9c3..775dcff9148 100644 --- a/lib/isc/tests/uv_wrap.h +++ b/lib/isc/tests/uv_wrap.h @@ -9,6 +9,8 @@ * information regarding copyright ownership. */ +#pragma once + #if HAVE_CMOCKA #include #include /* IWYU pragma: keep */ diff --git a/lib/isccc/include/isccc/alist.h b/lib/isccc/include/isccc/alist.h index 06d18559491..1fecdfe6a6e 100644 --- a/lib/isccc/include/isccc/alist.h +++ b/lib/isccc/include/isccc/alist.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_ALIST_H -#define ISCCC_ALIST_H 1 +#pragma once /*! \file isccc/alist.h */ @@ -81,5 +80,3 @@ isccc_alist_prettyprint(isccc_sexpr_t *sexpr, unsigned int indent, FILE *stream); ISC_LANG_ENDDECLS - -#endif /* ISCCC_ALIST_H */ diff --git a/lib/isccc/include/isccc/base64.h b/lib/isccc/include/isccc/base64.h index d9cd5c919e4..e6756af4653 100644 --- a/lib/isccc/include/isccc/base64.h +++ b/lib/isccc/include/isccc/base64.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_BASE64_H -#define ISCCC_BASE64_H 1 +#pragma once /*! \file isccc/base64.h */ @@ -74,5 +73,3 @@ isccc_base64_decode(const char *cstr, isccc_region_t *target); */ ISC_LANG_ENDDECLS - -#endif /* ISCCC_BASE64_H */ diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h index 4849f6b23c6..a748eb69da4 100644 --- a/lib/isccc/include/isccc/cc.h +++ b/lib/isccc/include/isccc/cc.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_CC_H -#define ISCCC_CC_H 1 +#pragma once /*! \file isccc/cc.h */ @@ -123,5 +122,3 @@ isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message, isccc_time_t now); ISC_LANG_ENDDECLS - -#endif /* ISCCC_CC_H */ diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h index 1aff044a978..14a299b599d 100644 --- a/lib/isccc/include/isccc/ccmsg.h +++ b/lib/isccc/include/isccc/ccmsg.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_CCMSG_H -#define ISCCC_CCMSG_H 1 +#pragma once /*! \file isccc/ccmsg.h */ @@ -132,5 +131,3 @@ isccc_ccmsg_invalidate(isccc_ccmsg_t *ccmsg); */ ISC_LANG_ENDDECLS - -#endif /* ISCCC_CCMSG_H */ diff --git a/lib/isccc/include/isccc/events.h b/lib/isccc/include/isccc/events.h index ff2a65a8793..b8d3c57ddd1 100644 --- a/lib/isccc/include/isccc/events.h +++ b/lib/isccc/include/isccc/events.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_EVENTS_H -#define ISCCC_EVENTS_H 1 +#pragma once /*! \file isccc/events.h */ @@ -38,5 +37,3 @@ #define ISCCC_EVENT_FIRSTEVENT (ISC_EVENTCLASS_ISCCC + 0) #define ISCCC_EVENT_LASTEVENT (ISC_EVENTCLASS_ISCCC + 65535) - -#endif /* ISCCC_EVENTS_H */ diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h index e2fb4919ba9..322805c596c 100644 --- a/lib/isccc/include/isccc/sexpr.h +++ b/lib/isccc/include/isccc/sexpr.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_SEXPR_H -#define ISCCC_SEXPR_H 1 +#pragma once /*! \file isccc/sexpr.h */ @@ -114,5 +113,3 @@ isccc_region_t * isccc_sexpr_tobinary(isccc_sexpr_t *sexpr); ISC_LANG_ENDDECLS - -#endif /* ISCCC_SEXPR_H */ diff --git a/lib/isccc/include/isccc/symtab.h b/lib/isccc/include/isccc/symtab.h index dbe2985999a..71bf0181e49 100644 --- a/lib/isccc/include/isccc/symtab.h +++ b/lib/isccc/include/isccc/symtab.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_SYMTAB_H -#define ISCCC_SYMTAB_H 1 +#pragma once /***** ***** Module Info @@ -128,5 +127,3 @@ isccc_symtab_foreach(isccc_symtab_t *symtab, isccc_symtabforeachaction_t action, void *arg); ISC_LANG_ENDDECLS - -#endif /* ISCCC_SYMTAB_H */ diff --git a/lib/isccc/include/isccc/symtype.h b/lib/isccc/include/isccc/symtype.h index feafa66e74d..a5fdf91fad7 100644 --- a/lib/isccc/include/isccc/symtype.h +++ b/lib/isccc/include/isccc/symtype.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_SYMTYPE_H -#define ISCCC_SYMTYPE_H 1 +#pragma once /*! \file isccc/symtype.h */ @@ -32,5 +31,3 @@ #define ISCCC_SYMTYPE_CCDUP 0x0002 #define ISCCC_SYMTYPE_TELLSERVICE 0x0003 #define ISCCC_SYMTYPE_TELLRESPONSE 0x0004 - -#endif /* ISCCC_SYMTYPE_H */ diff --git a/lib/isccc/include/isccc/types.h b/lib/isccc/include/isccc/types.h index 0b1bf742717..a05321adcac 100644 --- a/lib/isccc/include/isccc/types.h +++ b/lib/isccc/include/isccc/types.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_TYPES_H -#define ISCCC_TYPES_H 1 +#pragma once /*! \file isccc/types.h */ @@ -47,5 +46,3 @@ typedef struct isccc_region { unsigned char *rstart; unsigned char *rend; } isccc_region_t; - -#endif /* ISCCC_TYPES_H */ diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h index 800b8041ba0..ef3271564ea 100644 --- a/lib/isccc/include/isccc/util.h +++ b/lib/isccc/include/isccc/util.h @@ -23,8 +23,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef ISCCC_UTIL_H -#define ISCCC_UTIL_H 1 +#pragma once #include @@ -203,5 +202,3 @@ (r).rstart = (unsigned char *)s; \ (r).rend = (r).rstart + strlen(s); \ } while (0) - -#endif /* ISCCC_UTIL_H */ diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h index 81e43129d8a..ee2056d4a6c 100644 --- a/lib/isccfg/include/isccfg/aclconf.h +++ b/lib/isccfg/include/isccfg/aclconf.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISCCFG_ACLCONF_H -#define ISCCFG_ACLCONF_H 1 +#pragma once #include @@ -88,5 +87,3 @@ cfg_acl_fromconfig2(const cfg_obj_t *caml, const cfg_obj_t *cctx, */ ISC_LANG_ENDDECLS - -#endif /* ISCCFG_ACLCONF_H */ diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h index 09450f0ab33..64dda097c7b 100644 --- a/lib/isccfg/include/isccfg/cfg.h +++ b/lib/isccfg/include/isccfg/cfg.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISCCFG_CFG_H -#define ISCCFG_CFG_H 1 +#pragma once /***** ***** Module Info @@ -620,5 +619,3 @@ cfg_pluginlist_foreach(const cfg_obj_t *config, const cfg_obj_t *list, */ ISC_LANG_ENDDECLS - -#endif /* ISCCFG_CFG_H */ diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h index 09f1e837326..a472dcc9fdf 100644 --- a/lib/isccfg/include/isccfg/grammar.h +++ b/lib/isccfg/include/isccfg/grammar.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISCCFG_GRAMMAR_H -#define ISCCFG_GRAMMAR_H 1 +#pragma once /*! \file isccfg/grammar.h */ @@ -609,5 +608,3 @@ cfg_print_indent(cfg_printer_t *pctx); /*%< * Print the necessary indent required by the current settings of 'pctx'. */ - -#endif /* ISCCFG_GRAMMAR_H */ diff --git a/lib/isccfg/include/isccfg/kaspconf.h b/lib/isccfg/include/isccfg/kaspconf.h index 43f6e690a7e..90b414b6200 100644 --- a/lib/isccfg/include/isccfg/kaspconf.h +++ b/lib/isccfg/include/isccfg/kaspconf.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISCCFG_KASPCONF_H -#define ISCCFG_KASPCONF_H 1 +#pragma once #include @@ -54,5 +53,3 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, const char *name, isc_mem_t *mctx, */ ISC_LANG_ENDDECLS - -#endif /* ISCCFG_KASPCONF_H */ diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h index ed7025f0af9..0f413e87742 100644 --- a/lib/isccfg/include/isccfg/log.h +++ b/lib/isccfg/include/isccfg/log.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISCCFG_LOG_H -#define ISCCFG_LOG_H 1 +#pragma once /*! \file isccfg/log.h */ @@ -43,5 +42,3 @@ cfg_log_init(isc_log_t *lctx); */ ISC_LANG_ENDDECLS - -#endif /* ISCCFG_LOG_H */ diff --git a/lib/isccfg/include/isccfg/namedconf.h b/lib/isccfg/include/isccfg/namedconf.h index aabd289acfe..27c3a69ec0c 100644 --- a/lib/isccfg/include/isccfg/namedconf.h +++ b/lib/isccfg/include/isccfg/namedconf.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef ISCCFG_NAMEDCONF_H -#define ISCCFG_NAMEDCONF_H 1 +#pragma once /*! \file isccfg/namedconf.h * \brief @@ -51,5 +50,3 @@ extern cfg_type_t cfg_type_zoneopts; /*%< DNSSEC Key and Signing Policy options */ extern cfg_type_t cfg_type_dnssecpolicyopts; - -#endif /* ISCCFG_NAMEDCONF_H */ diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h index ecb59596fd6..685be677d3f 100644 --- a/lib/ns/include/ns/client.h +++ b/lib/ns/include/ns/client.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_CLIENT_H -#define NS_CLIENT_H 1 +#pragma once /***** ***** Module Info @@ -569,5 +568,3 @@ ns__client_put_cb(void *client0); * Free all resources allocated to this client object, so that * it can be freed. */ - -#endif /* NS_CLIENT_H */ diff --git a/lib/ns/include/ns/events.h b/lib/ns/include/ns/events.h index 8d3736cfeb0..b8da178b05e 100644 --- a/lib/ns/include/ns/events.h +++ b/lib/ns/include/ns/events.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_EVENTS_H -#define NS_EVENTS_H 1 +#pragma once #include @@ -21,5 +20,3 @@ #define NS_EVENT_CLIENTCONTROL (ISC_EVENTCLASS_NS + 0) #define NS_EVENT_HOOKASYNCDONE (ISC_EVENTCLASS_NS + 1) - -#endif /* NS_EVENTS_H */ diff --git a/lib/ns/include/ns/hooks.h b/lib/ns/include/ns/hooks.h index 974ac16bab8..c4c02878990 100644 --- a/lib/ns/include/ns/hooks.h +++ b/lib/ns/include/ns/hooks.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_HOOKS_H -#define NS_HOOKS_H 1 +#pragma once /*! \file */ @@ -609,4 +608,3 @@ ns_hooktable_create(isc_mem_t *mctx, ns_hooktable_t **tablep); /*%< * Allocate and initialize a hook table. */ -#endif /* NS_HOOKS_H */ diff --git a/lib/ns/include/ns/listenlist.h b/lib/ns/include/ns/listenlist.h index 0db7c2ede2a..0b052b6a70e 100644 --- a/lib/ns/include/ns/listenlist.h +++ b/lib/ns/include/ns/listenlist.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_LISTENLIST_H -#define NS_LISTENLIST_H 1 +#pragma once /***** ***** Module Info @@ -131,5 +130,3 @@ ns_listenlist_default(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp, * all addresses with port 'port' (if 'enabled' is true), * or no addresses (if 'enabled' is false). */ - -#endif /* NS_LISTENLIST_H */ diff --git a/lib/ns/include/ns/log.h b/lib/ns/include/ns/log.h index b84b1a312b1..f8741cfeaa8 100644 --- a/lib/ns/include/ns/log.h +++ b/lib/ns/include/ns/log.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_LOG_H -#define NS_LOG_H 1 +#pragma once /*! \file */ @@ -69,4 +68,3 @@ ns_log_setcontext(isc_log_t *lctx); * Requires: *\li lctx is a valid logging context. */ -#endif /* NS_LOG_H */ diff --git a/lib/ns/include/ns/notify.h b/lib/ns/include/ns/notify.h index e36bdabbeed..167c8f6546b 100644 --- a/lib/ns/include/ns/notify.h +++ b/lib/ns/include/ns/notify.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_NOTIFY_H -#define NS_NOTIFY_H 1 +#pragma once #include @@ -41,5 +40,3 @@ ns_notify_start(ns_client_t *client, isc_nmhandle_t *handle); * Requires *\li client to be valid. */ - -#endif /* NS_NOTIFY_H */ diff --git a/lib/ns/include/ns/query.h b/lib/ns/include/ns/query.h index 0e604cea054..a218392eda8 100644 --- a/lib/ns/include/ns/query.h +++ b/lib/ns/include/ns/query.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_QUERY_H -#define NS_QUERY_H 1 +#pragma once /*! \file */ @@ -267,5 +266,3 @@ ns__query_start(query_ctx_t *qctx); /*%< * (Must not be used outside this module and its associated unit tests.) */ - -#endif /* NS_QUERY_H */ diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h index 3768efbd37e..4d3f6e121bb 100644 --- a/lib/ns/include/ns/server.h +++ b/lib/ns/include/ns/server.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_SERVER_H -#define NS_SERVER_H 1 +#pragma once /*! \file */ @@ -183,4 +182,3 @@ ns_server_getoption(ns_server_t *sctx, unsigned int option); * Requires: *\li 'sctx' is valid. */ -#endif /* NS_SERVER_H */ diff --git a/lib/ns/include/ns/sortlist.h b/lib/ns/include/ns/sortlist.h index f60a88ba5eb..8a19d0cd8a1 100644 --- a/lib/ns/include/ns/sortlist.h +++ b/lib/ns/include/ns/sortlist.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_SORTLIST_H -#define NS_SORTLIST_H 1 +#pragma once /*! \file */ @@ -77,5 +76,3 @@ ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, dns_aclenv_t *env, * '*argp' an argument to pass to said function. If no sortlist statement * applies, set '*orderp' and '*argp' to NULL. */ - -#endif /* NS_SORTLIST_H */ diff --git a/lib/ns/include/ns/stats.h b/lib/ns/include/ns/stats.h index 3c0879927fa..34092ade7bc 100644 --- a/lib/ns/include/ns/stats.h +++ b/lib/ns/include/ns/stats.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_STATS_H -#define NS_STATS_H 1 +#pragma once /*! \file include/ns/stats.h */ @@ -133,5 +132,3 @@ ns_stats_update_if_greater(ns_stats_t *stats, isc_statscounter_t counter, isc_statscounter_t ns_stats_get_counter(ns_stats_t *stats, isc_statscounter_t counter); - -#endif /* NS_STATS_H */ diff --git a/lib/ns/include/ns/types.h b/lib/ns/include/ns/types.h index f26d379a179..e04498cdb67 100644 --- a/lib/ns/include/ns/types.h +++ b/lib/ns/include/ns/types.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_TYPES_H -#define NS_TYPES_H 1 +#pragma once /*! \file */ @@ -30,5 +29,3 @@ typedef struct ns_hookasync ns_hookasync_t; typedef enum { ns_cookiealg_aes, ns_cookiealg_siphash24 } ns_cookiealg_t; #define NS_COOKIE_VERSION_1 1 - -#endif /* NS_TYPES_H */ diff --git a/lib/ns/include/ns/update.h b/lib/ns/include/ns/update.h index a01567c0b4a..6cfdf864240 100644 --- a/lib/ns/include/ns/update.h +++ b/lib/ns/include/ns/update.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_UPDATE_H -#define NS_UPDATE_H 1 +#pragma once /***** ***** Module Info @@ -40,5 +39,3 @@ void ns_update_start(ns_client_t *client, isc_nmhandle_t *handle, isc_result_t sigresult); - -#endif /* NS_UPDATE_H */ diff --git a/lib/ns/include/ns/xfrout.h b/lib/ns/include/ns/xfrout.h index 722cac21ef6..b25952867bf 100644 --- a/lib/ns/include/ns/xfrout.h +++ b/lib/ns/include/ns/xfrout.h @@ -9,8 +9,7 @@ * information regarding copyright ownership. */ -#ifndef NS_XFROUT_H -#define NS_XFROUT_H 1 +#pragma once /***** ***** Module Info @@ -27,5 +26,3 @@ void ns_xfr_start(ns_client_t *client, dns_rdatatype_t xfrtype); - -#endif /* NS_XFROUT_H */ diff --git a/lib/ns/tests/nstest.h b/lib/ns/tests/nstest.h index a780945ec14..8b3b2ad516e 100644 --- a/lib/ns/tests/nstest.h +++ b/lib/ns/tests/nstest.h @@ -9,6 +9,8 @@ * information regarding copyright ownership. */ +#pragma once + /*! \file */ #include