You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by dr...@apache.org on 2018/04/11 13:57:13 UTC
[trafficserver] branch master updated: Use #pragma once
This is an automated email from the ASF dual-hosted git repository.
dragon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new b82d0aa Use #pragma once
b82d0aa is described below
commit b82d0aaf8fe7a56e68c397757980790e9306c7e0
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Wed Apr 11 18:07:54 2018 +0900
Use #pragma once
---
cmd/traffic_cache_tool/CacheStore.h | 5 +----
cmd/traffic_cache_tool/Command.h | 4 +---
cmd/traffic_cache_tool/File.h | 5 +----
cmd/traffic_crashlog/traffic_crashlog.h | 5 +----
cmd/traffic_ctl/traffic_ctl.h | 5 +----
cmd/traffic_manager/MgmtHandlers.h | 5 +----
cmd/traffic_manager/metrics.h | 5 +----
example/cppapi/websocket/WSBuffer.h | 4 ----
example/cppapi/websocket/WebSocket.h | 5 +----
example/thread_pool/thread.h | 5 +----
iocore/aio/I_AIO.h | 4 +---
iocore/aio/P_AIO.h | 5 +----
iocore/cache/I_Cache.h | 5 +----
iocore/cache/I_CacheDefs.h | 4 +---
iocore/cache/I_Store.h | 5 +----
iocore/cache/P_Cache.h | 4 +---
iocore/cache/P_CacheArray.h | 5 +----
iocore/cache/P_CacheBC.h | 5 +----
iocore/cache/P_CacheDir.h | 5 +----
iocore/cache/P_CacheDisk.h | 5 +----
iocore/cache/P_CacheHosting.h | 5 +----
iocore/cache/P_CacheHttp.h | 5 +----
iocore/cache/P_CacheInternal.h | 5 +----
iocore/cache/P_CacheTest.h | 5 +----
iocore/cache/P_CacheVol.h | 5 +----
iocore/cache/P_RamCache.h | 5 +----
iocore/dns/I_DNS.h | 5 +----
iocore/dns/I_DNSProcessor.h | 5 +----
iocore/dns/I_SplitDNS.h | 5 +----
iocore/dns/I_SplitDNSProcessor.h | 5 +----
iocore/dns/P_DNS.h | 5 +----
iocore/dns/P_DNSConnection.h | 5 +----
iocore/dns/P_DNSProcessor.h | 5 +----
iocore/dns/P_SplitDNS.h | 5 +----
iocore/dns/P_SplitDNSProcessor.h | 5 +----
iocore/dns/SRV.h | 5 +----
iocore/eventsystem/I_Action.h | 5 +----
iocore/eventsystem/I_Continuation.h | 5 +----
iocore/eventsystem/I_EThread.h | 4 +---
iocore/eventsystem/I_Event.h | 5 +----
iocore/eventsystem/I_EventProcessor.h | 5 +----
iocore/eventsystem/I_EventSystem.h | 4 +---
iocore/eventsystem/I_IOBuffer.h | 3 +--
iocore/eventsystem/I_Lock.h | 5 +----
iocore/eventsystem/I_MIOBufferWriter.h | 7 ++-----
iocore/eventsystem/I_PriorityEventQueue.h | 5 +----
iocore/eventsystem/I_Processor.h | 5 +----
iocore/eventsystem/I_ProtectedQueue.h | 5 +----
iocore/eventsystem/I_ProxyAllocator.h | 5 +----
iocore/eventsystem/I_SocketManager.h | 5 +----
iocore/eventsystem/I_Tasks.h | 5 +----
iocore/eventsystem/I_Thread.h | 5 +----
iocore/eventsystem/I_VConnection.h | 5 +----
iocore/eventsystem/I_VIO.h | 3 +--
iocore/eventsystem/P_EventSystem.h | 4 +---
iocore/eventsystem/P_Freer.h | 5 +----
iocore/eventsystem/P_IOBuffer.h | 5 +----
iocore/eventsystem/P_ProtectedQueue.h | 5 +----
iocore/eventsystem/P_Thread.h | 5 +----
iocore/eventsystem/P_UnixEThread.h | 5 +----
iocore/eventsystem/P_UnixEvent.h | 5 +----
iocore/eventsystem/P_UnixEventProcessor.h | 5 +----
iocore/eventsystem/P_UnixSocketManager.h | 5 +----
iocore/eventsystem/P_VConnection.h | 4 +---
iocore/eventsystem/P_VIO.h | 5 +----
iocore/hostdb/I_HostDB.h | 5 +----
iocore/hostdb/I_HostDBProcessor.h | 5 +----
iocore/hostdb/P_HostDB.h | 4 +---
iocore/hostdb/P_HostDBProcessor.h | 5 +----
iocore/hostdb/P_RefCountCache.h | 5 +----
iocore/hostdb/P_RefCountCacheSerializer.h | 5 +----
iocore/net/BIO_fastopen.h | 5 +----
iocore/net/I_Net.h | 4 +---
iocore/net/I_NetProcessor.h | 5 +----
iocore/net/I_NetVConnection.h | 5 +----
iocore/net/I_SessionAccept.h | 5 +----
iocore/net/I_Socks.h | 5 +----
iocore/net/I_UDPConnection.h | 4 +---
iocore/net/I_UDPNet.h | 5 +----
iocore/net/I_UDPPacket.h | 4 +---
iocore/net/P_CompletionUtil.h | 5 +----
iocore/net/P_Connection.h | 5 +----
iocore/net/P_Net.h | 5 +----
iocore/net/P_NetAccept.h | 5 +----
iocore/net/P_NetVCTest.h | 5 +----
iocore/net/P_OCSPStapling.h | 5 +----
iocore/net/P_SNIActionPerformer.h | 5 +----
iocore/net/P_SSLCertLookup.h | 4 +---
iocore/net/P_SSLClientUtils.h | 5 +----
iocore/net/P_SSLConfig.h | 5 +----
iocore/net/P_SSLNetAccept.h | 4 +---
iocore/net/P_SSLNetVConnection.h | 5 +----
iocore/net/P_SSLNextProtocolAccept.h | 5 +----
iocore/net/P_SSLNextProtocolSet.h | 5 +----
iocore/net/P_SSLSNI.h | 5 +----
iocore/net/P_SSLUtils.h | 5 +----
iocore/net/P_Socks.h | 5 +----
iocore/net/P_UDPConnection.h | 5 +----
iocore/net/P_UDPIOEvent.h | 4 +---
iocore/net/P_UDPNet.h | 5 +----
iocore/net/P_UDPPacket.h | 5 +----
iocore/net/P_UnixCompletionUtil.h | 4 +---
iocore/net/P_UnixNet.h | 5 +----
iocore/net/P_UnixNetProcessor.h | 4 +---
iocore/net/P_UnixNetState.h | 5 +----
iocore/net/P_UnixNetVConnection.h | 5 +----
iocore/net/P_UnixPollDescriptor.h | 5 +----
iocore/net/P_UnixUDPConnection.h | 5 +----
iocore/net/SSLDynlock.h | 5 +----
iocore/net/SSLSessionCache.h | 5 +----
iocore/utils/I_OneWayMultiTunnel.h | 4 +---
iocore/utils/I_OneWayTunnel.h | 5 +----
lib/bindings/bindings.h | 5 +----
lib/bindings/lua.h | 5 +----
lib/bindings/metrics.h | 5 +----
lib/bindings/repl.h | 5 +----
lib/cppapi/include/atscppapi/AsyncHttpFetch.h | 4 ----
lib/cppapi/include/atscppapi/AsyncTimer.h | 4 ----
.../atscppapi/CaseInsensitiveStringComparator.h | 4 ----
lib/cppapi/include/atscppapi/ClientRequest.h | 4 ----
lib/cppapi/include/atscppapi/GlobalPlugin.h | 4 ----
lib/cppapi/include/atscppapi/Headers.h | 4 ----
lib/cppapi/include/atscppapi/HttpMethod.h | 4 ----
lib/cppapi/include/atscppapi/HttpStatus.h | 4 ----
lib/cppapi/include/atscppapi/HttpVersion.h | 4 ----
lib/cppapi/include/atscppapi/InterceptPlugin.h | 4 ----
lib/cppapi/include/atscppapi/Logger.h | 4 ----
lib/cppapi/include/atscppapi/Plugin.h | 4 ----
lib/cppapi/include/atscppapi/PluginInit.h | 4 ----
lib/cppapi/include/atscppapi/RemapPlugin.h | 4 ----
lib/cppapi/include/atscppapi/Request.h | 4 ----
lib/cppapi/include/atscppapi/Response.h | 4 ----
lib/cppapi/include/atscppapi/Stat.h | 4 ----
lib/cppapi/include/atscppapi/Transaction.h | 4 ----
lib/cppapi/include/atscppapi/Url.h | 4 ----
lib/cppapi/include/atscppapi/noncopyable.h | 4 ----
lib/cppapi/include/atscppapi/utils.h | 4 ----
lib/cppapi/include/logging_internal.h | 4 ----
lib/cppapi/include/utils_internal.h | 4 ----
lib/raft/raft.h | 4 +---
lib/raft/raft_impl.h | 4 +---
lib/records/I_RecAlarms.h | 5 +----
lib/records/I_RecCore.h | 5 +----
lib/records/I_RecDefs.h | 5 +----
lib/records/I_RecEvents.h | 5 +----
lib/records/I_RecHttp.h | 5 +----
lib/records/I_RecLocal.h | 5 +----
lib/records/I_RecMutex.h | 5 +----
lib/records/I_RecProcess.h | 5 +----
lib/records/I_RecSignals.h | 5 +----
lib/records/P_RecCore.h | 5 +----
lib/records/P_RecDefs.h | 5 +----
lib/records/P_RecFile.h | 5 +----
lib/records/P_RecLocal.h | 5 +----
lib/records/P_RecMessage.h | 5 +----
lib/records/P_RecProcess.h | 5 +----
lib/records/P_RecUtils.h | 5 +----
lib/ts/Allocator.h | 5 +----
lib/ts/Arena.h | 5 +----
lib/ts/BaseLogFile.h | 4 +---
lib/ts/Bitops.h | 5 +----
lib/ts/BufferWriter.h | 5 +----
lib/ts/ConsistentHash.h | 5 +----
lib/ts/ContFlags.h | 5 +----
lib/ts/CryptoHash.h | 5 +----
lib/ts/Diags.h | 4 +---
lib/ts/DynArray.h | 5 +----
lib/ts/EventNotify.h | 5 +----
lib/ts/Hash.h | 5 +----
lib/ts/HashFNV.h | 5 +----
lib/ts/HashMD5.h | 5 +----
lib/ts/HashSip.h | 5 +----
lib/ts/History.h | 5 +----
lib/ts/HostLookup.h | 5 +----
lib/ts/INK_MD5.h | 5 +----
lib/ts/I_Layout.h | 5 +----
lib/ts/I_Version.h | 5 +----
lib/ts/InkErrno.h | 5 +----
lib/ts/IntrusiveDList.h | 7 ++-----
lib/ts/IpMap.h | 21 +++++++++------------
lib/ts/IpMapConf.h | 2 ++
lib/ts/JeAllocator.h | 5 +----
lib/ts/List.h | 5 +----
lib/ts/MMH.h | 5 +----
lib/ts/MT_hashtable.h | 5 +----
lib/ts/MatcherUtils.h | 5 +----
lib/ts/MemArena.h | 5 +----
lib/ts/ParseRules.h | 5 +----
lib/ts/PriorityQueue.h | 5 +----
lib/ts/Ptr.h | 5 +----
lib/ts/RawHashTable.h | 5 +----
lib/ts/RbTree.h | 5 +----
lib/ts/Regex.h | 5 +----
lib/ts/Regression.h | 5 +----
lib/ts/Result.h | 5 +----
lib/ts/SHA256.h | 5 +----
lib/ts/SimpleTokenizer.h | 5 +----
lib/ts/SourceLocation.h | 5 +----
lib/ts/TestBox.h | 6 ++----
lib/ts/TextBuffer.h | 5 +----
lib/ts/Tokenizer.h | 5 +----
lib/ts/Trie.h | 5 +----
lib/ts/TsBuffer.h | 7 ++-----
lib/ts/X509HostnameValidator.h | 5 +----
lib/ts/apidefs.h.in | 5 +----
lib/ts/defalloc.h | 5 +----
lib/ts/fastlz.h | 5 +----
lib/ts/hugepages.h | 5 +----
lib/ts/ink_aiocb.h | 5 +----
lib/ts/ink_align.h | 5 +----
lib/ts/ink_apidefs.h | 5 +----
lib/ts/ink_args.h | 5 +----
lib/ts/ink_assert.h | 5 +----
lib/ts/ink_atomic.h | 5 +----
lib/ts/ink_base64.h | 5 +----
lib/ts/ink_cap.h | 5 +----
lib/ts/ink_code.h | 4 +---
lib/ts/ink_defs.h | 5 +----
lib/ts/ink_error.h | 5 +----
lib/ts/ink_exception.h | 2 ++
lib/ts/ink_file.h | 5 +----
lib/ts/ink_hash_table.h | 4 +---
lib/ts/ink_hrtime.h | 5 +----
lib/ts/ink_inet.h | 5 +----
lib/ts/ink_inout.h | 5 +----
lib/ts/ink_llqueue.h | 5 +----
lib/ts/ink_lockfile.h | 5 +----
lib/ts/ink_memory.h | 5 +----
lib/ts/ink_mutex.h | 5 +----
lib/ts/ink_platform.h | 5 +----
lib/ts/ink_queue.h | 5 +----
lib/ts/ink_rand.h | 5 +----
lib/ts/ink_resolver.h | 5 +----
lib/ts/ink_resource.h | 5 +----
lib/ts/ink_rwlock.h | 5 +----
lib/ts/ink_sock.h | 5 +----
lib/ts/ink_sprintf.h | 5 +----
lib/ts/ink_stack_trace.h | 5 +----
lib/ts/ink_string++.h | 5 +----
lib/ts/ink_string.h | 5 +----
lib/ts/ink_sys_control.h | 5 +----
lib/ts/ink_syslog.h | 5 +----
lib/ts/ink_thread.h | 5 +----
lib/ts/ink_time.h | 5 +----
lib/ts/ink_uuid.h | 2 ++
lib/ts/signals.h | 5 +----
lib/tsconfig/TsConfigGrammar.h | 5 +----
lib/wccp/Wccp.h | 6 ++----
lib/wccp/WccpLocal.h | 7 ++-----
lib/wccp/WccpMeta.h | 5 ++---
lib/wccp/WccpUtil.h | 5 +----
mgmt/FileManager.h | 5 +----
mgmt/RecordsConfig.h | 5 +----
mgmt/Rollback.h | 4 +---
mgmt/api/CoreAPI.h | 5 +----
mgmt/api/CoreAPIShared.h | 5 +----
mgmt/api/EventCallback.h | 5 +----
mgmt/api/EventControlMain.h | 5 +----
mgmt/api/GenericParser.h | 5 +----
mgmt/api/NetworkMessage.h | 5 +----
mgmt/api/NetworkUtilsLocal.h | 5 +----
mgmt/api/NetworkUtilsRemote.h | 5 +----
mgmt/api/include/mgmtapi.h | 5 +----
mgmt/utils/ExpandingArray.h | 5 +----
mgmt/utils/MgmtHashTable.h | 5 +----
mgmt/utils/MgmtMarshall.h | 5 +----
mgmt/utils/MgmtSocket.h | 5 +----
plugins/background_fetch/configs.h | 5 +----
plugins/background_fetch/headers.h | 5 +----
plugins/background_fetch/rules.h | 5 +----
plugins/experimental/balancer/balancer.h | 5 +----
plugins/experimental/cachekey/cachekey.h | 5 +----
plugins/experimental/cachekey/common.h | 5 +----
plugins/experimental/cachekey/configs.h | 5 +----
plugins/experimental/cachekey/pattern.h | 5 +----
.../collapsed_connection/P_collapsed_connection.h | 5 +----
plugins/experimental/geoip_acl/lulu.h | 5 +----
plugins/experimental/mysql_remap/default.h | 5 +----
plugins/experimental/mysql_remap/lib/dictionary.h | 5 +----
plugins/experimental/mysql_remap/lib/iniparser.h | 5 +----
plugins/experimental/ssl_cert_loader/ats-util.h | 5 +----
plugins/experimental/tls_bridge/regex.h | 5 +----
plugins/experimental/url_sig/url_sig.h | 5 +----
plugins/gzip/configuration.h | 5 +----
plugins/gzip/misc.h | 5 +----
plugins/header_rewrite/condition.h | 5 +----
plugins/header_rewrite/conditions.h | 5 +----
plugins/header_rewrite/expander.h | 5 +----
plugins/header_rewrite/factory.h | 5 +----
plugins/header_rewrite/lulu.h | 5 +----
plugins/header_rewrite/matcher.h | 5 +----
plugins/header_rewrite/operator.h | 5 +----
plugins/header_rewrite/operators.h | 5 +----
plugins/header_rewrite/parser.h | 5 +----
plugins/header_rewrite/regex_helper.h | 5 +----
plugins/header_rewrite/resources.h | 5 +----
plugins/header_rewrite/ruleset.h | 5 +----
plugins/header_rewrite/statement.h | 5 +----
plugins/header_rewrite/value.h | 5 +----
plugins/s3_auth/aws_auth_v4.h | 4 +---
plugins/s3_auth/aws_auth_v4_wrap.h | 5 +----
plugins/s3_auth/unit-tests/test_aws_auth_v4.h | 5 +----
proxy/CacheControl.h | 5 +----
proxy/CompletionUtil.h | 5 +----
proxy/ControlBase.h | 5 +----
proxy/ControlMatcher.h | 5 +----
proxy/CoreUtils.h | 5 +----
proxy/EventName.h | 5 +----
proxy/FetchSM.h | 5 +----
proxy/HostStatus.h | 5 +----
proxy/IPAllow.h | 5 +----
proxy/InkAPIInternal.h | 5 +----
proxy/Main.h | 5 +----
proxy/Milestones.h | 5 +----
proxy/ParentConsistentHash.h | 5 +----
proxy/ParentRoundRobin.h | 5 +----
proxy/ParentSelection.h | 5 +----
proxy/Plugin.h | 5 +----
proxy/PluginVC.h | 5 +----
proxy/Prefetch.h | 5 +----
proxy/ProtocolProbeSessionAccept.h | 5 +----
proxy/ProxyClientSession.h | 5 +----
proxy/ProxyClientTransaction.h | 5 +----
proxy/RegressionSM.h | 5 +----
proxy/ReverseProxy.h | 5 +----
proxy/Show.h | 5 +----
proxy/StatPages.h | 5 +----
proxy/TestPreProc.h | 5 +----
proxy/TimeTrace.h | 7 +------
proxy/Transform.h | 5 +----
proxy/TransformInternal.h | 5 +----
proxy/UDPAPIClientTest.h | 1 +
proxy/UDPAPITest.h | 1 +
proxy/UnixCompletionUtil.h | 4 +---
proxy/api/ts/InkAPIPrivateIOCore.h | 5 +----
proxy/api/ts/TsException.h | 5 +----
proxy/api/ts/experimental.h | 4 +---
proxy/api/ts/remap.h | 4 +---
proxy/api/ts/ts.h | 5 +----
proxy/hdrs/HTTP.h | 5 +----
proxy/hdrs/HdrHeap.h | 4 +---
proxy/hdrs/HdrTest.h | 5 +----
proxy/hdrs/HdrToken.h | 5 +----
proxy/hdrs/HdrUtils.h | 5 +----
proxy/hdrs/HttpCompat.h | 5 +----
proxy/hdrs/MIME.h | 5 +----
proxy/hdrs/URL.h | 5 +----
proxy/http/Http1ClientSession.h | 5 +----
proxy/http/Http1ClientTransaction.h | 5 +----
proxy/http/HttpBodyFactory.h | 5 +----
proxy/http/HttpCacheSM.h | 5 +----
proxy/http/HttpConfig.h | 4 +---
proxy/http/HttpConnectionCount.h | 5 +----
proxy/http/HttpDebugNames.h | 5 +----
proxy/http/HttpPages.h | 5 +----
proxy/http/HttpProxyAPIEnums.h | 5 +++--
proxy/http/HttpProxyServerMain.h | 2 ++
proxy/http/HttpSM.h | 4 +---
proxy/http/HttpServerSession.h | 4 +---
proxy/http/HttpSessionAccept.h | 5 +----
proxy/http/HttpSessionManager.h | 5 +----
proxy/http/HttpTransact.h | 5 +----
proxy/http/HttpTransactCache.h | 5 +----
proxy/http/HttpTransactHeaders.h | 5 +----
proxy/http/HttpTunnel.h | 5 +----
proxy/http/HttpUpdateSM.h | 5 +----
proxy/http/remap/AclFiltering.h | 5 +----
proxy/http/remap/RemapConfig.h | 5 +----
proxy/http/remap/RemapPluginInfo.h | 5 +----
proxy/http/remap/RemapPlugins.h | 5 +----
proxy/http/remap/RemapProcessor.h | 5 +----
proxy/http/remap/UrlMapping.h | 5 +----
proxy/http/remap/UrlMappingPathIndex.h | 5 +----
proxy/http/remap/UrlRewrite.h | 5 +----
proxy/http2/HPACK.h | 5 +----
proxy/http2/HTTP2.h | 5 +----
proxy/http2/Http2ClientSession.h | 5 +----
proxy/http2/Http2ConnectionState.h | 5 +----
proxy/http2/Http2DebugNames.h | 5 +----
proxy/http2/Http2DependencyTree.h | 4 +---
proxy/http2/Http2SessionAccept.h | 5 +----
proxy/http2/Http2Stream.h | 5 +----
proxy/http2/HuffmanCodec.h | 5 +----
proxy/logging/Log.h | 5 +----
proxy/logging/LogAccess.h | 5 +----
proxy/logging/LogAccessHttp.h | 5 +----
proxy/logging/LogAccessTest.h | 5 +----
proxy/logging/LogBindings.h | 5 +----
proxy/logging/LogBuffer.h | 4 +---
proxy/logging/LogBufferSink.h | 5 +----
proxy/logging/LogCollationAccept.h | 5 +----
proxy/logging/LogCollationBase.h | 5 +----
proxy/logging/LogCollationClientSM.h | 5 +----
proxy/logging/LogCollationHostSM.h | 5 +----
proxy/logging/LogConfig.h | 5 +----
proxy/logging/LogField.h | 5 +----
proxy/logging/LogFieldAliasMap.h | 4 +---
proxy/logging/LogFile.h | 5 +----
proxy/logging/LogFilter.h | 5 +----
proxy/logging/LogFormat.h | 5 +----
proxy/logging/LogHost.h | 5 +----
proxy/logging/LogLimits.h | 5 +----
proxy/logging/LogObject.h | 5 +----
proxy/logging/LogSock.h | 5 +----
proxy/logging/LogUtils.h | 4 +---
proxy/shared/DiagsConfig.h | 6 ++----
tools/http_load/timers.h | 5 +----
407 files changed, 405 insertions(+), 1574 deletions(-)
diff --git a/cmd/traffic_cache_tool/CacheStore.h b/cmd/traffic_cache_tool/CacheStore.h
index 0e870ff..8998077 100644
--- a/cmd/traffic_cache_tool/CacheStore.h
+++ b/cmd/traffic_cache_tool/CacheStore.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(CACHE_STORE_H)
-#define CACHE_STORE_H
+#pragma once
#include <vector>
@@ -47,5 +46,3 @@ class CacheStore
};
};
}
-
-#endif // CACHE_STORE_H
diff --git a/cmd/traffic_cache_tool/Command.h b/cmd/traffic_cache_tool/Command.h
index c454721..e0ef9e6 100644
--- a/cmd/traffic_cache_tool/Command.h
+++ b/cmd/traffic_cache_tool/Command.h
@@ -28,8 +28,7 @@
#include <memory.h>
#include <tsconfig/Errata.h>
-#if !defined(CACHE_TOOL_COMMAND_H)
-#define CACHE_TOOL_COMMAND_H
+#pragma once
namespace ts
{
// Because in C+11 std::max is not constexpr
@@ -231,4 +230,3 @@ CommandTable::setArgIndex(int n)
return *this;
}
}
-#endif
diff --git a/cmd/traffic_cache_tool/File.h b/cmd/traffic_cache_tool/File.h
index fe59d59..bfce16f 100644
--- a/cmd/traffic_cache_tool/File.h
+++ b/cmd/traffic_cache_tool/File.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(ATS_FILE_HEADER)
-#define ATS_FILE_HEADER
+#pragma once
#include <ts/ink_memory.h>
#include <sys/stat.h>
@@ -212,5 +211,3 @@ inline BulkFile::BulkFile(super &&that) : super(that)
/* ------------------------------------------------------------------- */
} // namespace
/* ------------------------------------------------------------------- */
-
-#endif
diff --git a/cmd/traffic_crashlog/traffic_crashlog.h b/cmd/traffic_crashlog/traffic_crashlog.h
index 2def980..0d1551e 100644
--- a/cmd/traffic_crashlog/traffic_crashlog.h
+++ b/cmd/traffic_crashlog/traffic_crashlog.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __TRAFFIC_CRASHLOG_H__
-#define __TRAFFIC_CRASHLOG_H__
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_memory.h"
@@ -75,5 +74,3 @@ bool crashlog_write_regions(FILE *, const crashlog_target &);
bool crashlog_write_registers(FILE *, const crashlog_target &);
bool crashlog_write_siginfo(FILE *, const crashlog_target &);
bool crashlog_write_uname(FILE *, const crashlog_target &);
-
-#endif /* __TRAFFIC_CRASHLOG_H__ */
diff --git a/cmd/traffic_ctl/traffic_ctl.h b/cmd/traffic_ctl/traffic_ctl.h
index f2d19b4..b5a5a1d 100644
--- a/cmd/traffic_ctl/traffic_ctl.h
+++ b/cmd/traffic_ctl/traffic_ctl.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _TRAFFIC_CTRL_H_
-#define _TRAFFIC_CTRL_H_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/Diags.h"
@@ -212,5 +211,3 @@ int subcommand_host(unsigned argc, const char **argv);
#define CTRL_EX_UNIMPLEMENTED 3
#define CTRL_EX_USAGE EX_USAGE
#define CTRL_EX_UNAVAILABLE 69
-
-#endif /* _TRAFFIC_CTRL_H_ */
diff --git a/cmd/traffic_manager/MgmtHandlers.h b/cmd/traffic_manager/MgmtHandlers.h
index 7d9b833..72b8f2a 100644
--- a/cmd/traffic_manager/MgmtHandlers.h
+++ b/cmd/traffic_manager/MgmtHandlers.h
@@ -21,12 +21,9 @@
limitations under the License.
*/
-#ifndef _MGMT_HANDLERS_H_
-#define _MGMT_HANDLERS_H_
+#pragma once
extern int aconf_port_arg;
void *mgmt_synthetic_main(void *);
bool api_socket_is_restricted();
-
-#endif
diff --git a/cmd/traffic_manager/metrics.h b/cmd/traffic_manager/metrics.h
index 8a41551..4b67d45 100644
--- a/cmd/traffic_manager/metrics.h
+++ b/cmd/traffic_manager/metrics.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B
-#define METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B
+#pragma once
#include "bindings/bindings.h"
#include "bindings/metrics.h"
@@ -35,5 +34,3 @@ bool metrics_binding_configure(BindingInstance &binding);
// Evaluate the metrics in this binding instance.
void metrics_binding_evaluate(BindingInstance &binding);
-
-#endif /* METRICS_H_D289E71B_AAC5_4CF3_9954_D54EDED60D1B */
diff --git a/example/cppapi/websocket/WSBuffer.h b/example/cppapi/websocket/WSBuffer.h
index 3608efe..4b12f16 100644
--- a/example/cppapi/websocket/WSBuffer.h
+++ b/example/cppapi/websocket/WSBuffer.h
@@ -22,8 +22,6 @@
*/
#pragma once
-#ifndef WSBUFFER_H_20F6C829_0736_47D3_A5D2_7130D4D99CC0
-#define WSBUFFER_H_20F6C829_0736_47D3_A5D2_7130D4D99CC0
#include <string>
@@ -89,5 +87,3 @@ private:
int frame_; // frame type of current message
std::string msg_buf_; // decoded message data
};
-
-#endif /* WSBUFFER_H_20F6C829_0736_47D3_A5D2_7130D4D99CC0 */
diff --git a/example/cppapi/websocket/WebSocket.h b/example/cppapi/websocket/WebSocket.h
index 2c65c4a..33f55ba 100644
--- a/example/cppapi/websocket/WebSocket.h
+++ b/example/cppapi/websocket/WebSocket.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef WEBSOCKET_H_3AE11C09_90DC_4BC6_A297_B38C3B8AEFBF
-#define WEBSOCKET_H_3AE11C09_90DC_4BC6_A297_B38C3B8AEFBF
+#pragma once
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/InterceptPlugin.h>
@@ -65,5 +64,3 @@ public:
void handleReadRequestHeadersPreRemap(Transaction &transaction);
};
-
-#endif /* WEBSOCKET_H_3AE11C09_90DC_4BC6_A297_B38C3B8AEFBF */
diff --git a/example/thread_pool/thread.h b/example/thread_pool/thread.h
index 1e6ed99..369461f 100644
--- a/example/thread_pool/thread.h
+++ b/example/thread_pool/thread.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _THREAD_H_
-#define _THREAD_H_
+#pragma once
#define PLUGIN_NAME "psi"
@@ -79,5 +78,3 @@ void thread_signal_job();
void thread_init();
void thread_loop(void *arg);
-
-#endif
diff --git a/iocore/aio/I_AIO.h b/iocore/aio/I_AIO.h
index 70d5c6f..b4f87a5 100644
--- a/iocore/aio/I_AIO.h
+++ b/iocore/aio/I_AIO.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#if !defined(_I_AIO_h_)
-#define _I_AIO_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_EventSystem.h"
@@ -153,4 +152,3 @@ int ink_aio_readv(AIOCallback *op,
int fromAPI = 0); // fromAPI is a boolean to indicate if this is from a API call such as upload proxy feature
int ink_aio_writev(AIOCallback *op, int fromAPI = 0);
AIOCallback *new_AIOCallback(void);
-#endif
diff --git a/iocore/aio/P_AIO.h b/iocore/aio/P_AIO.h
index edc28fa..aafb6f9 100644
--- a/iocore/aio/P_AIO.h
+++ b/iocore/aio/P_AIO.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef _P_AIO_h_
-#define _P_AIO_h_
+#pragma once
#include "P_EventSystem.h"
#include "I_AIO.h"
@@ -156,5 +155,3 @@ enum aio_stat_enum {
AIO_STAT_COUNT
};
extern RecRawStatBlock *aio_rsb;
-
-#endif
diff --git a/iocore/cache/I_Cache.h b/iocore/cache/I_Cache.h
index a7eff69..c0e7904 100644
--- a/iocore/cache/I_Cache.h
+++ b/iocore/cache/I_Cache.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_CACHE_H__
-#define _I_CACHE_H__
+#pragma once
#include "ts/ink_platform.h"
#include "I_EventSystem.h"
@@ -222,5 +221,3 @@ struct CacheVConnection : public VConnection {
void ink_cache_init(ModuleVersion version);
extern inkcoreapi CacheProcessor cacheProcessor;
extern Continuation *cacheRegexDeleteCont;
-
-#endif /* _I_CACHE_H__ */
diff --git a/iocore/cache/I_CacheDefs.h b/iocore/cache/I_CacheDefs.h
index 0995dc6..42b4823 100644
--- a/iocore/cache/I_CacheDefs.h
+++ b/iocore/cache/I_CacheDefs.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_CACHE_DEFS_H__
-#define _I_CACHE_DEFS_H__
+#pragma once
#include "ts/CryptoHash.h"
@@ -139,4 +138,3 @@ struct HttpCacheKey {
word(2) - tag (lower bits), hosttable hash (upper bits)
word(3) - ram cache hash, lookaside cache
*/
-#endif // __CACHE_DEFS_H__
diff --git a/iocore/cache/I_Store.h b/iocore/cache/I_Store.h
index 9f9ef21..2e0c444 100644
--- a/iocore/cache/I_Store.h
+++ b/iocore/cache/I_Store.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef _Store_h_
-#define _Store_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/Result.h"
@@ -271,5 +270,3 @@ struct Store {
// store either free or in the cache, can be stolen for reconfiguration
void stealStore(Store &s, int blocks);
-
-#endif
diff --git a/iocore/cache/P_Cache.h b/iocore/cache/P_Cache.h
index e7f39f1..f3ae4d2 100644
--- a/iocore/cache/P_Cache.h
+++ b/iocore/cache/P_Cache.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_CACHE_H__
-#define _P_CACHE_H__
+#pragma once
#include "ts/ink_platform.h"
#include "P_EventSystem.h"
@@ -41,4 +40,3 @@
#include "P_CacheInternal.h"
#include "P_CacheHosting.h"
#include "P_CacheHttp.h"
-#endif /* _P_CACHE_H */
diff --git a/iocore/cache/P_CacheArray.h b/iocore/cache/P_CacheArray.h
index 705ea17..bed2908 100644
--- a/iocore/cache/P_CacheArray.h
+++ b/iocore/cache/P_CacheArray.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __CACHE_ARRAY_H__
-#define __CACHE_ARRAY_H__
+#pragma once
#define FAST_DATA_SIZE 4
@@ -183,5 +182,3 @@ CacheArray<T>::resize(int new_size)
size = new_size;
}
}
-
-#endif /* __CACHE_ARRAY_H__ */
diff --git a/iocore/cache/P_CacheBC.h b/iocore/cache/P_CacheBC.h
index 1af43c1..ac4d925 100644
--- a/iocore/cache/P_CacheBC.h
+++ b/iocore/cache/P_CacheBC.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_CACHE_BC_H__
-#define _P_CACHE_BC_H__
+#pragma once
namespace cache_bc
{
@@ -136,5 +135,3 @@ Doc_v23::hdr()
}
} // namespace cache_bc
-
-#endif /* _P_CACHE_BC_H__ */
diff --git a/iocore/cache/P_CacheDir.h b/iocore/cache/P_CacheDir.h
index 24213ae..ba1c26d 100644
--- a/iocore/cache/P_CacheDir.h
+++ b/iocore/cache/P_CacheDir.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_CACHE_DIR_H__
-#define _P_CACHE_DIR_H__
+#pragma once
#include "P_CacheHttp.h"
@@ -353,5 +352,3 @@ dir_bucket_row(Dir *b, int64_t i)
{
return dir_in_seg(b, i);
}
-
-#endif /* _P_CACHE_DIR_H__ */
diff --git a/iocore/cache/P_CacheDisk.h b/iocore/cache/P_CacheDisk.h
index b110880..5fa285d 100644
--- a/iocore/cache/P_CacheDisk.h
+++ b/iocore/cache/P_CacheDisk.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_CACHE_DISK_H__
-#define _P_CACHE_DISK_H__
+#pragma once
#include "I_Cache.h"
@@ -122,5 +121,3 @@ struct CacheDisk : public Continuation {
DiskVol *get_diskvol(int vol_number);
void incrErrors(const AIOCallback *io);
};
-
-#endif
diff --git a/iocore/cache/P_CacheHosting.h b/iocore/cache/P_CacheHosting.h
index 62e335c..0f6d9bb 100644
--- a/iocore/cache/P_CacheHosting.h
+++ b/iocore/cache/P_CacheHosting.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __P_CACHE_HOSTING_H__
-#define __P_CACHE_HOSTING_H__
+#pragma once
#include "P_Cache.h"
#include "ts/MatcherUtils.h"
#include "ts/HostLookup.h"
@@ -208,5 +207,3 @@ struct ConfigVolumes {
num_stream_volumes = 0;
}
};
-
-#endif
diff --git a/iocore/cache/P_CacheHttp.h b/iocore/cache/P_CacheHttp.h
index 09408b9..24ddabe 100644
--- a/iocore/cache/P_CacheHttp.h
+++ b/iocore/cache/P_CacheHttp.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __CACHE_HTTP_H__
-#define __CACHE_HTTP_H__
+#pragma once
#include "P_CacheArray.h"
#include "HTTP.h"
@@ -84,5 +83,3 @@ CacheHTTPInfoVector::get(int idx)
ink_assert(idx < xcount);
return &data[idx].alternate;
}
-
-#endif /* __CACHE_HTTP_H__ */
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index 14b6c37..a43953c 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_CACHE_INTERNAL_H__
-#define _P_CACHE_INTERNAL_H__
+#pragma once
#include "ts/ink_platform.h"
#include "ts/InkErrno.h"
@@ -1021,5 +1020,3 @@ cache_hash(const CryptoHash &hash)
}
LINK_DEFINITION(CacheVC, opendir_link)
-
-#endif /* _P_CACHE_INTERNAL_H__ */
diff --git a/iocore/cache/P_CacheTest.h b/iocore/cache/P_CacheTest.h
index 652fdd2..0eb122e 100644
--- a/iocore/cache/P_CacheTest.h
+++ b/iocore/cache/P_CacheTest.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __P_CACHE_TEST_H__
-#define __P_CACHE_TEST_H__
+#pragma once
#include "P_Cache.h"
#include "RegressionSM.h"
@@ -147,5 +146,3 @@ struct CacheTestSM : public RegressionSM {
} _sm(_t);
void force_link_CacheTest();
-
-#endif /* __P_CACHE_TEST_H__ */
diff --git a/iocore/cache/P_CacheVol.h b/iocore/cache/P_CacheVol.h
index 6ffb63b..81def96 100644
--- a/iocore/cache/P_CacheVol.h
+++ b/iocore/cache/P_CacheVol.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_CACHE_VOL_H__
-#define _P_CACHE_VOL_H__
+#pragma once
#define CACHE_BLOCK_SHIFT 9
#define CACHE_BLOCK_SIZE (1 << CACHE_BLOCK_SHIFT) // 512, smallest sector size
@@ -506,5 +505,3 @@ Vol::round_to_approx_size(uint32_t l)
uint32_t ll = round_to_approx_dir_size(l);
return ROUND_TO_SECTOR(this, ll);
}
-
-#endif /* _P_CACHE_VOL_H__ */
diff --git a/iocore/cache/P_RamCache.h b/iocore/cache/P_RamCache.h
index 823b789..46088f4 100644
--- a/iocore/cache/P_RamCache.h
+++ b/iocore/cache/P_RamCache.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_RAM_CACHE_H__
-#define _P_RAM_CACHE_H__
+#pragma once
#include "I_Cache.h"
@@ -43,5 +42,3 @@ struct RamCache {
RamCache *new_RamCacheLRU();
RamCache *new_RamCacheCLFUS();
-
-#endif /* _P_RAM_CACHE_H__ */
diff --git a/iocore/dns/I_DNS.h b/iocore/dns/I_DNS.h
index db04a55..9c01168 100644
--- a/iocore/dns/I_DNS.h
+++ b/iocore/dns/I_DNS.h
@@ -28,12 +28,9 @@
****************************************************************************/
-#ifndef _I_DNS_h_
-#define _I_DNS_h_
+#pragma once
#include "I_EventSystem.h"
#include "I_HostDB.h"
#include "I_Net.h"
#include "I_DNSProcessor.h"
-
-#endif //_I_DNS_h_
diff --git a/iocore/dns/I_DNSProcessor.h b/iocore/dns/I_DNSProcessor.h
index 034551c..1e191b9 100644
--- a/iocore/dns/I_DNSProcessor.h
+++ b/iocore/dns/I_DNSProcessor.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_DNSProcessor_h_
-#define _I_DNSProcessor_h_
+#pragma once
#include "SRV.h"
@@ -206,5 +205,3 @@ DNSProcessor::Options::reset()
}
void ink_dns_init(ModuleVersion version);
-
-#endif
diff --git a/iocore/dns/I_SplitDNS.h b/iocore/dns/I_SplitDNS.h
index 2142de2..c038ea2 100644
--- a/iocore/dns/I_SplitDNS.h
+++ b/iocore/dns/I_SplitDNS.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _I_SPLIT_DNS_H_
-#define _I_SPLIT_DNS_H_
+#pragma once
#include "I_SplitDNSProcessor.h"
@@ -37,5 +36,3 @@
#define SPLITDNS_MODULE_MINOR_VERSION 0
#define SPLITDNS_MODULE_VERSION \
makeModuleVersion(SPLITDNS_MODULE_MAJOR_VERSION, SPLITDNS_MODULE_MINOR_VERSION, PUBLIC_MODULE_HEADER)
-
-#endif //_I_SPLIT_DNS_H_
diff --git a/iocore/dns/I_SplitDNSProcessor.h b/iocore/dns/I_SplitDNSProcessor.h
index 78ecd65..e1e011c 100644
--- a/iocore/dns/I_SplitDNSProcessor.h
+++ b/iocore/dns/I_SplitDNSProcessor.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _I_SPLIT_DNSProcessor_H_
-#define _I_SPLIT_DNSProcessor_H_
+#pragma once
struct SplitDNS;
@@ -53,5 +52,3 @@ struct SplitDNSConfig {
static int gsplit_dns_enabled;
};
-
-#endif
diff --git a/iocore/dns/P_DNS.h b/iocore/dns/P_DNS.h
index 941b248..87a08cd 100644
--- a/iocore/dns/P_DNS.h
+++ b/iocore/dns/P_DNS.h
@@ -27,8 +27,7 @@
****************************************************************************/
-#if !defined(_P_DNS_h_)
-#define _P_DNS_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_DNS.h"
@@ -38,5 +37,3 @@
#include "P_DNSConnection.h"
#include "P_DNSProcessor.h"
#include "SRV.h"
-
-#endif // _P_DNS_h_
diff --git a/iocore/dns/P_DNSConnection.h b/iocore/dns/P_DNSConnection.h
index c2aa57b..b0d1e55 100644
--- a/iocore/dns/P_DNSConnection.h
+++ b/iocore/dns/P_DNSConnection.h
@@ -28,8 +28,7 @@
struct DNSConnection
**************************************************************************/
-#ifndef __P_DNSCONNECTION_H__
-#define __P_DNSCONNECTION_H__
+#pragma once
#include "I_EventSystem.h"
#include "I_DNSProcessor.h"
@@ -152,5 +151,3 @@ DNSConnection::Options::setLocalIpv6(sockaddr const *ip)
_local_ipv6 = ip;
return *this;
}
-
-#endif /*_P_DNSConnection_h*/
diff --git a/iocore/dns/P_DNSProcessor.h b/iocore/dns/P_DNSProcessor.h
index f4b6795..6e7b25d 100644
--- a/iocore/dns/P_DNSProcessor.h
+++ b/iocore/dns/P_DNSProcessor.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_P_DNSProcessor_h_)
-#define _P_DNSProcessor_h_
+#pragma once
/*
#include "I_DNS.h"
@@ -341,5 +340,3 @@ DNSHandler::DNSHandler()
#define DOT_SEPARATED(_x) \
((unsigned char *)&(_x))[0], ((unsigned char *)&(_x))[1], ((unsigned char *)&(_x))[2], ((unsigned char *)&(_x))[3]
-
-#endif
diff --git a/iocore/dns/P_SplitDNS.h b/iocore/dns/P_SplitDNS.h
index 23059c6..6cf92f1 100644
--- a/iocore/dns/P_SplitDNS.h
+++ b/iocore/dns/P_SplitDNS.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _P_SPLIT_DNS_H_
-#define _P_SPLIT_DNS_H_
+#pragma once
#include "P_DNS.h"
#include "I_SplitDNS.h"
@@ -41,5 +40,3 @@
#undef SPLITDNS_MODULE_VERSION
#define SPLITDNS_MODULE_VERSION \
makeModuleVersion(SPLITDNS_MODULE_MAJOR_VERSION, SPLITDNS_MODULE_MINOR_VERSION, PRIVATE_MODULE_HEADER)
-
-#endif /* _P_SPLIT_DNS_H_ */
diff --git a/iocore/dns/P_SplitDNSProcessor.h b/iocore/dns/P_SplitDNSProcessor.h
index 16481b4..d86a47e 100644
--- a/iocore/dns/P_SplitDNSProcessor.h
+++ b/iocore/dns/P_SplitDNSProcessor.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _P_SPLIT_DNSProcessor_H_
-#define _P_SPLIT_DNSProcessor_H_
+#pragma once
/*
#include "P_DNS.h"
@@ -232,5 +231,3 @@ TS_INLINE SplitDNSRecord::~SplitDNSRecord()
SplitDNSRecord *createDefaultServer();
void reloadDefaultParent(char *val);
void reloadParentFile();
-
-#endif
diff --git a/iocore/dns/SRV.h b/iocore/dns/SRV.h
index 79ccbc5..78f6f55 100644
--- a/iocore/dns/SRV.h
+++ b/iocore/dns/SRV.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _SRV_h_
-#define _SRV_h_
+#pragma once
#include <vector>
#include "ts/ink_platform.h"
@@ -53,5 +52,3 @@ struct SRVHosts {
unsigned int srv_hosts_length = 0;
std::vector<SRV> hosts;
};
-
-#endif
diff --git a/iocore/eventsystem/I_Action.h b/iocore/eventsystem/I_Action.h
index 81335b5..de0cc7a 100644
--- a/iocore/eventsystem/I_Action.h
+++ b/iocore/eventsystem/I_Action.h
@@ -22,8 +22,7 @@
*/
-#ifndef _I_Action_h_
-#define _I_Action_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_Thread.h"
@@ -201,5 +200,3 @@ public:
// MAKE_ACTION_RESULT(ACTION_RESULT_HOST_DB_BASE + 0)
#define MAKE_ACTION_RESULT(_x) (Action *)(((uintptr_t)((_x << 1) + 1)))
-
-#endif /*_Action_h_*/
diff --git a/iocore/eventsystem/I_Continuation.h b/iocore/eventsystem/I_Continuation.h
index a7ecbd3..a14ba1c 100644
--- a/iocore/eventsystem/I_Continuation.h
+++ b/iocore/eventsystem/I_Continuation.h
@@ -33,8 +33,7 @@
*/
-#ifndef _I_Continuation_h_
-#define _I_Continuation_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/List.h"
@@ -212,5 +211,3 @@ inline Continuation::Continuation(ProxyMutex *amutex) : mutex(amutex)
// Pick up the control flags from the creating thread
this->control_flags.set_flags(get_cont_flags().get_flags());
}
-
-#endif /*_Continuation_h_*/
diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h
index c0c5c74..510a19d 100644
--- a/iocore/eventsystem/I_EThread.h
+++ b/iocore/eventsystem/I_EThread.h
@@ -22,8 +22,7 @@
*/
-#ifndef _EThread_h_
-#define _EThread_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_rand.h"
@@ -474,4 +473,3 @@ operator new(size_t, ink_dummy_for_new *p)
#define ETHREAD_GET_PTR(thread, offset) ((void *)((char *)(thread) + (offset)))
extern EThread *this_ethread();
-#endif /*_EThread_h_*/
diff --git a/iocore/eventsystem/I_Event.h b/iocore/eventsystem/I_Event.h
index cfb99ba..f67f03e 100644
--- a/iocore/eventsystem/I_Event.h
+++ b/iocore/eventsystem/I_Event.h
@@ -22,8 +22,7 @@
*/
-#ifndef _Event_h_
-#define _Event_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_Action.h"
@@ -278,5 +277,3 @@ extern ClassAllocator<Event> eventAllocator;
::_a.free(_p); \
else \
THREAD_FREE(_p, _a, _t)
-
-#endif /*_Event_h_*/
diff --git a/iocore/eventsystem/I_EventProcessor.h b/iocore/eventsystem/I_EventProcessor.h
index d9575ad..2b0779d 100644
--- a/iocore/eventsystem/I_EventProcessor.h
+++ b/iocore/eventsystem/I_EventProcessor.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_EventProcessor_h_
-#define _I_EventProcessor_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_Continuation.h"
@@ -401,5 +400,3 @@ private:
};
extern inkcoreapi class EventProcessor eventProcessor;
-
-#endif /*_EventProcessor_h_*/
diff --git a/iocore/eventsystem/I_EventSystem.h b/iocore/eventsystem/I_EventSystem.h
index fa22471..d4f3967 100644
--- a/iocore/eventsystem/I_EventSystem.h
+++ b/iocore/eventsystem/I_EventSystem.h
@@ -22,7 +22,7 @@
*/
-#ifndef _I_EventSystem_h
+#pragma once
#define _I_EventSystem_h
#include "ts/ink_platform.h"
@@ -50,5 +50,3 @@
makeModuleVersion(EVENT_SYSTEM_MODULE_MAJOR_VERSION, EVENT_SYSTEM_MODULE_MINOR_VERSION, PUBLIC_MODULE_HEADER)
void ink_event_system_init(ModuleVersion version);
-
-#endif
diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h
index be2ced7..0bc85e8 100644
--- a/iocore/eventsystem/I_IOBuffer.h
+++ b/iocore/eventsystem/I_IOBuffer.h
@@ -36,7 +36,7 @@
*/
-#if !defined(I_IOBuffer_h)
+#pragma once
#define I_IOBuffer_h
#include "ts/ink_platform.h"
@@ -1401,4 +1401,3 @@ extern IOBufferBlock *iobufferblock_clone(IOBufferBlock *b, int64_t offset, int6
*/
extern IOBufferBlock *iobufferblock_skip(IOBufferBlock *b, int64_t *poffset, int64_t *plen, int64_t write);
-#endif
diff --git a/iocore/eventsystem/I_Lock.h b/iocore/eventsystem/I_Lock.h
index 0a0247b..1897952 100644
--- a/iocore/eventsystem/I_Lock.h
+++ b/iocore/eventsystem/I_Lock.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_Lock_h_
-#define _I_Lock_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/Diags.h"
@@ -655,5 +654,3 @@ new_ProxyMutex()
m->init();
return m;
}
-
-#endif // _Lock_h_
diff --git a/iocore/eventsystem/I_MIOBufferWriter.h b/iocore/eventsystem/I_MIOBufferWriter.h
index 213255b..ce9ccb3 100644
--- a/iocore/eventsystem/I_MIOBufferWriter.h
+++ b/iocore/eventsystem/I_MIOBufferWriter.h
@@ -1,6 +1,3 @@
-#if !defined I_MIOBUFFERWRITER_H_
-#define I_MIOBUFFERWRITER_H_
-
/** @file
Buffer Writer for an MIOBuffer.
@@ -24,6 +21,8 @@
limitations under the License.
*/
+#pragma once
+
#include <cstring>
#include <ts/ink_assert.h>
@@ -172,5 +171,3 @@ private:
// INTERNAL - Overload removed, make sure it's not used.
MIOBufferWriter &write(size_t n);
};
-
-#endif // include once
diff --git a/iocore/eventsystem/I_PriorityEventQueue.h b/iocore/eventsystem/I_PriorityEventQueue.h
index 886dea6..0af97ae 100644
--- a/iocore/eventsystem/I_PriorityEventQueue.h
+++ b/iocore/eventsystem/I_PriorityEventQueue.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_PriorityEventQueue_h_
-#define _I_PriorityEventQueue_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_Event.h"
@@ -120,5 +119,3 @@ struct PriorityEventQueue {
PriorityEventQueue();
};
-
-#endif
diff --git a/iocore/eventsystem/I_Processor.h b/iocore/eventsystem/I_Processor.h
index 53be785..ec497e1 100644
--- a/iocore/eventsystem/I_Processor.h
+++ b/iocore/eventsystem/I_Processor.h
@@ -22,8 +22,7 @@
*/
-#ifndef _I_Processor_h_
-#define _I_Processor_h_
+#pragma once
#include "ts/ink_platform.h"
@@ -114,5 +113,3 @@ public:
protected:
Processor();
};
-
-#endif //_I_Processor_h_
diff --git a/iocore/eventsystem/I_ProtectedQueue.h b/iocore/eventsystem/I_ProtectedQueue.h
index 483c872..eab2de4 100644
--- a/iocore/eventsystem/I_ProtectedQueue.h
+++ b/iocore/eventsystem/I_ProtectedQueue.h
@@ -32,8 +32,7 @@
****************************************************************************/
-#ifndef _I_ProtectedQueue_h_
-#define _I_ProtectedQueue_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_Event.h"
@@ -57,5 +56,3 @@ struct ProtectedQueue {
};
void flush_signals(EThread *t);
-
-#endif
diff --git a/iocore/eventsystem/I_ProxyAllocator.h b/iocore/eventsystem/I_ProxyAllocator.h
index 3650f2a..7a4ad21 100644
--- a/iocore/eventsystem/I_ProxyAllocator.h
+++ b/iocore/eventsystem/I_ProxyAllocator.h
@@ -28,8 +28,7 @@
*****************************************************************************/
-#ifndef _I_ProxyAllocator_h_
-#define _I_ProxyAllocator_h_
+#pragma once
#include "ts/ink_platform.h"
@@ -122,5 +121,3 @@ void thread_freeup(Allocator &a, ProxyAllocator &l);
if (_t->_a.allocated > thread_freelist_high_watermark) \
thread_freeup(::_a, _t->_a); \
} while (0)
-
-#endif /* _ProxyAllocator_h_ */
diff --git a/iocore/eventsystem/I_SocketManager.h b/iocore/eventsystem/I_SocketManager.h
index d041b72..47ec70c 100644
--- a/iocore/eventsystem/I_SocketManager.h
+++ b/iocore/eventsystem/I_SocketManager.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#ifndef _I_SocketManager_h_
-#define _I_SocketManager_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_EventSystem.h"
@@ -152,5 +151,3 @@ struct SocketManager {
};
extern SocketManager socketManager;
-
-#endif /*_SocketManager_h_*/
diff --git a/iocore/eventsystem/I_Tasks.h b/iocore/eventsystem/I_Tasks.h
index aa91e43..9b34c2c 100644
--- a/iocore/eventsystem/I_Tasks.h
+++ b/iocore/eventsystem/I_Tasks.h
@@ -22,8 +22,7 @@
*/
-#if !defined(I_Tasks_h)
-#define I_Tasks_h
+#pragma once
#include "I_EventSystem.h"
@@ -36,5 +35,3 @@ public:
};
extern TasksProcessor tasksProcessor;
-
-#endif
diff --git a/iocore/eventsystem/I_Thread.h b/iocore/eventsystem/I_Thread.h
index 26573c4..b3ba652 100644
--- a/iocore/eventsystem/I_Thread.h
+++ b/iocore/eventsystem/I_Thread.h
@@ -56,8 +56,7 @@
*/
-#ifndef _I_Thread_h
-#define _I_Thread_h
+#pragma once
#if !defined(_I_EventSystem_h) && !defined(_P_EventSystem_h)
#error "include I_EventSystem.h or P_EventSystem.h"
@@ -187,5 +186,3 @@ Thread::get_hrtime_updated()
{
return cur_time = ink_get_hrtime_internal();
}
-
-#endif /*_I_Thread_h*/
diff --git a/iocore/eventsystem/I_VConnection.h b/iocore/eventsystem/I_VConnection.h
index 006867f..c668164 100644
--- a/iocore/eventsystem/I_VConnection.h
+++ b/iocore/eventsystem/I_VConnection.h
@@ -22,8 +22,7 @@
*/
-#if !defined(_I_VConnection_h_)
-#define _I_VConnection_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_EventSystem.h"
@@ -442,5 +441,3 @@ struct DummyVConnection : public AnnotatedVConnection {
DummyVConnection(ProxyMutex *m) : AnnotatedVConnection(m) {}
};
-
-#endif /*_I_VConnection_h_*/
diff --git a/iocore/eventsystem/I_VIO.h b/iocore/eventsystem/I_VIO.h
index 3497d7e..9e51722 100644
--- a/iocore/eventsystem/I_VIO.h
+++ b/iocore/eventsystem/I_VIO.h
@@ -22,7 +22,7 @@
*/
-#if !defined(I_VIO_h)
+#pragma once
#define I_VIO_h
#include "ts/ink_platform.h"
@@ -221,4 +221,3 @@ public:
};
#include "I_VConnection.h"
-#endif
diff --git a/iocore/eventsystem/P_EventSystem.h b/iocore/eventsystem/P_EventSystem.h
index c23d584..972c589 100644
--- a/iocore/eventsystem/P_EventSystem.h
+++ b/iocore/eventsystem/P_EventSystem.h
@@ -28,7 +28,7 @@
**************************************************************************/
-#ifndef _P_EventSystem_h
+#pragma once
#define _P_EventSystem_h
#include "ts/ink_platform.h"
@@ -48,5 +48,3 @@
#undef EVENT_SYSTEM_MODULE_VERSION
#define EVENT_SYSTEM_MODULE_VERSION \
makeModuleVersion(EVENT_SYSTEM_MODULE_MAJOR_VERSION, EVENT_SYSTEM_MODULE_MINOR_VERSION, PRIVATE_MODULE_HEADER)
-
-#endif
diff --git a/iocore/eventsystem/P_Freer.h b/iocore/eventsystem/P_Freer.h
index 8562931..47c39e6 100644
--- a/iocore/eventsystem/P_Freer.h
+++ b/iocore/eventsystem/P_Freer.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_P_Freer_h_)
-#define _P_Freer_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_Tasks.h"
@@ -132,5 +131,3 @@ new_Derefer(C *ap, ink_hrtime t)
{
eventProcessor.schedule_in(new DereferContinuation<C>(ap), t, ET_TASK);
}
-
-#endif /* _Freer_h_ */
diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index 5e063ff..8c61444 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_P_IOBuffer_h)
-#define _P_IOBuffer_h
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_resource.h"
@@ -1203,5 +1202,3 @@ TS_INLINE
MIOBufferAccessor::~MIOBufferAccessor()
{
}
-
-#endif
diff --git a/iocore/eventsystem/P_ProtectedQueue.h b/iocore/eventsystem/P_ProtectedQueue.h
index af2d741..d66771d 100644
--- a/iocore/eventsystem/P_ProtectedQueue.h
+++ b/iocore/eventsystem/P_ProtectedQueue.h
@@ -27,8 +27,7 @@
****************************************************************************/
-#ifndef _P_ProtectedQueue_h_
-#define _P_ProtectedQueue_h_
+#pragma once
#include "I_EventSystem.h"
@@ -91,5 +90,3 @@ ProtectedQueue::dequeue_local()
}
return e;
}
-
-#endif
diff --git a/iocore/eventsystem/P_Thread.h b/iocore/eventsystem/P_Thread.h
index 259f1ad..6e2a907 100644
--- a/iocore/eventsystem/P_Thread.h
+++ b/iocore/eventsystem/P_Thread.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef _P_Thread_h_
-#define _P_Thread_h_
+#pragma once
#include "I_Thread.h"
@@ -48,5 +47,3 @@ this_thread()
{
return (Thread *)ink_thread_getspecific(Thread::thread_data_key);
}
-
-#endif //_P_Thread_h_
diff --git a/iocore/eventsystem/P_UnixEThread.h b/iocore/eventsystem/P_UnixEThread.h
index 1303ded..4943f87 100644
--- a/iocore/eventsystem/P_UnixEThread.h
+++ b/iocore/eventsystem/P_UnixEThread.h
@@ -28,8 +28,7 @@
*****************************************************************************/
-#ifndef _P_UnixEThread_h_
-#define _P_UnixEThread_h_
+#pragma once
#include "I_EThread.h"
#include "I_EventProcessor.h"
@@ -191,5 +190,3 @@ EThread::set_tail_handler(LoopTailHandler *handler)
{
ink_atomic_swap(&tail_cb, handler);
}
-
-#endif /*_EThread_h_*/
diff --git a/iocore/eventsystem/P_UnixEvent.h b/iocore/eventsystem/P_UnixEvent.h
index ae960db..df8cdee 100644
--- a/iocore/eventsystem/P_UnixEvent.h
+++ b/iocore/eventsystem/P_UnixEvent.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_UnixEvent_h_
-#define _P_UnixEvent_h_
+#pragma once
TS_INLINE Event *
Event::init(Continuation *c, ink_hrtime atimeout_at, ink_hrtime aperiod)
@@ -46,5 +45,3 @@ TS_INLINE
Event::Event() : in_the_prot_queue(false), in_the_priority_queue(false), immediate(false), globally_allocated(true), in_heap(false)
{
}
-
-#endif /*_UnixEvent_h_*/
diff --git a/iocore/eventsystem/P_UnixEventProcessor.h b/iocore/eventsystem/P_UnixEventProcessor.h
index 5ada1cd..8d574df 100644
--- a/iocore/eventsystem/P_UnixEventProcessor.h
+++ b/iocore/eventsystem/P_UnixEventProcessor.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_UnixEventProcessor_h_
-#define _P_UnixEventProcessor_h_
+#pragma once
#include "ts/ink_align.h"
#include "I_EventProcessor.h"
@@ -138,5 +137,3 @@ EventProcessor::schedule_every(Continuation *cont, ink_hrtime t, EventType et, i
else
return schedule(e->init(cont, Thread::get_hrtime() + t, t), et);
}
-
-#endif
diff --git a/iocore/eventsystem/P_UnixSocketManager.h b/iocore/eventsystem/P_UnixSocketManager.h
index f9aac98..276cc3a 100644
--- a/iocore/eventsystem/P_UnixSocketManager.h
+++ b/iocore/eventsystem/P_UnixSocketManager.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef _P_UnixSocketManager_h_
-#define _P_UnixSocketManager_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_sock.h"
@@ -527,5 +526,3 @@ SocketManager::dup(int s)
} while (res == -EINTR);
return res;
}
-
-#endif /*P_UnixSocketManager_h_ */
diff --git a/iocore/eventsystem/P_VConnection.h b/iocore/eventsystem/P_VConnection.h
index a9eea74..f12d9db 100644
--- a/iocore/eventsystem/P_VConnection.h
+++ b/iocore/eventsystem/P_VConnection.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(P_VConnection_h)
-#define P_VConnection_h
+#pragma once
#include "I_EventSystem.h"
TS_INLINE const char *
@@ -95,4 +94,3 @@ VConnection::reenable_re(VIO *vio)
{
reenable(vio);
}
-#endif
diff --git a/iocore/eventsystem/P_VIO.h b/iocore/eventsystem/P_VIO.h
index a2e0a2c..c45443f 100644
--- a/iocore/eventsystem/P_VIO.h
+++ b/iocore/eventsystem/P_VIO.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(P_VIO_h)
-#define P_VIO_h
+#pragma once
#include "I_VIO.h"
TS_INLINE
@@ -122,5 +121,3 @@ VIO::reenable_re()
if (vc_server)
vc_server->reenable_re(this);
}
-
-#endif /* #if !defined ( P_VIO_h) */
diff --git a/iocore/hostdb/I_HostDB.h b/iocore/hostdb/I_HostDB.h
index bc41ea9..f21e870 100644
--- a/iocore/hostdb/I_HostDB.h
+++ b/iocore/hostdb/I_HostDB.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef _I_HostDB_h_
-#define _I_HostDB_h_
+#pragma once
#include "I_EventSystem.h"
#include "I_Net.h"
@@ -44,5 +43,3 @@
#define HOSTDB_MODULE_MINOR_VERSION 1
#define HOSTDB_MODULE_VERSION makeModuleVersion(HOSTDB_MODULE_MAJOR_VERSION, HOSTDB_MODULE_MINOR_VERSION, PUBLIC_MODULE_HEADER)
-
-#endif /* _I_HostDB_h_ */
diff --git a/iocore/hostdb/I_HostDBProcessor.h b/iocore/hostdb/I_HostDBProcessor.h
index e1eb246..19b682f 100644
--- a/iocore/hostdb/I_HostDBProcessor.h
+++ b/iocore/hostdb/I_HostDBProcessor.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_HostDBProcessor_h_
-#define _I_HostDBProcessor_h_
+#pragma once
#include "ts/HashFNV.h"
#include "ts/ink_time.h"
@@ -523,5 +522,3 @@ void run_HostDBTest();
extern inkcoreapi HostDBProcessor hostDBProcessor;
void ink_hostdb_init(ModuleVersion version);
-
-#endif
diff --git a/iocore/hostdb/P_HostDB.h b/iocore/hostdb/P_HostDB.h
index 29c1a2e..bc3f481 100644
--- a/iocore/hostdb/P_HostDB.h
+++ b/iocore/hostdb/P_HostDB.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef _P_HostDB_h_
-#define _P_HostDB_h_
+#pragma once
#include "ts/ink_platform.h"
@@ -51,4 +50,3 @@
Ptr<HostDBInfo> probe(ProxyMutex *mutex, CryptoHash const &hash, bool ignore_timeout);
void make_crypto_hash(CryptoHash &hash, const char *hostname, int len, int port, const char *pDNSServers, HostDBMark mark);
-#endif
diff --git a/iocore/hostdb/P_HostDBProcessor.h b/iocore/hostdb/P_HostDBProcessor.h
index 7af9568..eef4603 100644
--- a/iocore/hostdb/P_HostDBProcessor.h
+++ b/iocore/hostdb/P_HostDBProcessor.h
@@ -25,8 +25,7 @@
P_HostDBProcessor.h
****************************************************************************/
-#ifndef _P_HostDBProcessor_h_
-#define _P_HostDBProcessor_h_
+#pragma once
#include "I_HostDBProcessor.h"
#include <ts/TsBuffer.h>
@@ -534,5 +533,3 @@ HostDBContinuation::key_partition()
{
return hostDB.refcountcache->partition_for_key(hash.hash.fold());
}
-
-#endif /* _P_HostDBProcessor_h_ */
diff --git a/iocore/hostdb/P_RefCountCache.h b/iocore/hostdb/P_RefCountCache.h
index 617f718..34686b3 100644
--- a/iocore/hostdb/P_RefCountCache.h
+++ b/iocore/hostdb/P_RefCountCache.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef _P_RefCountCache_h_
-#define _P_RefCountCache_h_
+#pragma once
#include <I_EventSystem.h>
#include <P_EventSystem.h> // TODO: less? just need ET_TASK
@@ -617,5 +616,3 @@ LoadRefCountCacheFromPath(RefCountCache<CacheEntryType> &cache, std::string dirn
socketManager.close(fd);
return 0;
}
-
-#endif /* _P_RefCountCache_h_ */
diff --git a/iocore/hostdb/P_RefCountCacheSerializer.h b/iocore/hostdb/P_RefCountCacheSerializer.h
index 9be439b..e16edce 100644
--- a/iocore/hostdb/P_RefCountCacheSerializer.h
+++ b/iocore/hostdb/P_RefCountCacheSerializer.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef P_REFCOUNTCACHESERIALIZER_H_07545391_276D_4BD3_B0DD_EF6B0007071D
-#define P_REFCOUNTCACHESERIALIZER_H_07545391_276D_4BD3_B0DD_EF6B0007071D
+#pragma once
#include "P_RefCountCache.h"
@@ -322,5 +321,3 @@ RefCountCacheSerializer<C>::write_to_disk(const void *ptr, size_t n_bytes)
}
return 0;
}
-
-#endif /* P_REFCOUNTCACHESERIALIZER_H_07545391_276D_4BD3_B0DD_EF6B0007071D */
diff --git a/iocore/net/BIO_fastopen.h b/iocore/net/BIO_fastopen.h
index 523a7b9..58e66d9 100644
--- a/iocore/net/BIO_fastopen.h
+++ b/iocore/net/BIO_fastopen.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef BIO_FASTOPEN_H_DA87E080_DB75_4C9C_959A_40243592D454
-#define BIO_FASTOPEN_H_DA87E080_DB75_4C9C_959A_40243592D454
+#pragma once
#include <openssl/bio.h>
@@ -34,5 +33,3 @@ const BIO_METHOD *BIO_s_fastopen();
#if !defined(BIO_set_conn_address)
#define BIO_set_conn_address(b, addr) BIO_ctrl(b, BIO_C_SET_CONNECT, 2, (char *)addr)
#endif
-
-#endif /* BIO_FASTOPEN_H_DA87E080_DB75_4C9C_959A_40243592D454 */
diff --git a/iocore/net/I_Net.h b/iocore/net/I_Net.h
index 152a80b..ef122b8 100644
--- a/iocore/net/I_Net.h
+++ b/iocore/net/I_Net.h
@@ -38,8 +38,7 @@
has socks and ssl support.
*/
-#ifndef __I_NET_H_
-#define __I_NET_H_
+#pragma once
#include "ts/I_Version.h"
#include "I_EventSystem.h"
@@ -95,4 +94,3 @@ extern int net_throttle_delay;
#include "I_SessionAccept.h"
void ink_net_init(ModuleVersion version);
-#endif
diff --git a/iocore/net/I_NetProcessor.h b/iocore/net/I_NetProcessor.h
index 0d72080..d76172a 100644
--- a/iocore/net/I_NetProcessor.h
+++ b/iocore/net/I_NetProcessor.h
@@ -22,8 +22,7 @@
*/
-#ifndef __I_NETPROCESSOR_H__
-#define __I_NETPROCESSOR_H__
+#pragma once
#include "I_EventSystem.h"
#include "I_Socks.h"
@@ -269,5 +268,3 @@ extern inkcoreapi NetProcessor &netProcessor;
*/
extern inkcoreapi NetProcessor &sslNetProcessor;
-
-#endif
diff --git a/iocore/net/I_NetVConnection.h b/iocore/net/I_NetVConnection.h
index 62e6754..f18213e 100644
--- a/iocore/net/I_NetVConnection.h
+++ b/iocore/net/I_NetVConnection.h
@@ -22,8 +22,7 @@
*/
-#ifndef __NETVCONNECTION_H__
-#define __NETVCONNECTION_H__
+#pragma once
#include "ts/ink_inet.h"
#include "I_Action.h"
@@ -680,5 +679,3 @@ NetVConnection::trapWriteBufferEmpty(int event)
{
write_buffer_empty_event = event;
}
-
-#endif
diff --git a/iocore/net/I_SessionAccept.h b/iocore/net/I_SessionAccept.h
index c71ffe3..2814269 100644
--- a/iocore/net/I_SessionAccept.h
+++ b/iocore/net/I_SessionAccept.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef I_SessionAccept_H_
-#define I_SessionAccept_H_
+#pragma once
#include "I_Net.h"
#include "I_VConnection.h"
@@ -79,5 +78,3 @@ public:
private:
virtual int mainEvent(int event, void *netvc) = 0;
};
-
-#endif /* I_SessionAccept_H_ */
diff --git a/iocore/net/I_Socks.h b/iocore/net/I_Socks.h
index 3e2d6db..a89e009 100644
--- a/iocore/net/I_Socks.h
+++ b/iocore/net/I_Socks.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __I_SOCKS_H__
-#define __I_SOCKS_H__
+#pragma once
/*When this is being compiled with TS, we enable more features the use
non modularized stuff. namely:
@@ -68,5 +67,3 @@ struct SocksAddrType {
SocksAddrType() : type(SOCKS_ATYPE_NONE) { addr.buf = 0; }
~SocksAddrType() { reset(); }
};
-
-#endif
diff --git a/iocore/net/I_UDPConnection.h b/iocore/net/I_UDPConnection.h
index 850414b..a25b404 100644
--- a/iocore/net/I_UDPConnection.h
+++ b/iocore/net/I_UDPConnection.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef __I_UDPCONNECTION_H_
-#define __I_UDPCONNECTION_H_
+#pragma once
#include "I_EventSystem.h"
#define INK_ETHERNET_MTU_SIZE 1472
@@ -106,4 +105,3 @@ public:
};
extern UDPConnection *new_UDPConnection(int fd);
-#endif //__I_UDPCONNECTION_H_
diff --git a/iocore/net/I_UDPNet.h b/iocore/net/I_UDPNet.h
index 5e3c748..41e3cca 100644
--- a/iocore/net/I_UDPNet.h
+++ b/iocore/net/I_UDPNet.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef __UDPNET_H_
-#define __UDPNET_H_
+#pragma once
#include "ts/I_Version.h"
#include "I_EventSystem.h"
@@ -107,5 +106,3 @@ extern EventType ET_UDP;
#include "I_UDPPacket.h"
#include "I_UDPConnection.h"
-
-#endif //__UDPNET_H_
diff --git a/iocore/net/I_UDPPacket.h b/iocore/net/I_UDPPacket.h
index df899ff..bcb7543 100644
--- a/iocore/net/I_UDPPacket.h
+++ b/iocore/net/I_UDPPacket.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef __I_UDPPACKET_H_
-#define __I_UDPPACKET_H_
+#pragma once
#include "I_UDPConnection.h"
/** @name UDPPacket
@@ -109,4 +108,3 @@ extern UDPPacket *new_incoming_UDPPacket(struct sockaddr *from, char *buf, int l
extern UDPPacket *new_incoming_UDPPacket(struct sockaddr *from, Ptr<IOBufferBlock> &block);
//@}
-#endif //__I_UDPPACKET_H_
diff --git a/iocore/net/P_CompletionUtil.h b/iocore/net/P_CompletionUtil.h
index 03128c2..6db23dc 100644
--- a/iocore/net/P_CompletionUtil.h
+++ b/iocore/net/P_CompletionUtil.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _COMPLETION_UTIL_H_
-#define _COMPLETION_UTIL_H_
+#pragma once
// interface
class completionUtil
{
@@ -43,5 +42,3 @@ public:
};
#include "P_UnixCompletionUtil.h"
-
-#endif
diff --git a/iocore/net/P_Connection.h b/iocore/net/P_Connection.h
index 662929a..e9fd351 100644
--- a/iocore/net/P_Connection.h
+++ b/iocore/net/P_Connection.h
@@ -47,8 +47,7 @@
**************************************************************************/
-#ifndef __CONNECTION_H__
-#define __CONNECTION_H__
+#pragma once
#include "ts/ink_platform.h"
@@ -176,5 +175,3 @@ struct Server : public Connection {
Server() : Connection(), http_accept_filter(false) { ink_zero(accept_addr); }
};
-
-#endif /*_Connection_h*/
diff --git a/iocore/net/P_Net.h b/iocore/net/P_Net.h
index fea3250..c237b7e 100644
--- a/iocore/net/P_Net.h
+++ b/iocore/net/P_Net.h
@@ -27,8 +27,7 @@
**************************************************************************/
-#ifndef __P_NET_H__
-#define __P_NET_H__
+#pragma once
// Net Stats
@@ -125,5 +124,3 @@ extern RecRawStatBlock *net_rsb;
/// Default amount of buffer space to use for the initial read on an incoming connection.
/// This is an IOBufferBlock index, not the size in bytes.
static size_t const CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX = BUFFER_SIZE_INDEX_4K;
-
-#endif
diff --git a/iocore/net/P_NetAccept.h b/iocore/net/P_NetAccept.h
index d14c5a5..fc72c86 100644
--- a/iocore/net/P_NetAccept.h
+++ b/iocore/net/P_NetAccept.h
@@ -36,8 +36,7 @@
****************************************************************************/
-#ifndef __P_NETACCEPT_H__
-#define __P_NETACCEPT_H__
+#pragma once
#include <vector>
#include "ts/ink_platform.h"
@@ -117,5 +116,3 @@ struct NetAccept : public Continuation {
extern Ptr<ProxyMutex> naVecMutex;
extern std::vector<NetAccept *> naVec;
-
-#endif
diff --git a/iocore/net/P_NetVCTest.h b/iocore/net/P_NetVCTest.h
index 09d8068..af0dc5e 100644
--- a/iocore/net/P_NetVCTest.h
+++ b/iocore/net/P_NetVCTest.h
@@ -34,8 +34,7 @@
****************************************************************************/
-#ifndef _P_NET_VC_TEST_H_
-#define _P_NET_VC_TEST_H_
+#pragma once
#include "ts/ink_platform.h"
@@ -141,5 +140,3 @@ public:
const char *module_name;
const char *debug_tag;
};
-
-#endif
diff --git a/iocore/net/P_OCSPStapling.h b/iocore/net/P_OCSPStapling.h
index 366c4a8..1078d8d 100644
--- a/iocore/net/P_OCSPStapling.h
+++ b/iocore/net/P_OCSPStapling.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef __P_OCSPSTAPLING_H__
-#define __P_OCSPSTAPLING_H__
+#pragma once
#include <openssl/ssl.h>
@@ -29,5 +28,3 @@ void ssl_stapling_ex_init();
bool ssl_stapling_init_cert(SSL_CTX *ctx, X509 *cert, const char *certname);
void ocsp_update();
int ssl_callback_ocsp_stapling(SSL *);
-
-#endif /* __P_OCSPSTAPLING_H__ */
diff --git a/iocore/net/P_SNIActionPerformer.h b/iocore/net/P_SNIActionPerformer.h
index 863fad6..f876a70 100644
--- a/iocore/net/P_SNIActionPerformer.h
+++ b/iocore/net/P_SNIActionPerformer.h
@@ -28,8 +28,7 @@
Description:
SNI based Configuration in ATS
****************************************************************************/
-#ifndef __P_ACTIONPROCESSOR_H__
-#define __P_ACTIONPROCESSOR_H__
+#pragma once
#include "I_EventSystem.h"
#include "ts/Map.h"
@@ -96,5 +95,3 @@ public:
SNIActionPerformer() = default;
static void PerformAction(Continuation *cont, cchar *servername);
};
-
-#endif
diff --git a/iocore/net/P_SSLCertLookup.h b/iocore/net/P_SSLCertLookup.h
index eb6056e..acb88ad 100644
--- a/iocore/net/P_SSLCertLookup.h
+++ b/iocore/net/P_SSLCertLookup.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __P_SSLCERTLOOKUP_H__
-#define __P_SSLCERTLOOKUP_H__
+#pragma once
#include "ProxyConfig.h"
#include "P_SSLUtils.h"
@@ -111,4 +110,3 @@ void ticket_block_free(void *ptr);
ssl_ticket_key_block *ticket_block_alloc(unsigned count);
ssl_ticket_key_block *ticket_block_create(char *ticket_key_data, int ticket_key_len);
ssl_ticket_key_block *ssl_create_ticket_keyblock(const char *ticket_key_path);
-#endif /* __P_SSLCERTLOOKUP_H__ */
diff --git a/iocore/net/P_SSLClientUtils.h b/iocore/net/P_SSLClientUtils.h
index 32d2a1d..84d17d9 100644
--- a/iocore/net/P_SSLClientUtils.h
+++ b/iocore/net/P_SSLClientUtils.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef IOCORE_NET_P_SSLCLIENTUTILS_H_
-#define IOCORE_NET_P_SSLCLIENTUTILS_H_
+#pragma once
#include "ts/ink_config.h"
#include "ts/Diags.h"
@@ -38,5 +37,3 @@
SSL_CTX *SSLInitClientContext(const struct SSLConfigParams *param);
int verify_callback(int preverify_ok, X509_STORE_CTX *ctx);
-
-#endif /* IOCORE_NET_P_SSLCLIENTUTILS_H_ */
diff --git a/iocore/net/P_SSLConfig.h b/iocore/net/P_SSLConfig.h
index 8ceac41..b17078d 100644
--- a/iocore/net/P_SSLConfig.h
+++ b/iocore/net/P_SSLConfig.h
@@ -28,8 +28,7 @@
Description:
SSL Configurations
****************************************************************************/
-#ifndef __P_SSLCONFIG_H__
-#define __P_SSLCONFIG_H__
+#pragma once
#include "ProxyConfig.h"
#include "SSLSessionCache.h"
@@ -199,5 +198,3 @@ private:
};
extern SSLSessionCache *session_cache;
-
-#endif
diff --git a/iocore/net/P_SSLNetAccept.h b/iocore/net/P_SSLNetAccept.h
index 6c59bb7..9cf0a08 100644
--- a/iocore/net/P_SSLNetAccept.h
+++ b/iocore/net/P_SSLNetAccept.h
@@ -36,8 +36,7 @@
****************************************************************************/
-#if !defined(_SSLNetAccept_h_)
-#define _SSLNetAccept_h_
+#pragma once
#include "ts/ink_platform.h"
#include "P_Connection.h"
@@ -54,4 +53,3 @@ struct SSLNetAccept : public NetAccept {
SSLNetAccept(const NetProcessor::AcceptOptions &opt);
virtual ~SSLNetAccept();
};
-#endif
diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index 797a689..596310c 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#if !defined(_SSLNetVConnection_h_)
-#define _SSLNetVConnection_h_
+#pragma once
#include <ts/ink_platform.h>
#include <ts/apidefs.h>
@@ -360,5 +359,3 @@ private:
typedef int (SSLNetVConnection::*SSLNetVConnHandler)(int, void *);
extern ClassAllocator<SSLNetVConnection> sslNetVCAllocator;
-
-#endif /* _SSLNetVConnection_h_ */
diff --git a/iocore/net/P_SSLNextProtocolAccept.h b/iocore/net/P_SSLNextProtocolAccept.h
index a8432bb..d3ef462 100644
--- a/iocore/net/P_SSLNextProtocolAccept.h
+++ b/iocore/net/P_SSLNextProtocolAccept.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef P_SSLNextProtocolAccept_H_
-#define P_SSLNextProtocolAccept_H_
+#pragma once
#include "P_Net.h"
#include "P_EventSystem.h"
@@ -66,5 +65,3 @@ private:
friend struct SSLNextProtocolTrampoline;
};
-
-#endif /* P_SSLNextProtocolAccept_H_ */
diff --git a/iocore/net/P_SSLNextProtocolSet.h b/iocore/net/P_SSLNextProtocolSet.h
index b285cb8..c12aaa1 100644
--- a/iocore/net/P_SSLNextProtocolSet.h
+++ b/iocore/net/P_SSLNextProtocolSet.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef P_SSLNextProtocolSet_H_
-#define P_SSLNextProtocolSet_H_
+#pragma once
#include "ts/List.h"
#include "I_Net.h"
@@ -66,5 +65,3 @@ private:
NextProtocolEndpoint::list_type endpoints;
};
-
-#endif /* P_SSLNextProtocolSet_H_ */
diff --git a/iocore/net/P_SSLSNI.h b/iocore/net/P_SSLSNI.h
index ccdfe42..4b6cf5c 100644
--- a/iocore/net/P_SSLSNI.h
+++ b/iocore/net/P_SSLSNI.h
@@ -28,8 +28,7 @@
Description:
SNI based Configuration in ATS
****************************************************************************/
-#ifndef __P_SSL_SNI_H__
-#define __P_SSL_SNI_H__
+#pragma once
#include "ProxyConfig.h"
#include "ts/Map.h"
@@ -81,5 +80,3 @@ struct SNIConfig {
private:
static int configid;
};
-
-#endif
\ No newline at end of file
diff --git a/iocore/net/P_SSLUtils.h b/iocore/net/P_SSLUtils.h
index 8a41022..b358b2a 100644
--- a/iocore/net/P_SSLUtils.h
+++ b/iocore/net/P_SSLUtils.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef __P_SSLUTILS_H__
-#define __P_SSLUTILS_H__
+#pragma once
#include "ts/ink_config.h"
#include "ts/Diags.h"
@@ -280,5 +279,3 @@ public:
typedef ats_scoped_resource<ssl::detail::SCOPED_X509_TRAITS> scoped_X509;
typedef ats_scoped_resource<ssl::detail::SCOPED_BIO_TRAITS> scoped_BIO;
-
-#endif /* __P_SSLUTILS_H__ */
diff --git a/iocore/net/P_Socks.h b/iocore/net/P_Socks.h
index 59bf8fb..6242888 100644
--- a/iocore/net/P_Socks.h
+++ b/iocore/net/P_Socks.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __P_SOCKS_H__
-#define __P_SOCKS_H__
+#pragma once
#include "P_EventSystem.h"
#include "I_Socks.h"
@@ -164,5 +163,3 @@ SocksAddrType::reset()
addr.buf = 0;
type = SOCKS_ATYPE_NONE;
}
-
-#endif
diff --git a/iocore/net/P_UDPConnection.h b/iocore/net/P_UDPConnection.h
index 29abbb9..2c881c9 100644
--- a/iocore/net/P_UDPConnection.h
+++ b/iocore/net/P_UDPConnection.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef __P_UDPCONNECTION_H_
-#define __P_UDPCONNECTION_H_
+#pragma once
#include "I_UDPNet.h"
@@ -170,5 +169,3 @@ UDPConnection::setContinuation(Continuation *c)
mutex = c->mutex;
((UDPConnectionInternal *)this)->continuation = c;
}
-
-#endif //__P_UDPCONNECTION_H_
diff --git a/iocore/net/P_UDPIOEvent.h b/iocore/net/P_UDPIOEvent.h
index 85a22ed..85d2c2f 100644
--- a/iocore/net/P_UDPIOEvent.h
+++ b/iocore/net/P_UDPIOEvent.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _UDP_IO_EVENT_H_
-#define _UDP_IO_EVENT_H_
+#pragma once
// ugly -- just encapsulate the I/O result so that it can be passed
// back to the caller via continuation handler.
@@ -107,4 +106,3 @@ UDPIOEvent::free(UDPIOEvent *e)
e->mutex = nullptr;
UDPIOEventAllocator.free(e);
}
-#endif
diff --git a/iocore/net/P_UDPNet.h b/iocore/net/P_UDPNet.h
index 1b56c86..6449c6f 100644
--- a/iocore/net/P_UDPNet.h
+++ b/iocore/net/P_UDPNet.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef __P_UDPNET_H_
-#define __P_UDPNET_H_
+#pragma once
#include "ts/ink_platform.h"
#include "I_UDPNet.h"
@@ -341,5 +340,3 @@ get_UDPNetHandler(EThread *t)
{
return (UDPNetHandler *)ETHREAD_GET_PTR(t, udpNetInternal.udpNetHandler_offset);
}
-
-#endif //__P_UDPNET_H_
diff --git a/iocore/net/P_UDPPacket.h b/iocore/net/P_UDPPacket.h
index 18e216d..545b16e 100644
--- a/iocore/net/P_UDPPacket.h
+++ b/iocore/net/P_UDPPacket.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef __P_UDPPPACKET_H_
-#define __P_UDPPPACKET_H_
+#pragma once
#include "I_UDPNet.h"
@@ -265,5 +264,3 @@ new_UDPPacket()
UDPPacketInternal *p = udpPacketAllocator.alloc();
return p;
}
-
-#endif //__P_UDPPPACKET_H_
diff --git a/iocore/net/P_UnixCompletionUtil.h b/iocore/net/P_UnixCompletionUtil.h
index b926089..8bc920f 100644
--- a/iocore/net/P_UnixCompletionUtil.h
+++ b/iocore/net/P_UnixCompletionUtil.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _UNIX_COMPLETION_UTIL_H_
-#define _UNIX_COMPLETION_UTIL_H_
+#pragma once
// platform specific wrappers for dealing with I/O completion events
// passed into and back from the I/O core.
@@ -101,4 +100,3 @@ completionUtil::getError(Event *e)
UDPIOEvent *u = (UDPIOEvent *)e;
return u->getError();
}
-#endif
diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h
index f4d5d8e..083117c 100644
--- a/iocore/net/P_UnixNet.h
+++ b/iocore/net/P_UnixNet.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __P_UNIXNET_H__
-#define __P_UNIXNET_H__
+#pragma once
#include <bitset>
@@ -815,5 +814,3 @@ NetHandler::stopCop(UnixNetVConnection *netvc)
remove_from_keep_alive_queue(netvc);
remove_from_active_queue(netvc);
}
-
-#endif
diff --git a/iocore/net/P_UnixNetProcessor.h b/iocore/net/P_UnixNetProcessor.h
index dbc42ad..b076c0a 100644
--- a/iocore/net/P_UnixNetProcessor.h
+++ b/iocore/net/P_UnixNetProcessor.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __UNIXNETPROCESSOR_H__
-#define __UNIXNETPROCESSOR_H__
+#pragma once
#include "I_Net.h"
#include "P_NetAccept.h"
@@ -72,4 +71,3 @@ extern UnixNetProcessor unix_netProcessor;
extern void initialize_thread_for_net(EThread *thread);
//#include "UnixNet.h"
-#endif
diff --git a/iocore/net/P_UnixNetState.h b/iocore/net/P_UnixNetState.h
index db973b8..9b2656c 100644
--- a/iocore/net/P_UnixNetState.h
+++ b/iocore/net/P_UnixNetState.h
@@ -34,8 +34,7 @@
****************************************************************************/
-#if !defined(_UnixNetState_h_)
-#define _UnixNetState_h_
+#pragma once
#include "ts/List.h"
#include "I_VIO.h"
@@ -53,5 +52,3 @@ struct NetState {
NetState() : enabled(0), vio(VIO::NONE), in_enabled_list(0), triggered(0) {}
};
-
-#endif
diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h
index 06a2d79..27252c1 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef __P_UNIXNETVCONNECTION_H__
-#define __P_UNIXNETVCONNECTION_H__
+#pragma once
#include "ts/ink_sock.h"
#include "I_NetVConnection.h"
@@ -436,5 +435,3 @@ UnixNetVConnection::set_action(Continuation *c)
void write_to_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread);
void write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread);
-
-#endif
diff --git a/iocore/net/P_UnixPollDescriptor.h b/iocore/net/P_UnixPollDescriptor.h
index dbbd8f2..e338926 100644
--- a/iocore/net/P_UnixPollDescriptor.h
+++ b/iocore/net/P_UnixPollDescriptor.h
@@ -27,8 +27,7 @@
*****************************************************************************/
-#ifndef __P_UNIXPOLLDESCRIPTOR_H__
-#define __P_UNIXPOLLDESCRIPTOR_H__
+#pragma once
#include "ts/ink_platform.h"
@@ -138,5 +137,3 @@ private:
#endif
}
};
-
-#endif
diff --git a/iocore/net/P_UnixUDPConnection.h b/iocore/net/P_UnixUDPConnection.h
index 4815f8a..4e5e1e1 100644
--- a/iocore/net/P_UnixUDPConnection.h
+++ b/iocore/net/P_UnixUDPConnection.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef __UNIXUDPCONNECTION_H_
-#define __UNIXUDPCONNECTION_H_
+#pragma once
#include "P_UDPConnection.h"
#include "P_UDPPacket.h"
@@ -108,5 +107,3 @@ new_UDPConnection(int fd)
{
return (fd >= 0) ? new UnixUDPConnection(fd) : 0;
}
-
-#endif //__UNIXUDPCONNECTION_H_
diff --git a/iocore/net/SSLDynlock.h b/iocore/net/SSLDynlock.h
index 0f960e1..a81cc75 100644
--- a/iocore/net/SSLDynlock.h
+++ b/iocore/net/SSLDynlock.h
@@ -21,11 +21,8 @@
limitations under the License.
*/
-#ifndef __SSLDYNLOCK_H__
-#define __SSLDYNLOCK_H__
+#pragma once
extern struct CRYPTO_dynlock_value *ssl_dyn_create_callback(const char *file, int line);
extern void ssl_dyn_lock_callback(int mode, struct CRYPTO_dynlock_value *value, const char *file, int line);
extern void ssl_dyn_destroy_callback(struct CRYPTO_dynlock_value *value, const char *file, int line);
-
-#endif
diff --git a/iocore/net/SSLSessionCache.h b/iocore/net/SSLSessionCache.h
index 0ff2b66..97e150e 100644
--- a/iocore/net/SSLSessionCache.h
+++ b/iocore/net/SSLSessionCache.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef __SSLSESSIONCACHE_H__
-#define __SSLSESSIONCACHE_H__
+#pragma once
#include "ts/Map.h"
#include "ts/List.h"
@@ -161,5 +160,3 @@ private:
SSLSessionBucket *session_bucket;
size_t nbuckets;
};
-
-#endif /* __SSLSESSIONCACHE_H__ */
diff --git a/iocore/utils/I_OneWayMultiTunnel.h b/iocore/utils/I_OneWayMultiTunnel.h
index 7997549..c3df980 100644
--- a/iocore/utils/I_OneWayMultiTunnel.h
+++ b/iocore/utils/I_OneWayMultiTunnel.h
@@ -28,8 +28,7 @@
*/
-#if !defined(_I_OneWayMultiTunnel_h_)
-#define _I_OneWayMultiTunnel_h_
+#pragma once
#include "I_OneWayTunnel.h"
@@ -149,4 +148,3 @@ struct OneWayMultiTunnel : public OneWayTunnel {
};
extern ClassAllocator<OneWayMultiTunnel> OneWayMultiTunnelAllocator;
-#endif
diff --git a/iocore/utils/I_OneWayTunnel.h b/iocore/utils/I_OneWayTunnel.h
index ac732af..4e368d6 100644
--- a/iocore/utils/I_OneWayTunnel.h
+++ b/iocore/utils/I_OneWayTunnel.h
@@ -28,8 +28,7 @@
*/
-#if !defined(_I_OneWayTunnel_h_)
-#define _I_OneWayTunnel_h_
+#pragma once
#include "I_EventSystem.h"
@@ -210,5 +209,3 @@ struct OneWayTunnel : public Continuation {
OneWayTunnel(const OneWayTunnel &) = delete;
OneWayTunnel &operator=(const OneWayTunnel &) = delete;
};
-
-#endif
diff --git a/lib/bindings/bindings.h b/lib/bindings/bindings.h
index eb5000d..af7978d 100644
--- a/lib/bindings/bindings.h
+++ b/lib/bindings/bindings.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef BINDINGS_H_02DF784C_94BD_4A5C_B57A_F986F5493C6A
-#define BINDINGS_H_02DF784C_94BD_4A5C_B57A_F986F5493C6A
+#pragma once
#include <string>
#include <map>
@@ -72,5 +71,3 @@ struct BindingInstance {
private:
std::map<std::string, void *> attachments;
};
-
-#endif /* BINDINGS_H_02DF784C_94BD_4A5C_B57A_F986F5493C6A */
diff --git a/lib/bindings/lua.h b/lib/bindings/lua.h
index a6a39e1..a085a0d 100644
--- a/lib/bindings/lua.h
+++ b/lib/bindings/lua.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef LUA_H_7A9F5CCE_01C6_45C3_987A_FDCC1F437AA2
-#define LUA_H_7A9F5CCE_01C6_45C3_987A_FDCC1F437AA2
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -100,5 +99,3 @@ private:
lua_State *L;
unsigned nvals;
};
-
-#endif /* LUA_H_7A9F5CCE_01C6_45C3_987A_FDCC1F437AA2 */
diff --git a/lib/bindings/metrics.h b/lib/bindings/metrics.h
index 9e42c16..048579b 100644
--- a/lib/bindings/metrics.h
+++ b/lib/bindings/metrics.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef METRICS_H_FED1F5EA_9EDE_48E6_B05A_5DCAFD8DC319
-#define METRICS_H_FED1F5EA_9EDE_48E6_B05A_5DCAFD8DC319
+#pragma once
// Create a new metrics binding userdata object.
int lua_metrics_new(const char *prefix, lua_State *L);
@@ -36,5 +35,3 @@ void lua_metrics_register(lua_State *L);
// if the metric is named "proxy.my.great.counter", it would install
// a metrics object at the global name "proxy.my.great".
int lua_metrics_install(lua_State *L);
-
-#endif /* METRICS_H_FED1F5EA_9EDE_48E6_B05A_5DCAFD8DC319 */
diff --git a/lib/bindings/repl.h b/lib/bindings/repl.h
index 944a344..9c01ee3 100644
--- a/lib/bindings/repl.h
+++ b/lib/bindings/repl.h
@@ -21,10 +21,7 @@
* limitations under the License.
*/
-#ifndef REPL_H_DB690467_F8FE_4797_8B08_7FD1F090DBA2
-#define REPL_H_DB690467_F8FE_4797_8B08_7FD1F090DBA2
+#pragma once
// Drop this binding instance into a Lua REPL (and never come out).
void repl(BindingInstance &binding) TS_NORETURN;
-
-#endif /* REPL_H_DB690467_F8FE_4797_8B08_7FD1F090DBA2 */
diff --git a/lib/cppapi/include/atscppapi/AsyncHttpFetch.h b/lib/cppapi/include/atscppapi/AsyncHttpFetch.h
index c511c2c..0965906 100644
--- a/lib/cppapi/include/atscppapi/AsyncHttpFetch.h
+++ b/lib/cppapi/include/atscppapi/AsyncHttpFetch.h
@@ -21,8 +21,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_ASYNCHTTPFETCH_H_
-#define ATSCPPAPI_ASYNCHTTPFETCH_H_
#include <string>
#include <memory>
@@ -135,5 +133,3 @@ private:
};
} /* atscppapi */
-
-#endif /* ATSCPPAPI_ASYNCHTTPFETCH_H_ */
diff --git a/lib/cppapi/include/atscppapi/AsyncTimer.h b/lib/cppapi/include/atscppapi/AsyncTimer.h
index b80c75b..5042171 100644
--- a/lib/cppapi/include/atscppapi/AsyncTimer.h
+++ b/lib/cppapi/include/atscppapi/AsyncTimer.h
@@ -21,8 +21,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_ASYNCTIMER_H_
-#define ATSCPPAPI_ASYNCTIMER_H_
#include <string>
#include <memory>
@@ -79,5 +77,3 @@ private:
};
} /* atscppapi */
-
-#endif /* ATSCPPAPI_ASYNCTIMER_H_ */
diff --git a/lib/cppapi/include/atscppapi/CaseInsensitiveStringComparator.h b/lib/cppapi/include/atscppapi/CaseInsensitiveStringComparator.h
index a131ea0..28f95d5 100644
--- a/lib/cppapi/include/atscppapi/CaseInsensitiveStringComparator.h
+++ b/lib/cppapi/include/atscppapi/CaseInsensitiveStringComparator.h
@@ -21,8 +21,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_CASE_INSENSITIVE_STRING_COMPARATOR_H_
-#define ATSCPPAPI_CASE_INSENSITIVE_STRING_COMPARATOR_H_
#include <string>
@@ -47,5 +45,3 @@ public:
int compare(const std::string &lhs, const std::string &rhs) const;
};
}
-
-#endif
diff --git a/lib/cppapi/include/atscppapi/ClientRequest.h b/lib/cppapi/include/atscppapi/ClientRequest.h
index ef057bb..d5a2b43 100644
--- a/lib/cppapi/include/atscppapi/ClientRequest.h
+++ b/lib/cppapi/include/atscppapi/ClientRequest.h
@@ -21,8 +21,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_CLIENTREQUEST_H_
-#define ATSCPPAPI_CLIENTREQUEST_H_
#include <atscppapi/Request.h>
@@ -56,5 +54,3 @@ private:
ClientRequestState *state_;
};
}
-
-#endif /* ATSCPPAPI_CLIENTREQUEST_H_ */
diff --git a/lib/cppapi/include/atscppapi/GlobalPlugin.h b/lib/cppapi/include/atscppapi/GlobalPlugin.h
index a31fb7d..0048ac5 100644
--- a/lib/cppapi/include/atscppapi/GlobalPlugin.h
+++ b/lib/cppapi/include/atscppapi/GlobalPlugin.h
@@ -22,8 +22,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_GLOBALPLUGIN_H_
-#define ATSCPPAPI_GLOBALPLUGIN_H_
#include <atscppapi/Plugin.h>
@@ -88,5 +86,3 @@ private:
};
} /* atscppapi */
-
-#endif /* ATSCPPAPI_GLOBALPLUGIN_H_ */
diff --git a/lib/cppapi/include/atscppapi/Headers.h b/lib/cppapi/include/atscppapi/Headers.h
index 71127fc..2249f88 100644
--- a/lib/cppapi/include/atscppapi/Headers.h
+++ b/lib/cppapi/include/atscppapi/Headers.h
@@ -21,8 +21,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_HEADERS_H_
-#define ATSCPPAPI_HEADERS_H_
#include <atscppapi/noncopyable.h>
#include <string>
@@ -603,5 +601,3 @@ private:
friend class Response;
};
}
-
-#endif
diff --git a/lib/cppapi/include/atscppapi/HttpMethod.h b/lib/cppapi/include/atscppapi/HttpMethod.h
index 94d0a24..304c8d1 100644
--- a/lib/cppapi/include/atscppapi/HttpMethod.h
+++ b/lib/cppapi/include/atscppapi/HttpMethod.h
@@ -21,8 +21,6 @@
* @brief Contains an enumeration and printable strings for Http Methods.
*/
#pragma once
-#ifndef ATSCPPAPI_HTTP_METHOD_H_
-#define ATSCPPAPI_HTTP_METHOD_H_
#include <string>
@@ -53,5 +51,3 @@ enum HttpMethod {
*/
extern const std::string HTTP_METHOD_STRINGS[];
}
-
-#endif
diff --git a/lib/cppapi/include/atscppapi/HttpStatus.h b/lib/cppapi/include/atscppapi/HttpStatus.h
index 071aef1..8b38388 100644
--- a/lib/cppapi/include/atscppapi/HttpStatus.h
+++ b/lib/cppapi/include/atscppapi/HttpStatus.h
@@ -22,8 +22,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_HTTP_STATUS_H_
-#define ATSCPPAPI_HTTP_STATUS_H_
#include <string>
@@ -99,5 +97,3 @@ enum HttpStatus {
};
}
-
-#endif
diff --git a/lib/cppapi/include/atscppapi/HttpVersion.h b/lib/cppapi/include/atscppapi/HttpVersion.h
index 8cf0839..2bf6f25 100644
--- a/lib/cppapi/include/atscppapi/HttpVersion.h
+++ b/lib/cppapi/include/atscppapi/HttpVersion.h
@@ -22,8 +22,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_HTTP_VERSION_H_
-#define ATSCPPAPI_HTTP_VERSION_H_
#include <string>
@@ -47,5 +45,3 @@ enum HttpVersion {
*/
extern const std::string HTTP_VERSION_STRINGS[];
}
-
-#endif
diff --git a/lib/cppapi/include/atscppapi/InterceptPlugin.h b/lib/cppapi/include/atscppapi/InterceptPlugin.h
index fa5c3a1..0bb637e 100644
--- a/lib/cppapi/include/atscppapi/InterceptPlugin.h
+++ b/lib/cppapi/include/atscppapi/InterceptPlugin.h
@@ -21,8 +21,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_INTERCEPT_PLUGIN_H_
-#define ATSCPPAPI_INTERCEPT_PLUGIN_H_
#include <string>
#include <atscppapi/Transaction.h>
@@ -99,5 +97,3 @@ private:
};
} /* atscppapi */
-
-#endif /* ATSCPPAPI_INTERCEPT_PLUGIN_H_ */
diff --git a/lib/cppapi/include/atscppapi/Logger.h b/lib/cppapi/include/atscppapi/Logger.h
index 546bbbb..246e7d1 100644
--- a/lib/cppapi/include/atscppapi/Logger.h
+++ b/lib/cppapi/include/atscppapi/Logger.h
@@ -27,8 +27,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_LOGGER_H_
-#define ATSCPPAPI_LOGGER_H_
#include <string>
#include <atscppapi/noncopyable.h>
@@ -263,5 +261,3 @@ private:
};
} /* atscppapi */
-
-#endif /* ATSCPPAPI_LOGGER_H_ */
diff --git a/lib/cppapi/include/atscppapi/Plugin.h b/lib/cppapi/include/atscppapi/Plugin.h
index 8d596a4..fd386f2 100644
--- a/lib/cppapi/include/atscppapi/Plugin.h
+++ b/lib/cppapi/include/atscppapi/Plugin.h
@@ -24,8 +24,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_PLUGIN_H_
-#define ATSCPPAPI_PLUGIN_H_
#include <atscppapi/Request.h>
#include <atscppapi/Transaction.h>
@@ -172,5 +170,3 @@ RegisterGlobalPlugin(std::string const &name, std::string const &vendor, std::st
}
} /* atscppapi */
-
-#endif /* ATSCPPAPI_GLOBALPLUGIN_H_ */
diff --git a/lib/cppapi/include/atscppapi/PluginInit.h b/lib/cppapi/include/atscppapi/PluginInit.h
index a348dec..991a43b 100644
--- a/lib/cppapi/include/atscppapi/PluginInit.h
+++ b/lib/cppapi/include/atscppapi/PluginInit.h
@@ -21,8 +21,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_PLUGININIT_H_
-#define ATSCPPAPI_PLUGININIT_H_
#include <ts/apidefs.h>
#include <atscppapi/utils.h>
extern "C" {
@@ -47,5 +45,3 @@ void TSPluginInit(int argc, const char *argv[]);
*/
TSReturnCode TSRemapNewInstance(int argc, char *argv[], void **instance_handle, char *errbuf, int errbuf_size);
}
-
-#endif /* ATSCPPAPI_PLUGININIT_H_ */
diff --git a/lib/cppapi/include/atscppapi/RemapPlugin.h b/lib/cppapi/include/atscppapi/RemapPlugin.h
index 5edf8ab..164d0b6 100644
--- a/lib/cppapi/include/atscppapi/RemapPlugin.h
+++ b/lib/cppapi/include/atscppapi/RemapPlugin.h
@@ -21,8 +21,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_REMAP_PLUGIN_H_
-#define ATSCPPAPI_REMAP_PLUGIN_H_
#include "atscppapi/Transaction.h"
#include "atscppapi/Url.h"
@@ -73,5 +71,3 @@ public:
virtual ~RemapPlugin() {}
};
}
-
-#endif
diff --git a/lib/cppapi/include/atscppapi/Request.h b/lib/cppapi/include/atscppapi/Request.h
index 1d9e49e..aea0dae 100644
--- a/lib/cppapi/include/atscppapi/Request.h
+++ b/lib/cppapi/include/atscppapi/Request.h
@@ -20,8 +20,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_REQUEST_H_
-#define ATSCPPAPI_REQUEST_H_
#include <atscppapi/Headers.h>
#include <atscppapi/HttpVersion.h>
@@ -88,5 +86,3 @@ private:
friend class utils::internal;
};
}
-
-#endif
diff --git a/lib/cppapi/include/atscppapi/Response.h b/lib/cppapi/include/atscppapi/Response.h
index 741d709..244da15 100644
--- a/lib/cppapi/include/atscppapi/Response.h
+++ b/lib/cppapi/include/atscppapi/Response.h
@@ -20,8 +20,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_RESPONSE_H_
-#define ATSCPPAPI_RESPONSE_H_
#include <atscppapi/Headers.h>
#include <atscppapi/HttpVersion.h>
@@ -72,5 +70,3 @@ private:
friend class utils::internal;
};
}
-
-#endif
diff --git a/lib/cppapi/include/atscppapi/Stat.h b/lib/cppapi/include/atscppapi/Stat.h
index 46246aa..8aeb8a5 100644
--- a/lib/cppapi/include/atscppapi/Stat.h
+++ b/lib/cppapi/include/atscppapi/Stat.h
@@ -20,8 +20,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_STAT_H_
-#define ATSCPPAPI_STAT_H_
#include <atscppapi/noncopyable.h>
#include <stdint.h>
@@ -103,5 +101,3 @@ private:
};
} /* atscppapi */
-
-#endif /* ATSCPPAPI_STAT_H_ */
diff --git a/lib/cppapi/include/atscppapi/Transaction.h b/lib/cppapi/include/atscppapi/Transaction.h
index 8c1a3c1..cc1692d 100644
--- a/lib/cppapi/include/atscppapi/Transaction.h
+++ b/lib/cppapi/include/atscppapi/Transaction.h
@@ -20,8 +20,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_TRANSACTION_H_
-#define ATSCPPAPI_TRANSACTION_H_
#include <sys/socket.h>
#include <stdint.h>
@@ -413,5 +411,3 @@ private:
};
} /* atscppapi */
-
-#endif /* ATSCPPAPI_TRANSACTION_H_ */
diff --git a/lib/cppapi/include/atscppapi/Url.h b/lib/cppapi/include/atscppapi/Url.h
index 502b80d..0d5fd7c 100644
--- a/lib/cppapi/include/atscppapi/Url.h
+++ b/lib/cppapi/include/atscppapi/Url.h
@@ -20,8 +20,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_URL_H_
-#define ATSCPPAPI_URL_H_
#include <string>
#include <stdint.h>
@@ -146,5 +144,3 @@ private:
friend class RemapPlugin;
};
}
-
-#endif /* ATSCPPAPI_URL_H_ */
diff --git a/lib/cppapi/include/atscppapi/noncopyable.h b/lib/cppapi/include/atscppapi/noncopyable.h
index 0498c6f..9c20a0f 100644
--- a/lib/cppapi/include/atscppapi/noncopyable.h
+++ b/lib/cppapi/include/atscppapi/noncopyable.h
@@ -23,8 +23,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_NONCOPYABLE_H_
-#define ATSCPPAPI_NONCOPYABLE_H_
namespace atscppapi
{
@@ -59,5 +57,3 @@ protected:
};
} /* atscppapi */
-
-#endif /* ATSCPPAPI_NONCOPYABLE_H_ */
diff --git a/lib/cppapi/include/atscppapi/utils.h b/lib/cppapi/include/atscppapi/utils.h
index b1e44f3..a70b2f9 100644
--- a/lib/cppapi/include/atscppapi/utils.h
+++ b/lib/cppapi/include/atscppapi/utils.h
@@ -23,8 +23,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_UTILS_H_
-#define ATSCPPAPI_UTILS_H_
#include <string>
#include <netinet/in.h>
@@ -68,5 +66,3 @@ namespace utils
std::string getIpPortString(const sockaddr *);
}
}
-
-#endif /* ATSCPPAPI_UTILS_H_ */
diff --git a/lib/cppapi/include/logging_internal.h b/lib/cppapi/include/logging_internal.h
index 3b1dd72..021c507 100644
--- a/lib/cppapi/include/logging_internal.h
+++ b/lib/cppapi/include/logging_internal.h
@@ -24,8 +24,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_LOGGING_INTERNAL_H_
-#define ATSCPPAPI_LOGGING_INTERNAL_H_
#include "atscppapi/Logger.h"
@@ -40,5 +38,3 @@
#define LOG_DEBUG(fmt, ...) TS_DEBUG("atscppapi", fmt, ##__VA_ARGS__)
#define LOG_ERROR(fmt, ...) TS_ERROR("atscppapi", fmt, ##__VA_ARGS__)
-
-#endif /* ATSCPPAPI_LOGGING_INTERNAL_H_ */
diff --git a/lib/cppapi/include/utils_internal.h b/lib/cppapi/include/utils_internal.h
index 67a076b..94aea5b 100644
--- a/lib/cppapi/include/utils_internal.h
+++ b/lib/cppapi/include/utils_internal.h
@@ -24,8 +24,6 @@
*/
#pragma once
-#ifndef ATSCPPAPI_ATSUTILS_H_
-#define ATSCPPAPI_ATSUTILS_H_
#include <ts/ts.h>
#include <string>
@@ -106,5 +104,3 @@ namespace utils
} /* utils */
}
-
-#endif /* ATSCPPAPI_ATSUTILS_H_ */
diff --git a/lib/raft/raft.h b/lib/raft/raft.h
index 2de4376..dc0b8d2 100644
--- a/lib/raft/raft.h
+++ b/lib/raft/raft.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef RAFT_H_
-#define RAFT_H_
+#pragma once
// An implementation of the RAFT consensus algorithm:
// https://ramcloud.stanford.edu/raft.pdf
//
@@ -132,4 +131,3 @@ public:
void ConfigChange(RaftClass *raft, const Config &config);
};
} // namespace raft
-#endif // RAFT_H_
diff --git a/lib/raft/raft_impl.h b/lib/raft/raft_impl.h
index 5c29b38..8a11aa7 100644
--- a/lib/raft/raft_impl.h
+++ b/lib/raft/raft_impl.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef CONSENSUS_IMPL_H_
-#define CONSENSUS_IMPL_H_
+#pragma once
#include <stdlib.h>
#include <algorithm>
#include <deque>
@@ -617,4 +616,3 @@ NewRaft(Server *server, const ::std::string &node)
return new RaftImpl<Server>(server, node);
}
} // namespace raft
-#endif // CONSENSUS_IMPL_H_
diff --git a/lib/records/I_RecAlarms.h b/lib/records/I_RecAlarms.h
index 21713c4..6b7f721 100644
--- a/lib/records/I_RecAlarms.h
+++ b/lib/records/I_RecAlarms.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_ALARMS_H_
-#define _I_REC_ALARMS_H_
+#pragma once
// copy from mgmt/Alarms.h
#define REC_ALARM_PROXY_PROCESS_DIED 1
@@ -46,5 +45,3 @@
#define REC_ALARM_PROXY_LOG_SPACE_ROLLED 19
#define REC_ALARM_PROXY_HTTP_CONGESTED_SERVER 20
#define REC_ALARM_PROXY_HTTP_ALLEVIATED_SERVER 21
-
-#endif
diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h
index cda8e62..b2a6eba 100644
--- a/lib/records/I_RecCore.h
+++ b/lib/records/I_RecCore.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_CORE_H_
-#define _I_REC_CORE_H_
+#pragma once
#include "ts/Diags.h"
@@ -312,5 +311,3 @@ RecErrT RecSetSyncRequired(char *name, bool lock = true);
//------------------------------------------------------------------------
typedef void *(*RecManagerCb)(void *opaque_cb_data, char *data_raw, int data_len);
int RecRegisterManagerCb(int _signal, RecManagerCb _fn, void *_data = nullptr);
-
-#endif
diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h
index 6d6e422..72aff2c 100644
--- a/lib/records/I_RecDefs.h
+++ b/lib/records/I_RecDefs.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_DEFS_H_
-#define _I_REC_DEFS_H_
+#pragma once
#include "ts/ink_mutex.h"
#include "ts/ink_rwlock.h"
@@ -182,5 +181,3 @@ struct RecRawStatBlock {
typedef int (*RecConfigUpdateCb)(const char *name, RecDataT data_type, RecData data, void *cookie);
typedef int (*RecStatUpdateFunc)(const char *name, RecDataT data_type, RecData *data, RecRawStatBlock *rsb, int id, void *cookie);
typedef int (*RecRawStatSyncCb)(const char *name, RecDataT data_type, RecData *data, RecRawStatBlock *rsb, int id);
-
-#endif
diff --git a/lib/records/I_RecEvents.h b/lib/records/I_RecEvents.h
index 10cff09..d73200a 100644
--- a/lib/records/I_RecEvents.h
+++ b/lib/records/I_RecEvents.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_EVENTS_H_
-#define _I_REC_EVENTS_H_
+#pragma once
// copy from mgmt/BaseManager.h
#define REC_EVENT_SYNC_KEY 10000
@@ -37,5 +36,3 @@
#define REC_EVENT_CONFIG_FILE_UPDATE_NO_INC_VERSION 10010
#define REC_EVENT_CACHE_DISK_CONTROL 10011
-
-#endif
diff --git a/lib/records/I_RecHttp.h b/lib/records/I_RecHttp.h
index a3655f0..95f019a 100644
--- a/lib/records/I_RecHttp.h
+++ b/lib/records/I_RecHttp.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_HTTP_H
-#define _I_REC_HTTP_H
+#pragma once
#include <ts/ink_inet.h>
#include <ts/ink_resolver.h>
@@ -475,5 +474,3 @@ HttpProxyPort::findHttp(uint16_t family)
This must be called before any proxy port parsing is done.
*/
extern void ts_session_protocol_well_known_name_indices_init();
-
-#endif // I_REC_HTTP_H
diff --git a/lib/records/I_RecLocal.h b/lib/records/I_RecLocal.h
index b48d254..3741072 100644
--- a/lib/records/I_RecLocal.h
+++ b/lib/records/I_RecLocal.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_LOCAL_H_
-#define _I_REC_LOCAL_H_
+#pragma once
#include "I_RecCore.h"
@@ -35,5 +34,3 @@ class FileManager;
int RecLocalInit(Diags *diags = nullptr);
int RecLocalInitMessage();
int RecLocalStart(FileManager *);
-
-#endif
diff --git a/lib/records/I_RecMutex.h b/lib/records/I_RecMutex.h
index fcf37ac..68efd34 100644
--- a/lib/records/I_RecMutex.h
+++ b/lib/records/I_RecMutex.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_MUTEX_H_
-#define _I_REC_MUTEX_H_
+#pragma once
#include "ts/ink_mutex.h"
#include "ts/ink_thread.h"
@@ -42,5 +41,3 @@ void rec_mutex_init(RecMutex *m, const char *name = nullptr);
void rec_mutex_destroy(RecMutex *m);
void rec_mutex_acquire(RecMutex *m);
void rec_mutex_release(RecMutex *m);
-
-#endif
diff --git a/lib/records/I_RecProcess.h b/lib/records/I_RecProcess.h
index b3f5c37..eb7b98b 100644
--- a/lib/records/I_RecProcess.h
+++ b/lib/records/I_RecProcess.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_PROCESS_H_
-#define _I_REC_PROCESS_H_
+#pragma once
#include "I_RecCore.h"
#include "I_EventSystem.h"
@@ -156,5 +155,3 @@ RecIncrRawStatCount(RecRawStatBlock *rsb, EThread *ethread, int id, int64_t incr
tlp->count += incr;
return REC_ERR_OKAY;
}
-
-#endif /* !_I_REC_PROCESS_H_ */
diff --git a/lib/records/I_RecSignals.h b/lib/records/I_RecSignals.h
index 28f2ed8..848ec41 100644
--- a/lib/records/I_RecSignals.h
+++ b/lib/records/I_RecSignals.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _I_REC_SIGNALS_H_
-#define _I_REC_SIGNALS_H_
+#pragma once
// copy from mgmt/BaseManager.h
#define REC_SIGNAL_PID 0
@@ -44,5 +43,3 @@
#define REC_SIGNAL_LIBRECORDS 16
#define REC_SIGNAL_HTTP_CONGESTED_SERVER 20
#define REC_SIGNAL_HTTP_ALLEVIATED_SERVER 21
-
-#endif
diff --git a/lib/records/P_RecCore.h b/lib/records/P_RecCore.h
index bcbbb0e..6ece225 100644
--- a/lib/records/P_RecCore.h
+++ b/lib/records/P_RecCore.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_REC_CORE_H_
-#define _P_REC_CORE_H_
+#pragma once
#include "ts/ink_thread.h"
#include "ts/ink_hash_table.h"
@@ -97,5 +96,3 @@ RecUpdateT RecExecConfigUpdateCbs(unsigned int update_required_type);
void RecDumpRecordsHt(RecT rec_type = RECT_NULL);
void RecDumpRecords(RecT rec_type, RecDumpEntryCb callback, void *edata);
-
-#endif
diff --git a/lib/records/P_RecDefs.h b/lib/records/P_RecDefs.h
index 9cc53cf..fb89c2a 100644
--- a/lib/records/P_RecDefs.h
+++ b/lib/records/P_RecDefs.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_REC_DEFS_H_
-#define _P_REC_DEFS_H_
+#pragma once
#include "I_RecDefs.h"
@@ -156,5 +155,3 @@ typedef RecMessageHdr RecMessage;
typedef void (*RecDumpEntryCb)(RecT rec_type, void *edata, int registered, const char *name, int data_type, RecData *datum);
typedef RecErrT (*RecMessageRecvCb)(RecMessage *msg, RecMessageT msg_type, void *cookie);
-
-#endif
diff --git a/lib/records/P_RecFile.h b/lib/records/P_RecFile.h
index 032eab9..a47448d 100644
--- a/lib/records/P_RecFile.h
+++ b/lib/records/P_RecFile.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_REC_FILE_H_
-#define _P_REC_FILE_H_
+#pragma once
//-------------------------------------------------------------------------
// types/defines
@@ -43,5 +42,3 @@ int RecFileWrite(RecHandle h_file, char *buf, int size, int *bytes_written);
int RecFileGetSize(RecHandle h_file);
int RecFileExists(const char *file);
int RecFileSync(RecHandle h_file);
-
-#endif
diff --git a/lib/records/P_RecLocal.h b/lib/records/P_RecLocal.h
index 5a9c1bf..e9caf32 100644
--- a/lib/records/P_RecLocal.h
+++ b/lib/records/P_RecLocal.h
@@ -21,9 +21,6 @@
limitations under the License.
*/
-#ifndef _P_REC_LOCAL_H_
-#define _P_REC_LOCAL_H_
+#pragma once
#include "I_RecLocal.h"
-
-#endif
diff --git a/lib/records/P_RecMessage.h b/lib/records/P_RecMessage.h
index 2538c02..c653017 100644
--- a/lib/records/P_RecMessage.h
+++ b/lib/records/P_RecMessage.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_REC_MESSAGE_H_
-#define _P_REC_MESSAGE_H_
+#pragma once
#include "P_RecDefs.h"
@@ -50,5 +49,3 @@ void *RecMessageRecvThis(void *cookie, char *data_raw, int data_len);
RecMessage *RecMessageReadFromDisk(const char *fpath);
int RecMessageWriteToDisk(RecMessage *msg, const char *fpath);
-
-#endif
diff --git a/lib/records/P_RecProcess.h b/lib/records/P_RecProcess.h
index 8c4fe14..5d58c47 100644
--- a/lib/records/P_RecProcess.h
+++ b/lib/records/P_RecProcess.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_REC_PROCESS_H_
-#define _P_REC_PROCESS_H_
+#pragma once
// Must include 'P_EventSystem.h' before 'I_EventSystem.h' (which is
// included in 'I_RecProcess.h') to prevent multiple-symbol-definition
@@ -38,5 +37,3 @@
//-------------------------------------------------------------------------
int RecExecRawStatSyncCbs();
-
-#endif
diff --git a/lib/records/P_RecUtils.h b/lib/records/P_RecUtils.h
index 9c7a0d0..45b23b0 100644
--- a/lib/records/P_RecUtils.h
+++ b/lib/records/P_RecUtils.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _P_REC_UTILS_H_
-#define _P_REC_UTILS_H_
+#pragma once
#include "ts/Diags.h"
#include "ts/ink_atomic.h"
@@ -77,5 +76,3 @@ void RecDebugOff();
#define RecLog(level, fmt, ...) _RecLog(level, MakeSourceLocation(), fmt, ##__VA_ARGS__)
#define RecDebug(level, fmt, ...) _RecDebug(level, MakeSourceLocation(), fmt, ##__VA_ARGS__)
-
-#endif
diff --git a/lib/ts/Allocator.h b/lib/ts/Allocator.h
index 0046f93..5ca9477 100644
--- a/lib/ts/Allocator.h
+++ b/lib/ts/Allocator.h
@@ -37,8 +37,7 @@
*/
-#ifndef _Allocator_h_
-#define _Allocator_h_
+#pragma once
#include <new>
#include <stdlib.h>
@@ -251,5 +250,3 @@ private:
uint64_t allocations;
ink_mutex trackerLock;
};
-
-#endif // _Allocator_h_
diff --git a/lib/ts/Arena.h b/lib/ts/Arena.h
index cd5ad68..a76bd0c 100644
--- a/lib/ts/Arena.h
+++ b/lib/ts/Arena.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __ARENA_H__
-#define __ARENA_H__
+#pragma once
#include <sys/types.h>
#include <memory.h>
@@ -165,5 +164,3 @@ Arena::str_store(const char *str, size_t len)
return mem;
}
-
-#endif /* __ARENA_H__ */
diff --git a/lib/ts/BaseLogFile.h b/lib/ts/BaseLogFile.h
index 37e916a..708fe66 100644
--- a/lib/ts/BaseLogFile.h
+++ b/lib/ts/BaseLogFile.h
@@ -22,8 +22,7 @@
*/
-#ifndef BASE_LOG_FILE_H
-#define BASE_LOG_FILE_H
+#pragma once
#include <stdarg.h>
#include <stdio.h>
@@ -237,4 +236,3 @@ private:
uint64_t m_signature = 0;
bool m_has_signature = false;
};
-#endif
diff --git a/lib/ts/Bitops.h b/lib/ts/Bitops.h
index 77f6656..45bfb43 100644
--- a/lib/ts/Bitops.h
+++ b/lib/ts/Bitops.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __BITOPS_H__
-#define __BITOPS_H__
+#pragma once
#include <strings.h>
@@ -271,5 +270,3 @@ bitops_isset(unsigned char *val, int bit)
int idx = bit % 8;
return ((val[pos] & (1 << idx)) != 0);
}
-
-#endif /* __BITOPS_H__ */
diff --git a/lib/ts/BufferWriter.h b/lib/ts/BufferWriter.h
index cdce9ec..061464c 100644
--- a/lib/ts/BufferWriter.h
+++ b/lib/ts/BufferWriter.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined TS_BUFFERWRITER_H_
-#define TS_BUFFERWRITER_H_
+#pragma once
#include <stdlib.h>
#include <utility>
@@ -738,5 +737,3 @@ bwprint(std::string &s, ts::TextView fmt, Rest &&... rest)
}
} // end namespace ts
-
-#endif // include once
diff --git a/lib/ts/ConsistentHash.h b/lib/ts/ConsistentHash.h
index c728763..95f1caf 100644
--- a/lib/ts/ConsistentHash.h
+++ b/lib/ts/ConsistentHash.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef __CONSISTENT_HASH_H__
-#define __CONSISTENT_HASH_H__
+#pragma once
#include "Hash.h"
#include <stdint.h>
@@ -60,5 +59,3 @@ private:
ATSHash64 *hash;
std::map<uint64_t, ATSConsistentHashNode *> NodeMap;
};
-
-#endif
diff --git a/lib/ts/ContFlags.h b/lib/ts/ContFlags.h
index eb75016..11fd7c4 100644
--- a/lib/ts/ContFlags.h
+++ b/lib/ts/ContFlags.h
@@ -32,8 +32,7 @@
at least a 32 bit architecture, so the rawflags size is 32 bits.
****************************************************************************/
-#ifndef _CONT_FLAGS_H
-#define _CONT_FLAGS_H
+#pragma once
#include "ink_thread.h"
@@ -94,5 +93,3 @@ void set_cont_flags(const ContFlags &flags);
void set_cont_flag(ContFlags::flags flag_bit, bool value);
ContFlags get_cont_flags();
bool get_cont_flag(ContFlags::flags flag_bit);
-
-#endif // _CONT_FLAGS_H
diff --git a/lib/ts/CryptoHash.h b/lib/ts/CryptoHash.h
index 0d74b71..d2d216c 100644
--- a/lib/ts/CryptoHash.h
+++ b/lib/ts/CryptoHash.h
@@ -20,8 +20,7 @@
limitations under the License.
*/
-#if !defined CRYPTO_HASH_HEADER
-#define CRYPTO_HASH_HEADER
+#pragma once
#include <ts/BufferWriter.h>
#include <ts/string_view.h>
@@ -196,5 +195,3 @@ bwformat(BufferWriter &w, BWFSpec const &spec, ats::CryptoHash const &hash)
using ats::CryptoHash;
using ats::CryptoContext;
using ats::CRYPTO_HASH_ZERO;
-
-#endif // CRYPTO_HASH_HEADER
diff --git a/lib/ts/Diags.h b/lib/ts/Diags.h
index 59ebb68..473a445 100644
--- a/lib/ts/Diags.h
+++ b/lib/ts/Diags.h
@@ -31,8 +31,7 @@
****************************************************************************/
-#ifndef __DIAGS_H___
-#define __DIAGS_H___
+#pragma once
#include <stdarg.h>
#include "ink_mutex.h"
@@ -367,4 +366,3 @@ extern inkcoreapi Diags *diags;
#define is_diags_on(_t) 0
#endif // TS_USE_DIAGS
-#endif /*_Diags_h_*/
diff --git a/lib/ts/DynArray.h b/lib/ts/DynArray.h
index 449a288..c4c3305 100644
--- a/lib/ts/DynArray.h
+++ b/lib/ts/DynArray.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __DYN_ARRAY_H__
-#define __DYN_ARRAY_H__
+#pragma once
template <class T> class DynArray
{
@@ -188,5 +187,3 @@ DynArray<T>::resize(intptr_t new_size)
size = new_size;
}
}
-
-#endif /* __DYN_ARRAY_H__ */
diff --git a/lib/ts/EventNotify.h b/lib/ts/EventNotify.h
index ede0c14..418c612 100644
--- a/lib/ts/EventNotify.h
+++ b/lib/ts/EventNotify.h
@@ -28,8 +28,7 @@
**************************************************************************/
-#ifndef EVENT_NOTIFY_H
-#define EVENT_NOTIFY_H
+#pragma once
#include "ts/ink_thread.h"
@@ -54,6 +53,4 @@ private:
ink_mutex m_mutex;
#endif
};
-
-#endif /* EVENT_NOTIFY_H */
/* vim: set sw=4 ts=4 tw=79 et : */
diff --git a/lib/ts/Hash.h b/lib/ts/Hash.h
index 89fa1cf..f07c88d 100644
--- a/lib/ts/Hash.h
+++ b/lib/ts/Hash.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef __HASH_H__
-#define __HASH_H__
+#pragma once
#include <cstddef>
#include <stdint.h>
@@ -64,5 +63,3 @@ struct ATSHash64 : ATSHashBase {
virtual uint64_t get(void) const = 0;
virtual bool operator==(const ATSHash64 &) const;
};
-
-#endif
diff --git a/lib/ts/HashFNV.h b/lib/ts/HashFNV.h
index 5fed337..b8aaecf 100644
--- a/lib/ts/HashFNV.h
+++ b/lib/ts/HashFNV.h
@@ -25,8 +25,7 @@
Currently implemented FNV-1a 32bit and FNV-1a 64bit
*/
-#ifndef __HASH_FNV_H__
-#define __HASH_FNV_H__
+#pragma once
#include "ts/Hash.h"
#include <stdint.h>
@@ -92,5 +91,3 @@ ATSHash64FNV1a::update(const void *data, size_t len, Transform xfrm)
hval += (hval << 1) + (hval << 4) + (hval << 5) + (hval << 7) + (hval << 8) + (hval << 40);
}
}
-
-#endif
diff --git a/lib/ts/HashMD5.h b/lib/ts/HashMD5.h
index 89ac67a..eb0470b 100644
--- a/lib/ts/HashMD5.h
+++ b/lib/ts/HashMD5.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef __HASH_MD5_H__
-#define __HASH_MD5_H__
+#pragma once
#include "ts/Hash.h"
#include <openssl/evp.h>
@@ -40,5 +39,3 @@ private:
unsigned int md_len;
bool finalized;
};
-
-#endif
diff --git a/lib/ts/HashSip.h b/lib/ts/HashSip.h
index 566f444..8eb45d5 100644
--- a/lib/ts/HashSip.h
+++ b/lib/ts/HashSip.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef __HASH_SIP_H__
-#define __HASH_SIP_H__
+#pragma once
#include "ts/Hash.h"
#include <cstdint>
@@ -54,5 +53,3 @@ private:
std::size_t total_len = 0;
bool finalized = false;
};
-
-#endif
diff --git a/lib/ts/History.h b/lib/ts/History.h
index 7d2f92f..ff7125a 100644
--- a/lib/ts/History.h
+++ b/lib/ts/History.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef HISTORY_H_84E66E8E_1D2A_438B_A09A_2CD8FB51B209
-#define HISTORY_H_84E66E8E_1D2A_438B_A09A_2CD8FB51B209
+#pragma once
#include "ts/SourceLocation.h"
@@ -74,5 +73,3 @@ private:
unsigned int history_pos = 0;
};
-
-#endif /* HISTORY_H_84E66E8E_1D2A_438B_A09A_2CD8FB51B209 */
diff --git a/lib/ts/HostLookup.h b/lib/ts/HostLookup.h
index d8d872d..9fbe694 100644
--- a/lib/ts/HostLookup.h
+++ b/lib/ts/HostLookup.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _HOST_LOOKUP_H_
-#define _HOST_LOOKUP_H_
+#pragma once
#include "DynArray.h"
@@ -128,5 +127,3 @@ private:
int num_el; // the numbe of itmems in the tree
const char *matcher_name; // Used for Debug/Warning/Error messages
};
-
-#endif
diff --git a/lib/ts/INK_MD5.h b/lib/ts/INK_MD5.h
index 38ad1d3..5bb3c58 100644
--- a/lib/ts/INK_MD5.h
+++ b/lib/ts/INK_MD5.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _INK_MD5_h_
-#define _INK_MD5_h_
+#pragma once
#include "ts/ink_code.h"
#include "ts/ink_defs.h"
@@ -42,5 +41,3 @@ public:
};
typedef CryptoHash INK_MD5;
-
-#endif
diff --git a/lib/ts/I_Layout.h b/lib/ts/I_Layout.h
index 5716910..e5ddf77 100644
--- a/lib/ts/I_Layout.h
+++ b/lib/ts/I_Layout.h
@@ -28,8 +28,7 @@
*/
-#ifndef _I_Layout_h
-#define _I_Layout_h
+#pragma once
// use std string and string view for layout
#include <string>
@@ -99,5 +98,3 @@ struct Layout {
std::string mandir;
std::string cachedir;
};
-
-#endif
diff --git a/lib/ts/I_Version.h b/lib/ts/I_Version.h
index 9e3f1ae..7aa616d 100644
--- a/lib/ts/I_Version.h
+++ b/lib/ts/I_Version.h
@@ -28,8 +28,7 @@
**************************************************************************/
-#ifndef _Version_h
-#define _Version_h
+#pragma once
struct VersionNumber {
short int ink_major; // incompatible change
@@ -114,5 +113,3 @@ public:
void setup(const char *pkg_name, const char *app_name, const char *app_version, const char *build_date, const char *build_time,
const char *build_machine, const char *build_person, const char *build_cflags);
};
-
-#endif /*_Version_h*/
diff --git a/lib/ts/InkErrno.h b/lib/ts/InkErrno.h
index b77b33a..f4bfe5a 100644
--- a/lib/ts/InkErrno.h
+++ b/lib/ts/InkErrno.h
@@ -27,8 +27,7 @@
*/
-#if !defined(_Errno_h_)
-#define _Errno_h_
+#pragma once
#include <errno.h>
#define INK_START_ERRNO 20000
@@ -60,5 +59,3 @@
#define EHTTP_ERROR (HTTP_ERRNO + 0)
const char *InkStrerror(int ink_errno);
-
-#endif
diff --git a/lib/ts/IntrusiveDList.h b/lib/ts/IntrusiveDList.h
index ec3619e..2c58026 100644
--- a/lib/ts/IntrusiveDList.h
+++ b/lib/ts/IntrusiveDList.h
@@ -1,6 +1,3 @@
-#if !defined(TS_INTRUSIVE_DOUBLE_LIST_HEADER)
-#define TS_INTRUSIVE_DOUBLE_LIST_HEADER
-
/** @file
Intrusive double linked list container.
@@ -42,6 +39,8 @@
*/
+#pragma once
+
/// FreeBSD doesn't like just declaring the tag struct we need so we have to include the file.
#include <iterator>
@@ -376,5 +375,3 @@ protected:
T *_tail; ///< Last element in list.
size_t _count; ///< # of elements in list.
};
-
-#endif // TS_INTRUSIVE_DOUBLE_LIST_HEADER
diff --git a/lib/ts/IpMap.h b/lib/ts/IpMap.h
index 95439ab..7d2e602 100644
--- a/lib/ts/IpMap.h
+++ b/lib/ts/IpMap.h
@@ -1,13 +1,3 @@
-#if !defined(TS_IP_MAP_HEADER)
-#define TS_IP_MAP_HEADER
-
-#include "ts/ink_platform.h"
-#include "ts/ink_defs.h"
-#include "ts/RbTree.h"
-#include "ts/ink_inet.h"
-#include "ts/IntrusiveDList.h"
-#include "ts/ink_assert.h"
-
/** @file
Map of IP addresses to client data.
@@ -31,6 +21,15 @@
limitations under the License.
*/
+#pragma once
+
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/RbTree.h"
+#include "ts/ink_inet.h"
+#include "ts/IntrusiveDList.h"
+#include "ts/ink_assert.h"
+
namespace ts
{
namespace detail
@@ -449,5 +448,3 @@ inline IpMap::iterator::pointer IpMap::iterator::operator->() const
inline IpMap::IpMap() : _m4(0), _m6(0)
{
}
-
-#endif // TS_IP_MAP_HEADER
diff --git a/lib/ts/IpMapConf.h b/lib/ts/IpMapConf.h
index 1895b49..3e96bba 100644
--- a/lib/ts/IpMapConf.h
+++ b/lib/ts/IpMapConf.h
@@ -23,6 +23,8 @@
// Copied from IPRange.cc for backwards compatibility.
+#pragma once
+
class IpMap; // declare in name only.
// Returns 0 if successful, error string otherwise
diff --git a/lib/ts/JeAllocator.h b/lib/ts/JeAllocator.h
index d3539e8..749955b 100644
--- a/lib/ts/JeAllocator.h
+++ b/lib/ts/JeAllocator.h
@@ -17,8 +17,7 @@
// https://github.com/jemalloc/jemalloc/releases
// Requires jemalloc 5.0.0 or above.
-#ifndef _jeallocator_h_
-#define _jeallocator_h_
+#pragma once
#include "ts/ink_config.h"
#include "ts/ink_queue.h"
@@ -84,5 +83,3 @@ private:
JemallocNodumpAllocator &globalJemallocNodumpAllocator();
} /* namespace jearena */
-
-#endif /* _jeallocator_h_ */
diff --git a/lib/ts/List.h b/lib/ts/List.h
index 3dc3b01..4a15491 100644
--- a/lib/ts/List.h
+++ b/lib/ts/List.h
@@ -51,8 +51,7 @@
****************************************************************************/
-#ifndef _List_h_
-#define _List_h_
+#pragma once
#include <stdint.h>
@@ -742,5 +741,3 @@ template <class C, class L> inline AtomicSLL<C, L>::AtomicSLL()
{
ink_atomiclist_init(&al, "AtomicSLL", (uint32_t)(uintptr_t)&L::next_link((C *)0));
}
-
-#endif /*_List_h_*/
diff --git a/lib/ts/MMH.h b/lib/ts/MMH.h
index 68e2e5a..c543d3b 100644
--- a/lib/ts/MMH.h
+++ b/lib/ts/MMH.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _MMH_h_
-#define _MMH_h_
+#pragma once
#include "ts/ink_code.h"
#include "ts/ink_defs.h"
@@ -115,5 +114,3 @@ public:
}
#endif
};
-
-#endif
diff --git a/lib/ts/MT_hashtable.h b/lib/ts/MT_hashtable.h
index 13c4190..e262301 100644
--- a/lib/ts/MT_hashtable.h
+++ b/lib/ts/MT_hashtable.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef MT_HASHTABLE_H_
-#define MT_HASHTABLE_H_
+#pragma once
#define MT_HASHTABLE_PARTITION_BITS 6
#define MT_HASHTABLE_PARTITIONS (1 << MT_HASHTABLE_PARTITION_BITS)
@@ -428,5 +427,3 @@ private:
// int last_GC_time[MT_HASHTABLE_PARTITIONS];
// int32_t cur_items;
};
-
-#endif /* MT_HASHTABLE_H_ */
diff --git a/lib/ts/MatcherUtils.h b/lib/ts/MatcherUtils.h
index 1cbe7b0..be7138a 100644
--- a/lib/ts/MatcherUtils.h
+++ b/lib/ts/MatcherUtils.h
@@ -29,8 +29,7 @@
*
****************************************************************************/
-#ifndef _MATCHER_UTILS_H_
-#define _MATCHER_UTILS_H_
+#pragma once
#include "ts/ParseRules.h"
#include "ts/Result.h"
@@ -130,5 +129,3 @@ LowerCaseStr(char *str)
str++;
}
}
-
-#endif
diff --git a/lib/ts/MemArena.h b/lib/ts/MemArena.h
index 1e78761..dced37a 100644
--- a/lib/ts/MemArena.h
+++ b/lib/ts/MemArena.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _MEM_ARENA_H_
-#define _MEM_ARENA_H_
+#pragma once
#include <mutex>
#include <memory>
@@ -152,5 +151,3 @@ private:
std::shared_ptr<Block> current = nullptr; ///< Head of allocations list. Allocate from this.
};
} // ts namespace
-
-#endif /* _MEM_ARENA_H_ */
diff --git a/lib/ts/ParseRules.h b/lib/ts/ParseRules.h
index 25ec383..faa68cd 100644
--- a/lib/ts/ParseRules.h
+++ b/lib/ts/ParseRules.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_ParseRules_h_)
-#define _ParseRules_h_
+#pragma once
#include <string.h>
@@ -866,5 +865,3 @@ ink_atoui(const char *str)
else
return static_cast<int>(val);
}
-
-#endif /* #if !defined (_ParseRules_h_) */
diff --git a/lib/ts/PriorityQueue.h b/lib/ts/PriorityQueue.h
index 0f43496..975b709 100644
--- a/lib/ts/PriorityQueue.h
+++ b/lib/ts/PriorityQueue.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __PRIORITY_QUEUE_H__
-#define __PRIORITY_QUEUE_H__
+#pragma once
#include "ts/ink_assert.h"
#include <vector>
@@ -259,5 +258,3 @@ PriorityQueue<T, Comp>::_bubble_down(uint32_t index)
break;
}
}
-
-#endif // __PRIORITY_QUEUE_H__
diff --git a/lib/ts/Ptr.h b/lib/ts/Ptr.h
index 687f053..6f59f11 100644
--- a/lib/ts/Ptr.h
+++ b/lib/ts/Ptr.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef PTR_H_FBBD7DC3_CA5D_4715_9162_5E4DDA93353F
-#define PTR_H_FBBD7DC3_CA5D_4715_9162_5E4DDA93353F
+#pragma once
#include "ts/ink_atomic.h"
@@ -249,5 +248,3 @@ Ptr<T>::operator=(const Ptr<T> &src)
{
return (operator=(src.m_ptr));
}
-
-#endif /* PTR_H_FBBD7DC3_CA5D_4715_9162_5E4DDA93353F */
diff --git a/lib/ts/RawHashTable.h b/lib/ts/RawHashTable.h
index 55af4c4..052c479 100644
--- a/lib/ts/RawHashTable.h
+++ b/lib/ts/RawHashTable.h
@@ -28,8 +28,7 @@
*/
-#ifndef _RawHashTable_h_
-#define _RawHashTable_h_
+#pragma once
#include "ts/ink_apidefs.h"
#include "ts/ink_hash_table.h"
@@ -379,5 +378,3 @@ inline RawHashTableIter::~RawHashTableIter()
{
return;
}
-
-#endif /*_RawHashTable_h_*/
diff --git a/lib/ts/RbTree.h b/lib/ts/RbTree.h
index af4d1d4..9b067a1 100644
--- a/lib/ts/RbTree.h
+++ b/lib/ts/RbTree.h
@@ -19,8 +19,7 @@
limitations under the License.
*/
-#ifndef RBTREE_H_
-#define RBTREE_H_
+#pragma once
namespace ts
{
@@ -218,5 +217,3 @@ namespace detail
} /* namespace detail */
} /* namespace ts */
-
-#endif /* RBTREE_H_ */
diff --git a/lib/ts/Regex.h b/lib/ts/Regex.h
index 2713e51..6669638 100644
--- a/lib/ts/Regex.h
+++ b/lib/ts/Regex.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __TS_REGEX_H__
-#define __TS_REGEX_H__
+#pragma once
#include "ts/ink_config.h"
@@ -79,5 +78,3 @@ private:
dfa_pattern *_my_patterns;
};
-
-#endif /* __TS_REGEX_H__ */
diff --git a/lib/ts/Regression.h b/lib/ts/Regression.h
index d99169b..43808a7 100644
--- a/lib/ts/Regression.h
+++ b/lib/ts/Regression.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _Regression_h
-#define _Regression_h
+#pragma once
#include "ts/ink_platform.h"
#include "ts/Regex.h"
@@ -104,5 +103,3 @@ struct RegressionTest {
int rprintf(RegressionTest *t, const char *format, ...);
int rperf(RegressionTest *t, const char *tag, double val);
char *regression_status_string(int status);
-
-#endif /* _Regression_h */
diff --git a/lib/ts/Result.h b/lib/ts/Result.h
index 444663d..fb99460 100644
--- a/lib/ts/Result.h
+++ b/lib/ts/Result.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef RESULT_H_77147E59_67CF_4DD7_A58D_ED3502981E87
-#define RESULT_H_77147E59_67CF_4DD7_A58D_ED3502981E87
+#pragma once
#include "TextBuffer.h"
@@ -81,5 +80,3 @@ struct Result {
private:
TextBuffer buf;
};
-
-#endif /* RESULT_H_77147E59_67CF_4DD7_A58D_ED3502981E87 */
diff --git a/lib/ts/SHA256.h b/lib/ts/SHA256.h
index 57bfca9..ba2e3c8 100644
--- a/lib/ts/SHA256.h
+++ b/lib/ts/SHA256.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _SHA256_h_
-#define _SHA256_h_
+#pragma once
#include "ts/ink_code.h"
#include "ts/ink_defs.h"
@@ -49,5 +48,3 @@ public:
return SHA256_Final(hash.u8, &_ctx);
}
};
-
-#endif
diff --git a/lib/ts/SimpleTokenizer.h b/lib/ts/SimpleTokenizer.h
index 262081b..c9b2c61 100644
--- a/lib/ts/SimpleTokenizer.h
+++ b/lib/ts/SimpleTokenizer.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _SIMPLE_TOKENIZER_H_
-#define _SIMPLE_TOKENIZER_H_
+#pragma once
#include <stdlib.h>
#include <string.h>
@@ -295,5 +294,3 @@ private:
return count;
};
};
-
-#endif
diff --git a/lib/ts/SourceLocation.h b/lib/ts/SourceLocation.h
index 13876e7..8c2ccac 100644
--- a/lib/ts/SourceLocation.h
+++ b/lib/ts/SourceLocation.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef SOURCELOCATION_H_88F6E38C_ACBB_4EFE_8819_71FCB162AE9B
-#define SOURCELOCATION_H_88F6E38C_ACBB_4EFE_8819_71FCB162AE9B
+#pragma once
// The SourceLocation class wraps up a source code location, including
// file name, function name, and line number, and contains a method to
@@ -59,5 +58,3 @@ public:
char *str(char *buf, int buflen) const;
};
-
-#endif /* SOURCELOCATION_H_88F6E38C_ACBB_4EFE_8819_71FCB162AE9B */
diff --git a/lib/ts/TestBox.h b/lib/ts/TestBox.h
index b26625b..b009c2a 100644
--- a/lib/ts/TestBox.h
+++ b/lib/ts/TestBox.h
@@ -1,6 +1,3 @@
-#if !defined(TS_TEST_BOX_HEADER)
-#define TS_TEST_BOX_HEADER
-
/** @file
Regression testing support class.
@@ -24,6 +21,8 @@
limitations under the License.
*/
+#pragma once
+
#include <stdarg.h>
#include "ts/ink_apidefs.h"
#include "ts/Regression.h"
@@ -71,4 +70,3 @@ TestBox::check(bool result, char const *fmt, ...)
return result;
}
}
-#endif // TS_TEST_BOX_HEADER
diff --git a/lib/ts/TextBuffer.h b/lib/ts/TextBuffer.h
index f631580..6a6d8f2 100644
--- a/lib/ts/TextBuffer.h
+++ b/lib/ts/TextBuffer.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _TEXT_BUFFER
-#define _TEXT_BUFFER
+#pragma once
/****************************************************************************
*
@@ -118,5 +117,3 @@ private:
char *bufferStart = nullptr;
char *nextAdd = nullptr;
};
-
-#endif
diff --git a/lib/ts/Tokenizer.h b/lib/ts/Tokenizer.h
index 6d1b7c9..86b1c03 100644
--- a/lib/ts/Tokenizer.h
+++ b/lib/ts/Tokenizer.h
@@ -23,8 +23,7 @@
/***************************************/
-#ifndef _TOKENIZER_H_
-#define _TOKENIZER_H_
+#pragma once
/****************************************************************************
*
@@ -168,5 +167,3 @@ private:
tok_node *add_node;
int add_index;
};
-
-#endif
diff --git a/lib/ts/Trie.h b/lib/ts/Trie.h
index 98207f0..4d0e151 100644
--- a/lib/ts/Trie.h
+++ b/lib/ts/Trie.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef _TRIE_H
-#define _TRIE_H
+#pragma once
#include <stdio.h>
#include <stdlib.h>
@@ -251,5 +250,3 @@ Trie<T>::Node::Print(const char *debug_tag) const
}
}
}
-
-#endif // _TRIE_H
diff --git a/lib/ts/TsBuffer.h b/lib/ts/TsBuffer.h
index e620c47..bb0eeaf 100644
--- a/lib/ts/TsBuffer.h
+++ b/lib/ts/TsBuffer.h
@@ -1,6 +1,3 @@
-#if !defined TS_BUFFER_HEADER
-#define TS_BUFFER_HEADER
-
/** @file
Definitions for a buffer type, to carry a reference to a chunk of memory.
@@ -26,6 +23,8 @@
limitations under the License.
*/
+#pragma once
+
#if defined _MSC_VER
#include <stddef.h>
#else
@@ -514,5 +513,3 @@ ConstBuffer::clip(char const *p)
typedef ts::Buffer TsBuffer;
typedef ts::ConstBuffer TsConstBuffer;
-
-#endif // TS_BUFFER_HEADER
diff --git a/lib/ts/X509HostnameValidator.h b/lib/ts/X509HostnameValidator.h
index 3b76886..67e2dd2 100644
--- a/lib/ts/X509HostnameValidator.h
+++ b/lib/ts/X509HostnameValidator.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LIB_TS_X509HOSTNAMEVALIDATOR_H_
-#define LIB_TS_X509HOSTNAMEVALIDATOR_H_
+#pragma once
#include <openssl/x509.h>
@@ -36,5 +35,3 @@
*/
bool validate_hostname(X509 *cert, const unsigned char *hostname, bool is_ip, char **peername);
-
-#endif /* LIB_TS_X509HOSTNAMEVALIDATOR_H_ */
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 164dc95..b889588 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -28,8 +28,7 @@
*/
-#ifndef __TS_APIDEFS_H__
-#define __TS_APIDEFS_H__
+#pragma once
/*
* ATS Plugin just needs to include <ts/ts.h>,
@@ -1242,5 +1241,3 @@ typedef struct tsapi_uuid *TSUuid;
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
-#endif /* __TS_APIDEFS_H__ */
diff --git a/lib/ts/defalloc.h b/lib/ts/defalloc.h
index 6605134..feca710 100644
--- a/lib/ts/defalloc.h
+++ b/lib/ts/defalloc.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef _defalloc_H_
-#define _defalloc_H_
+#pragma once
#include "ts/ink_memory.h"
@@ -39,5 +38,3 @@ public:
ats_free(p);
}
};
-
-#endif
diff --git a/lib/ts/fastlz.h b/lib/ts/fastlz.h
index a71f992..c0006c9 100644
--- a/lib/ts/fastlz.h
+++ b/lib/ts/fastlz.h
@@ -24,8 +24,7 @@
THE SOFTWARE.
*/
-#ifndef FASTLZ_H
-#define FASTLZ_H
+#pragma once
#define FASTLZ_VERSION 0x000100
@@ -96,5 +95,3 @@ int fastlz_compress_level(int level, const void *input, int length, void *output
#if defined(__cplusplus)
}
#endif
-
-#endif /* FASTLZ_H */
diff --git a/lib/ts/hugepages.h b/lib/ts/hugepages.h
index 812542b..cb7e95b 100644
--- a/lib/ts/hugepages.h
+++ b/lib/ts/hugepages.h
@@ -18,8 +18,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef _hugepages_h_
-#define _hugepages_h_
+#pragma once
#include <cstring>
@@ -28,5 +27,3 @@ bool ats_hugepage_enabled(void);
void ats_hugepage_init(int);
void *ats_alloc_hugepage(size_t);
bool ats_free_hugepage(void *, size_t);
-
-#endif
diff --git a/lib/ts/ink_aiocb.h b/lib/ts/ink_aiocb.h
index e932b5b..f0e878e 100644
--- a/lib/ts/ink_aiocb.h
+++ b/lib/ts/ink_aiocb.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef _ink_aiocb_h_
-#define _ink_aiocb_h_
+#pragma once
#include "ts/ink_defs.h"
@@ -58,5 +57,3 @@ struct ink_aiocb {
int aio_state; /* state flag for List I/O */
int aio__pad[1]; /* extension padding */
};
-
-#endif
diff --git a/lib/ts/ink_align.h b/lib/ts/ink_align.h
index 591b311..9c84fe7 100644
--- a/lib/ts/ink_align.h
+++ b/lib/ts/ink_align.h
@@ -22,8 +22,7 @@
*/
//-*-c++-*-
-#ifndef _ink_align_h_
-#define _ink_align_h_
+#pragma once
#include "ts/ink_time.h"
@@ -94,5 +93,3 @@ align_pointer_forward_and_zero(const void *pointer_, size_t alignment)
// We could handle this using casts, but that's more prone to
// errors during porting.
//
-
-#endif
diff --git a/lib/ts/ink_apidefs.h b/lib/ts/ink_apidefs.h
index 0eb1d04..544a835 100644
--- a/lib/ts/ink_apidefs.h
+++ b/lib/ts/ink_apidefs.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _ink_apidefs_h_
-#define _ink_apidefs_h_
+#pragma once
#define inkliapi
#define inkcoreapi
@@ -74,5 +73,3 @@
#if !defined(TS_INLINE)
#define TS_INLINE inline
#endif
-
-#endif
diff --git a/lib/ts/ink_args.h b/lib/ts/ink_args.h
index 549fcdd..47c90d1 100644
--- a/lib/ts/ink_args.h
+++ b/lib/ts/ink_args.h
@@ -26,8 +26,7 @@ Process arguments
****************************************************************************/
-#ifndef _INK_ARGS_H
-#define _INK_ARGS_H
+#pragma once
#include "ts/ink_defs.h"
#include "ts/ink_apidefs.h"
@@ -99,5 +98,3 @@ void process_args(const AppVersionInfo *appinfo, const ArgumentDescription *argu
bool process_args_ex(const AppVersionInfo *appinfo, const ArgumentDescription *argument_descriptions,
unsigned n_argument_descriptions, const char **argv);
-
-#endif /*_INK_ARGS_H*/
diff --git a/lib/ts/ink_assert.h b/lib/ts/ink_assert.h
index 02b08c6..bc4de37 100644
--- a/lib/ts/ink_assert.h
+++ b/lib/ts/ink_assert.h
@@ -25,8 +25,7 @@
Assertions
***************************************************************************/
-#ifndef _INK_ASSERT_H
-#define _INK_ASSERT_H
+#pragma once
#include "ts/ink_apidefs.h"
#include "ts/ink_error.h"
@@ -57,8 +56,6 @@ inkcoreapi void _ink_assert(const char *a, const char *f, int l) TS_NORETURN;
}
#endif /* __cplusplus */
-#endif /*_INK_ASSERT_H*/
-
/* workaround a bug in the stupid Sun preprocessor
#undef assert
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index f811491..263eb8b 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -34,8 +34,7 @@
****************************************************************************/
-#ifndef _ink_atomic_h_
-#define _ink_atomic_h_
+#pragma once
#include <stdio.h>
#include <string.h>
@@ -176,5 +175,3 @@ ink_atomic_decrement(pvuint64 mem, Amount value)
#else /* not gcc > v4.1.2 */
#error Need a compiler / libc that supports atomic operations, e.g. gcc v4.1.2 or later
#endif
-
-#endif /* _ink_atomic_h_ */
diff --git a/lib/ts/ink_base64.h b/lib/ts/ink_base64.h
index df72f52..b536fd6 100644
--- a/lib/ts/ink_base64.h
+++ b/lib/ts/ink_base64.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _ink_base64_h_
-#define _ink_base64_h_
+#pragma once
/*
* Base64 encoding and decoding as according to RFC1521. Similar to uudecode.
@@ -45,5 +44,3 @@ bool ats_base64_decode(const char *inBuffer, size_t inBufferSize, unsigned char
// Little helper functions to calculate minimum required output buffer for encoding/decoding.
#define ATS_BASE64_ENCODE_DSTLEN(_length) ((_length * 8) / 6 + 4)
#define ATS_BASE64_DECODE_DSTLEN(_length) (((_length + 3) / 4) * 3)
-
-#endif
diff --git a/lib/ts/ink_cap.h b/lib/ts/ink_cap.h
index f2ebf31..7587ca4 100644
--- a/lib/ts/ink_cap.h
+++ b/lib/ts/ink_cap.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_ink_cap_h_)
-#define _ink_cap_h_
+#pragma once
#include <unistd.h>
#include <sys/types.h>
@@ -105,5 +104,3 @@ private:
void *cap_state; ///< Original capabilities state to restore.
#endif
};
-
-#endif
diff --git a/lib/ts/ink_code.h b/lib/ts/ink_code.h
index b0f9876..a421ccc 100644
--- a/lib/ts/ink_code.h
+++ b/lib/ts/ink_code.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _ink_code_h_
-#define _ink_code_h_
+#pragma once
#include "ts/ink_apidefs.h"
#include "ts/ink_defs.h"
@@ -41,4 +40,3 @@ inkcoreapi int ink_code_incr_md5_init(INK_DIGEST_CTX *context);
inkcoreapi int ink_code_incr_md5_update(INK_DIGEST_CTX *context, const char *input, int input_length);
inkcoreapi int ink_code_incr_md5_final(char *sixteen_byte_hash_pointer, INK_DIGEST_CTX *context);
#endif
-#endif
diff --git a/lib/ts/ink_defs.h b/lib/ts/ink_defs.h
index f85589d..380bb69 100644
--- a/lib/ts/ink_defs.h
+++ b/lib/ts/ink_defs.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _ink_defs_h
-#define _ink_defs_h
+#pragma once
#include "ts/ink_config.h"
#include <stddef.h>
@@ -140,5 +139,3 @@ namespace ts
static const int NO_FD = -1; ///< No or invalid file descriptor.
}
#endif
-
-#endif /*__ink_defs_h*/
diff --git a/lib/ts/ink_error.h b/lib/ts/ink_error.h
index 1962c6e..d686ce0 100644
--- a/lib/ts/ink_error.h
+++ b/lib/ts/ink_error.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef _ink_error_h_
-#define _ink_error_h_
+#pragma once
#include <stdarg.h>
#include <stdio.h>
@@ -62,5 +61,3 @@ void ink_eprintf(const char *message_format, ...) TS_PRINTFLIKE(1, 2);
void ink_error(const char *message_format, ...) TS_PRINTFLIKE(1, 2);
int ink_set_dprintf_level(int debug_level);
-
-#endif
diff --git a/lib/ts/ink_exception.h b/lib/ts/ink_exception.h
index 7089cf7..5cca94c 100644
--- a/lib/ts/ink_exception.h
+++ b/lib/ts/ink_exception.h
@@ -31,6 +31,8 @@
*
*/
+#pragma once
+
class Exception
{
};
diff --git a/lib/ts/ink_file.h b/lib/ts/ink_file.h
index df6d42f..d17e908 100644
--- a/lib/ts/ink_file.h
+++ b/lib/ts/ink_file.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef _ink_file_h_
-#define _ink_file_h_
+#pragma once
#include "ts/ink_config.h"
@@ -139,5 +138,3 @@ isdotdot(const char *path)
{
return path[0] == '.' && path[1] == '.' && path[2] == '\0';
}
-
-#endif // _ink_file_h_
diff --git a/lib/ts/ink_hash_table.h b/lib/ts/ink_hash_table.h
index 3b8f739..487b9ed 100644
--- a/lib/ts/ink_hash_table.h
+++ b/lib/ts/ink_hash_table.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#ifndef _ink_hash_table_h_
-#define _ink_hash_table_h_
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -144,4 +143,3 @@ ink_hash_table_iterator_next(InkHashTable *ht_ptr, InkHashTableIteratorState *st
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* #ifndef _ink_hash_table_h_ */
diff --git a/lib/ts/ink_hrtime.h b/lib/ts/ink_hrtime.h
index 7d2ac3a..1dc511c 100644
--- a/lib/ts/ink_hrtime.h
+++ b/lib/ts/ink_hrtime.h
@@ -28,8 +28,7 @@
This file contains code supporting the Inktomi high-resolution timer.
**************************************************************************/
-#if !defined(_ink_hrtime_h_)
-#define _ink_hrtime_h_
+#pragma once
#include "ts/ink_config.h"
#include "ts/ink_assert.h"
@@ -274,5 +273,3 @@ ink_hrtime_sleep(ink_hrtime delay)
struct timespec ts = ink_hrtime_to_timespec(delay);
nanosleep(&ts, nullptr);
}
-
-#endif /* _ink_hrtime_h_ */
diff --git a/lib/ts/ink_inet.h b/lib/ts/ink_inet.h
index 99c99c6..21ad755 100644
--- a/lib/ts/ink_inet.h
+++ b/lib/ts/ink_inet.h
@@ -22,8 +22,7 @@
*/
-#if !defined(_ink_inet_h_)
-#define _ink_inet_h_
+#pragma once
#include <netinet/in.h>
#include <netdb.h>
@@ -1541,5 +1540,3 @@ IpEndpoint::setToLoopback(int family)
}
return *this;
}
-
-#endif // _ink_inet.h
diff --git a/lib/ts/ink_inout.h b/lib/ts/ink_inout.h
index 66677fe..4ef4c03 100644
--- a/lib/ts/ink_inout.h
+++ b/lib/ts/ink_inout.h
@@ -26,8 +26,7 @@
**************************************************************************/
-#ifndef _INOUT_H
-#define _INOUT_H
+#pragma once
// source of good macros..
#ifdef __cplusplus
@@ -81,5 +80,3 @@ extern "C" {
(cp)[0] = l >> 8; \
(cp) += 8; \
}
-
-#endif /* #ifndef _INOUT_H */
diff --git a/lib/ts/ink_llqueue.h b/lib/ts/ink_llqueue.h
index 3161b1f..eb33762 100644
--- a/lib/ts/ink_llqueue.h
+++ b/lib/ts/ink_llqueue.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _INK_LLQUEUE_H
-#define _INK_LLQUEUE_H
+#pragma once
/****************************************************************************
@@ -52,5 +51,3 @@ uint64_t queue_len(LLQ *Q);
uint64_t queue_highwater(LLQ *Q);
void delete_queue(LLQ *Q); /* only deletes an empty queue but
provides symmetry. */
-
-#endif
diff --git a/lib/ts/ink_lockfile.h b/lib/ts/ink_lockfile.h
index 14687bc..a16daff 100644
--- a/lib/ts/ink_lockfile.h
+++ b/lib/ts/ink_lockfile.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __INK_LOCKFILE_H__
-#define __INK_LOCKFILE_H__
+#pragma once
#include "ts/ink_defs.h"
#include "ts/ink_string.h"
@@ -89,5 +88,3 @@ private:
char fname[PATH_NAME_MAX];
int fd;
};
-
-#endif // __LOCK_FILE_H__
diff --git a/lib/ts/ink_memory.h b/lib/ts/ink_memory.h
index b5280f2..7a9c205 100644
--- a/lib/ts/ink_memory.h
+++ b/lib/ts/ink_memory.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef _ink_memory_h_
-#define _ink_memory_h_
+#pragma once
#include <ctype.h>
#include <string.h>
@@ -603,5 +602,3 @@ path_join(ats_scoped_str const &lhs, ats_scoped_str const &rhs)
return x.release();
}
#endif /* __cplusplus */
-
-#endif
diff --git a/lib/ts/ink_mutex.h b/lib/ts/ink_mutex.h
index a0c36c9..27e6352 100644
--- a/lib/ts/ink_mutex.h
+++ b/lib/ts/ink_mutex.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _ink_mutex_h_
-#define _ink_mutex_h_
+#pragma once
/***********************************************************************
@@ -90,5 +89,3 @@ public:
ink_scoped_mutex_lock(ink_mutex &m) : _m(m) { ink_mutex_acquire(&_m); }
~ink_scoped_mutex_lock() { ink_mutex_release(&_m); }
};
-
-#endif /* _ink_mutex_h_ */
diff --git a/lib/ts/ink_platform.h b/lib/ts/ink_platform.h
index 95e3eab..fe7835c 100644
--- a/lib/ts/ink_platform.h
+++ b/lib/ts/ink_platform.h
@@ -22,8 +22,7 @@
limitations under the License.
*/
-#ifndef _ink_platform_h
-#define _ink_platform_h
+#pragma once
#include "ts/ink_config.h"
@@ -195,5 +194,3 @@ typedef unsigned int in_addr_t;
// on various OSs (linux-4096,osx/bsd-1024,
// windows-260,etc)
#endif
-
-#endif /* _ink_platform_h */
diff --git a/lib/ts/ink_queue.h b/lib/ts/ink_queue.h
index 3254e9a..98d0f48 100644
--- a/lib/ts/ink_queue.h
+++ b/lib/ts/ink_queue.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _ink_queue_h_
-#define _ink_queue_h_
+#pragma once
/***********************************************************************
@@ -205,5 +204,3 @@ void *ink_atomiclist_remove(InkAtomicList *l, void *item);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
-#endif /* _ink_queue_h_ */
diff --git a/lib/ts/ink_rand.h b/lib/ts/ink_rand.h
index 40d554a..5fd336d 100644
--- a/lib/ts/ink_rand.h
+++ b/lib/ts/ink_rand.h
@@ -58,8 +58,7 @@
email: m-mat @ math.sci.hiroshima-u.ac.jp (remove spaces)
*/
-#ifndef __INK_RAND_H__
-#define __INK_RAND_H__
+#pragma once
#include "ts/ink_defs.h"
#include "ts/ink_apidefs.h"
@@ -83,5 +82,3 @@ ink_rand_r(uint32_t *p)
{
return (((*p) = (*p) * 1103515245 + 12345) % ((uint32_t)0x7fffffff + 1));
}
-
-#endif /* __INK_RAND_H__ */
diff --git a/lib/ts/ink_resolver.h b/lib/ts/ink_resolver.h
index 65dfa0f..d580467 100644
--- a/lib/ts/ink_resolver.h
+++ b/lib/ts/ink_resolver.h
@@ -66,8 +66,7 @@
limitations under the License.
*/
-#ifndef _ink_resolver_h_
-#define _ink_resolver_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_inet.h"
@@ -286,5 +285,3 @@ int ts_host_res_order_to_string(HostResPreferenceOrder const &order, ///< order
char *out, ///< Target buffer for string.
int size ///< Size of buffer.
);
-
-#endif /* _ink_resolver_h_ */
diff --git a/lib/ts/ink_resource.h b/lib/ts/ink_resource.h
index cb0ac6f..e789e62 100644
--- a/lib/ts/ink_resource.h
+++ b/lib/ts/ink_resource.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __INK_RESOURCE_H__
-#define __INK_RESOURCE_H__
+#pragma once
#include "ts/ink_mutex.h"
#include <map>
@@ -55,5 +54,3 @@ private:
static std::map<const char *, Resource *> _resourceMap;
static ink_mutex resourceLock;
};
-
-#endif /* __INK_RESOURCE_H__ */
diff --git a/lib/ts/ink_rwlock.h b/lib/ts/ink_rwlock.h
index fd775f6..98c491b 100644
--- a/lib/ts/ink_rwlock.h
+++ b/lib/ts/ink_rwlock.h
@@ -27,8 +27,7 @@
// will not work if used in conjunction with ink_thread_cancel().
//-------------------------------------------------------------------------
-#ifndef _INK_RWLOCK_H_
-#define _INK_RWLOCK_H_
+#pragma once
#include "ts/ink_mutex.h"
#include "ts/ink_thread.h"
@@ -50,5 +49,3 @@ int ink_rwlock_destroy(ink_rwlock *rw);
int ink_rwlock_rdlock(ink_rwlock *rw);
int ink_rwlock_wrlock(ink_rwlock *rw);
int ink_rwlock_unlock(ink_rwlock *rw);
-
-#endif
diff --git a/lib/ts/ink_sock.h b/lib/ts/ink_sock.h
index 7c7d66e..d95623b 100644
--- a/lib/ts/ink_sock.h
+++ b/lib/ts/ink_sock.h
@@ -27,8 +27,7 @@
***************************************************************************/
-#if !defined(_ink_sock_h_)
-#define _ink_sock_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_defs.h"
@@ -64,5 +63,3 @@ int read_socket(int s, char *buffer, int length);
inkcoreapi uint32_t ink_inet_addr(const char *s);
int bind_unix_domain_socket(const char *path, mode_t mode);
-
-#endif /* _ink_sock_h_ */
diff --git a/lib/ts/ink_sprintf.h b/lib/ts/ink_sprintf.h
index 5323d7b..5840d59 100644
--- a/lib/ts/ink_sprintf.h
+++ b/lib/ts/ink_sprintf.h
@@ -31,8 +31,7 @@
****************************************************************************/
-#ifndef _ink_sprintf_h_
-#define _ink_sprintf_h_
+#pragma once
#include <stdio.h>
#include <stdarg.h>
@@ -41,5 +40,3 @@
int ink_bsprintf(char *buffer, const char *format, ...) TS_PRINTFLIKE(2, 3);
int ink_bvsprintf(char *buffer, const char *format, va_list ap);
-
-#endif
diff --git a/lib/ts/ink_stack_trace.h b/lib/ts/ink_stack_trace.h
index a2e5904..5d10fd0 100644
--- a/lib/ts/ink_stack_trace.h
+++ b/lib/ts/ink_stack_trace.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef ink_stack_trace_h
-#define ink_stack_trace_h
+#pragma once
// The max number of levels in the stack trace
#define INK_STACK_TRACE_MAX_LEVELS 100
@@ -35,5 +34,3 @@ void ink_stack_trace_dump();
#ifdef __cplusplus
}
#endif
-
-#endif /* ink_stack_trace_h */
diff --git a/lib/ts/ink_string++.h b/lib/ts/ink_string++.h
index f0ff41a..a8b5889 100644
--- a/lib/ts/ink_string++.h
+++ b/lib/ts/ink_string++.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#if !defined(_ink_string_pp_h_)
-#define _ink_string_pp_h_
+#pragma once
#include <stdio.h>
#include <strings.h>
@@ -298,5 +297,3 @@ StrList::append_string(const char *s, int len_not_counting_nul)
append(cell);
return (cell);
}
-
-#endif
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index 8885ebc..f4d3ad3 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef _ink_string_h_
-#define _ink_string_h_
+#pragma once
#include <stdio.h>
#include <memory.h>
@@ -384,5 +383,3 @@ ink_fast_ltoa(int64_t val, char *buf, int buf_len)
return ink_small_itoa((int)val, buf, buf_len);
}
-
-#endif
diff --git a/lib/ts/ink_sys_control.h b/lib/ts/ink_sys_control.h
index 479f335..e38871d 100644
--- a/lib/ts/ink_sys_control.h
+++ b/lib/ts/ink_sys_control.h
@@ -21,12 +21,9 @@
limitations under the License.
*/
-#ifndef _INK_SYS_CONTROL_H
-#define _INK_SYS_CONTROL_H
+#pragma once
#include <sys/resource.h>
rlim_t ink_max_out_rlimit(int which);
rlim_t ink_get_max_files();
-
-#endif /*_INK_SYS_CONTROL_H*/
diff --git a/lib/ts/ink_syslog.h b/lib/ts/ink_syslog.h
index 450a08a..58819bb 100644
--- a/lib/ts/ink_syslog.h
+++ b/lib/ts/ink_syslog.h
@@ -29,9 +29,6 @@
*
****************************************************************************/
-#ifndef _INK_SYSLOG_H_
-#define _INK_SYSLOG_H_
+#pragma once
int facility_string_to_int(const char *str);
-
-#endif
diff --git a/lib/ts/ink_thread.h b/lib/ts/ink_thread.h
index af4362f..71b2047 100644
--- a/lib/ts/ink_thread.h
+++ b/lib/ts/ink_thread.h
@@ -26,8 +26,7 @@
**************************************************************************/
-#ifndef _INK_THREAD_H
-#define _INK_THREAD_H
+#pragma once
#include "ts/ink_hrtime.h"
#include "ts/ink_defs.h"
@@ -309,5 +308,3 @@ ink_set_thread_name(const char *name ATS_UNUSED)
}
#endif /* #if defined(POSIX_THREAD) */
-
-#endif /*_INK_THREAD_H*/
diff --git a/lib/ts/ink_time.h b/lib/ts/ink_time.h
index 29b33fe..22425bf 100644
--- a/lib/ts/ink_time.h
+++ b/lib/ts/ink_time.h
@@ -31,8 +31,7 @@
****************************************************************************/
-#ifndef _ink_time_h_
-#define _ink_time_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_defs.h"
@@ -91,5 +90,3 @@ ink_timezone()
}
#endif /* #if defined(freebsd) || defined(openbsd) */
-
-#endif /* #ifndef _ink_time_h_ */
diff --git a/lib/ts/ink_uuid.h b/lib/ts/ink_uuid.h
index 7df48d8..09876d9 100644
--- a/lib/ts/ink_uuid.h
+++ b/lib/ts/ink_uuid.h
@@ -21,6 +21,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#pragma once
+
#include <stdio.h>
#include "ts/apidefs.h"
diff --git a/lib/ts/signals.h b/lib/ts/signals.h
index 558a884..5e23ab4 100644
--- a/lib/ts/signals.h
+++ b/lib/ts/signals.h
@@ -26,8 +26,7 @@
**************************************************************************/
-#ifndef __SIGNALS_H__
-#define __SIGNALS_H__
+#pragma once
typedef void (*signal_handler_t)(int signo, siginfo_t *info, void *ctx);
@@ -54,5 +53,3 @@ bool signal_check_handler(int signo, signal_handler_t handler);
// Start a thread to test whether signals have the expected handler. Apparantly useful for
// finding pthread bugs in some version of DEC Unix.
void signal_start_check_thread(signal_handler_t handler);
-
-#endif /* __SIGNALS_H__ */
diff --git a/lib/tsconfig/TsConfigGrammar.h b/lib/tsconfig/TsConfigGrammar.h
index 52f083b..604738b 100644
--- a/lib/tsconfig/TsConfigGrammar.h
+++ b/lib/tsconfig/TsConfigGrammar.h
@@ -30,8 +30,7 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-#ifndef YY_TSCONFIG_TSCONFIGGRAMMAR_H_INCLUDED
-# define YY_TSCONFIG_TSCONFIGGRAMMAR_H_INCLUDED
+#pragma once
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
@@ -127,5 +126,3 @@ int tsconfigparse (yyscan_t lexer, struct TsConfigHandlers* handlers);
int tsconfigparse ();
#endif
#endif /* ! YYPARSE_PARAM */
-
-#endif /* !YY_TSCONFIG_TSCONFIGGRAMMAR_H_INCLUDED */
diff --git a/lib/wccp/Wccp.h b/lib/wccp/Wccp.h
index 542ab2e..a6e217e 100644
--- a/lib/wccp/Wccp.h
+++ b/lib/wccp/Wccp.h
@@ -1,6 +1,3 @@
-#if !defined(ATS_WCCP_API_HEADER)
-#define ATS_WCCP_API_HEADER
-
/** @file
WCCP (v2) support API.
@@ -23,6 +20,8 @@
limitations under the License.
*/
+#pragma once
+
#include <ts/TsBuffer.h>
#include <tsconfig/Errata.h>
#include <memory.h>
@@ -516,4 +515,3 @@ EndPoint::useMD5Security(char const *key)
// ------------------------------------------------------
} // namespace Wccp
-#endif // include guard.
diff --git a/lib/wccp/WccpLocal.h b/lib/wccp/WccpLocal.h
index 8df077e..55ff1d3 100644
--- a/lib/wccp/WccpLocal.h
+++ b/lib/wccp/WccpLocal.h
@@ -1,6 +1,3 @@
-#if !defined(TS_WCCP_LOCAL_HEADER)
-#define TS_WCCP_LOCAL_HEADER
-
/** @file
WCCP (v2) support for Apache Traffic Server.
@@ -23,6 +20,8 @@
limitations under the License.
*/
+#pragma once
+
#include "Wccp.h"
#include "WccpUtil.h"
#include <ts/TsBuffer.h>
@@ -3747,5 +3746,3 @@ RouterImpl::RouterData::resize(size_t n)
// ------------------------------------------------------
} // namespace wccp
-
-#endif // TS_WCCP_LOCAL_HEADER
diff --git a/lib/wccp/WccpMeta.h b/lib/wccp/WccpMeta.h
index 000ba60..f46fac5 100644
--- a/lib/wccp/WccpMeta.h
+++ b/lib/wccp/WccpMeta.h
@@ -1,6 +1,3 @@
-#if !defined(TS_WCCP_META_HEADER)
-#define TS_WCCP_META_HEADER
-
/** @file
Meta programming support for WCCP.
@@ -23,6 +20,8 @@
limitations under the License.
*/
+#pragma once
+
#include <algorithm>
// Various meta programming efforts. Experimental at present.
diff --git a/lib/wccp/WccpUtil.h b/lib/wccp/WccpUtil.h
index b00359c..a2605e5 100644
--- a/lib/wccp/WccpUtil.h
+++ b/lib/wccp/WccpUtil.h
@@ -20,8 +20,7 @@
limitations under the License.
*/
-#if !defined(ATS_WCCP_UTIL_HEADER)
-#define ATS_WCCP_UTIL_HEADER
+#pragma once
#include <vector>
@@ -221,5 +220,3 @@ char const *ip_addr_to_str(uint32_t addr ///< Address to convert.
// ------------------------------------------------------
} // namespace Wccp
-
-#endif // define ATS_WCCP_UTIL_HEADER
diff --git a/mgmt/FileManager.h b/mgmt/FileManager.h
index 48f1853..30ccadf 100644
--- a/mgmt/FileManager.h
+++ b/mgmt/FileManager.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _FILE_MANAGER_H_
-#define _FILE_MANAGER_H_
+#pragma once
/****************************************************************************
*
@@ -106,5 +105,3 @@ private:
};
void initializeRegistry(); // implemented in AddConfigFilesHere.cc
-
-#endif
diff --git a/mgmt/RecordsConfig.h b/mgmt/RecordsConfig.h
index fabebad..4a40f64 100644
--- a/mgmt/RecordsConfig.h
+++ b/mgmt/RecordsConfig.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_RECORDS_CONFIG_H_)
-#define _RECORDS_CONFIG_H_
+#pragma once
//#include "MgmtDefs.h"
#include "P_RecCore.h"
@@ -51,5 +50,3 @@ void RecordsConfigIterate(RecordElementCallback, void *);
void LibRecordsConfigInit(); // initializes RecordsConfigIndex
void RecordsConfigOverrideFromEnvironment(); // Override records from the environment
void test_librecords();
-
-#endif
diff --git a/mgmt/Rollback.h b/mgmt/Rollback.h
index 190813a..d848e27 100644
--- a/mgmt/Rollback.h
+++ b/mgmt/Rollback.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _ROLLBACK_H_
-#define _ROLLBACK_H_
+#pragma once
/****************************************************************************
*
@@ -263,4 +262,3 @@ private:
// qSort comptable function to sort versionInfo*
// based on version number
int versionCmp(const void *i1, const void *i2);
-#endif
diff --git a/mgmt/api/CoreAPI.h b/mgmt/api/CoreAPI.h
index cf8733e..683d778 100644
--- a/mgmt/api/CoreAPI.h
+++ b/mgmt/api/CoreAPI.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _CORE_API_H
-#define _CORE_API_H
+#pragma once
#include <stdarg.h> // for va_list
@@ -86,5 +85,3 @@ TSMgmtError EventSignalCbUnregister(const char *event_name, TSEventSignalFunc fu
TSMgmtError HostStatusSetDown(const char *name);
TSMgmtError HostStatusSetUp(const char *name);
TSMgmtError StatsReset(const char *name = NULL);
-
-#endif
diff --git a/mgmt/api/CoreAPIShared.h b/mgmt/api/CoreAPIShared.h
index 16c0201..c5b6c0d 100644
--- a/mgmt/api/CoreAPIShared.h
+++ b/mgmt/api/CoreAPIShared.h
@@ -30,8 +30,7 @@
*
***************************************************************************/
-#ifndef _CORE_API_SHARED_H_
-#define _CORE_API_SHARED_H_
+#pragma once
#include "mgmtapi.h"
@@ -83,5 +82,3 @@ int connectDirect(const char *host, int port, uint64_t timeout);
// used for Events
int get_event_id(const char *event_name);
char *get_event_name(int id);
-
-#endif
diff --git a/mgmt/api/EventCallback.h b/mgmt/api/EventCallback.h
index 8965392..ffef9c7 100644
--- a/mgmt/api/EventCallback.h
+++ b/mgmt/api/EventCallback.h
@@ -35,8 +35,7 @@
* specific events. Used by both local api and remote api.
*/
-#ifndef _EVENT_CALLBACK_H_
-#define _EVENT_CALLBACK_H_
+#pragma once
#include "ts/ink_llqueue.h"
@@ -77,5 +76,3 @@ TSMgmtError cb_table_unregister(CallbackTable *cb_table, const char *event_name,
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
-#endif
diff --git a/mgmt/api/EventControlMain.h b/mgmt/api/EventControlMain.h
index 450c5f5..52de265 100644
--- a/mgmt/api/EventControlMain.h
+++ b/mgmt/api/EventControlMain.h
@@ -29,8 +29,7 @@
*
***************************************************************************/
-#ifndef EVENT_CONTROL_MAIN_H
-#define EVENT_CONTROL_MAIN_H
+#pragma once
#include "mgmtapi.h" //add the include path b/c included in web dir
#include "CoreAPIShared.h" // for NUM_EVENTS
@@ -52,5 +51,3 @@ void delete_event_queue(LLQ *q);
void apiAlarmCallback(alarm_t newAlarm, char *ip, char *desc);
void *event_callback_main(void *arg);
-
-#endif
diff --git a/mgmt/api/GenericParser.h b/mgmt/api/GenericParser.h
index 91ec104..b4bce9d 100644
--- a/mgmt/api/GenericParser.h
+++ b/mgmt/api/GenericParser.h
@@ -26,8 +26,7 @@
***************************************************************************/
-#ifndef _GENERIC_PARSER_H_
-#define _GENERIC_PARSER_H_
+#pragma once
#include <string.h>
#include "ts/ink_assert.h"
@@ -320,5 +319,3 @@ private:
*****************************************************************************************/
// char *strtrim(char *);
const char *strtrim(const char *, char chr = ' ');
-
-#endif /* _GENERIC_PARSER_H_ */
diff --git a/mgmt/api/NetworkMessage.h b/mgmt/api/NetworkMessage.h
index e56cb29..99c979b 100644
--- a/mgmt/api/NetworkMessage.h
+++ b/mgmt/api/NetworkMessage.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _NETWORK_MESSAGE_H_
-#define _NETWORK_MESSAGE_H_
+#pragma once
#include "MgmtMarshall.h"
@@ -93,5 +92,3 @@ TSMgmtError recv_mgmt_message(int fd, MgmtMarshallData &msg);
// Extract the first MGMT_MARSHALL_INT from the buffered message. This is the OpType.
OpType extract_mgmt_request_optype(void *msg, size_t msglen);
-
-#endif /* _NETWORK_MESSAGE_H_ */
diff --git a/mgmt/api/NetworkUtilsLocal.h b/mgmt/api/NetworkUtilsLocal.h
index 791bc10..cfa3281 100644
--- a/mgmt/api/NetworkUtilsLocal.h
+++ b/mgmt/api/NetworkUtilsLocal.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _NETWORK_UTILS_LOCAL_H_
-#define _NETWORK_UTILS_LOCAL_H_
+#pragma once
#include "ts/ink_defs.h"
#include "mgmtapi.h"
@@ -31,5 +30,3 @@
* Unmarshalling/marshalling
*****************************************************************************/
TSMgmtError preprocess_msg(int fd, void **req, size_t *reqlen);
-
-#endif /* _NETWORK_UTILS_LOCAL_H_ */
diff --git a/mgmt/api/NetworkUtilsRemote.h b/mgmt/api/NetworkUtilsRemote.h
index 415719a..31e8734 100644
--- a/mgmt/api/NetworkUtilsRemote.h
+++ b/mgmt/api/NetworkUtilsRemote.h
@@ -32,8 +32,7 @@
*
***************************************************************************/
-#ifndef _NETWORK_UTILS_REMOTE_H_
-#define _NETWORK_UTILS_REMOTE_H_
+#pragma once
#include "mgmtapi.h"
#include "NetworkMessage.h"
@@ -92,5 +91,3 @@ TSMgmtError send_unregister_all_callbacks(int fd, CallbackTable *cb_table);
* Un-marshalling (parse responses)
*****************************************************************************/
TSMgmtError parse_generic_response(OpType optype, int fd);
-
-#endif /* _NETWORK_UTILS_REMOTE_H_ */
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index 34f3ad8..83f6fc8 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -25,8 +25,7 @@
limitations under the License.
*/
-#ifndef __TS_MGMT_API_H__
-#define __TS_MGMT_API_H__
+#pragma once
#include <stdbool.h>
#include <stdint.h>
@@ -661,5 +660,3 @@ tsapi TSMgmtError TSInvalidateFromCacheUrlRegex(TSString url_regex, TSString *li
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
-#endif /* __TS_MGMT_API_H__ */
diff --git a/mgmt/utils/ExpandingArray.h b/mgmt/utils/ExpandingArray.h
index 146e0a5..36c7268 100644
--- a/mgmt/utils/ExpandingArray.h
+++ b/mgmt/utils/ExpandingArray.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _EXPANDING_ARRAY_H_
-#define _EXPANDING_ARRAY_H_
+#pragma once
/****************************************************************************
*
@@ -61,5 +60,3 @@ private:
int numValidValues;
bool freeContentsOnDestruct;
};
-
-#endif
diff --git a/mgmt/utils/MgmtHashTable.h b/mgmt/utils/MgmtHashTable.h
index b2330f8..ea50e03 100644
--- a/mgmt/utils/MgmtHashTable.h
+++ b/mgmt/utils/MgmtHashTable.h
@@ -30,8 +30,7 @@
*
*/
-#ifndef _MGMT_HASH_TABLE_H
-#define _MGMT_HASH_TABLE_H
+#pragma once
#include "ts/ink_memory.h"
#include "ts/ink_hash_table.h"
@@ -188,5 +187,3 @@ private:
ink_mutex mutex;
}; /* End class MgmtHashTable */
-
-#endif /* _MGMT_HASH_TABLE_H */
diff --git a/mgmt/utils/MgmtMarshall.h b/mgmt/utils/MgmtMarshall.h
index 7e0f752..45ff200 100644
--- a/mgmt/utils/MgmtMarshall.h
+++ b/mgmt/utils/MgmtMarshall.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _MGMT_MARSHALL_H
-#define _MGMT_MARSHALL_H
+#pragma once
#include <stdarg.h>
@@ -76,5 +75,3 @@ ssize_t mgmt_message_parse_v(const void *ptr, size_t len, const MgmtMarshallType
ssize_t mgmt_message_marshall(void *ptr, size_t len, const MgmtMarshallType *fields, unsigned count, ...);
ssize_t mgmt_message_marshall_v(void *ptr, size_t len, const MgmtMarshallType *fields, unsigned count, va_list ap);
-
-#endif /* _MGMT_MARSHALL_H */
diff --git a/mgmt/utils/MgmtSocket.h b/mgmt/utils/MgmtSocket.h
index a5c7464..7ee8a8f 100644
--- a/mgmt/utils/MgmtSocket.h
+++ b/mgmt/utils/MgmtSocket.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _MGMT_SOCKET_H_
-#define _MGMT_SOCKET_H_
+#pragma once
#include "ts/ink_platform.h"
@@ -99,5 +98,3 @@ bool mgmt_has_peereid(void);
// Get the Unix domain peer credentials.
int mgmt_get_peereid(int fd, uid_t *euid, gid_t *egid);
-
-#endif // _MGMT_SOCKET_H_
diff --git a/plugins/background_fetch/configs.h b/plugins/background_fetch/configs.h
index ab9bb89..cec9573 100644
--- a/plugins/background_fetch/configs.h
+++ b/plugins/background_fetch/configs.h
@@ -22,8 +22,7 @@
limitations under the License.
*/
-#ifndef CONFIGS_H_DEBFCE23_D6E9_40C2_AAA5_32B32586A3DA
-#define CONFIGS_H_DEBFCE23_D6E9_40C2_AAA5_32B32586A3DA
+#pragma once
#include <stdlib.h>
@@ -84,5 +83,3 @@ private:
BgFetchRule *_rules;
int _ref_count;
};
-
-#endif /* CONFIGS_H_DEBFCE23_D6E9_40C2_AAA5_32B32586A3DA */
diff --git a/plugins/background_fetch/headers.h b/plugins/background_fetch/headers.h
index f773928..fcb585a 100644
--- a/plugins/background_fetch/headers.h
+++ b/plugins/background_fetch/headers.h
@@ -22,11 +22,8 @@
limitations under the License.
*/
-#ifndef HEADERS_H_9E78B01C_90CA_4E2D_9346_B17740751B9F
-#define HEADERS_H_9E78B01C_90CA_4E2D_9346_B17740751B9F
+#pragma once
int remove_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len);
bool set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len, const char *val, int val_len);
void dump_headers(TSMBuffer bufp, TSMLoc hdr_loc);
-
-#endif /* HEADERS_H_9E78B01C_90CA_4E2D_9346_B17740751B9F */
diff --git a/plugins/background_fetch/rules.h b/plugins/background_fetch/rules.h
index 7ccc0fd..3b2c426 100644
--- a/plugins/background_fetch/rules.h
+++ b/plugins/background_fetch/rules.h
@@ -22,8 +22,7 @@
limitations under the License.
*/
-#ifndef RULES_H_E39522EE_1258_49B4_8FA4_7DAB7A6FC4DA
-#define RULES_H_E39522EE_1258_49B4_8FA4_7DAB7A6FC4DA
+#pragma once
#include <stdlib.h>
#include <netinet/in.h>
@@ -66,5 +65,3 @@ private:
const char *_value;
BgFetchRule *_next; // For the linked list
};
-
-#endif /* RULES_H_E39522EE_1258_49B4_8FA4_7DAB7A6FC4DA */
diff --git a/plugins/experimental/balancer/balancer.h b/plugins/experimental/balancer/balancer.h
index 24849f5..d69774f 100644
--- a/plugins/experimental/balancer/balancer.h
+++ b/plugins/experimental/balancer/balancer.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef BALANCER_H_29177589_32F1_4D93_AE4F_1E140EDCC273
-#define BALANCER_H_29177589_32F1_4D93_AE4F_1E140EDCC273
+#pragma once
#include <ts/ts.h>
#include <ts/remap.h>
@@ -49,5 +48,3 @@ struct BalancerInstance {
BalancerInstance *MakeHashBalancer(const char *);
BalancerInstance *MakeRoundRobinBalancer(const char *);
-
-#endif /* BALANCER_H_29177589_32F1_4D93_AE4F_1E140EDCC273 */
diff --git a/plugins/experimental/cachekey/cachekey.h b/plugins/experimental/cachekey/cachekey.h
index fb2337a..3a24631 100644
--- a/plugins/experimental/cachekey/cachekey.h
+++ b/plugins/experimental/cachekey/cachekey.h
@@ -21,8 +21,7 @@
* @brief Cache key manipulation (header file).
*/
-#ifndef PLUGINS_EXPERIMENTAL_CACHEKEY_CACHEKEY_H_
-#define PLUGINS_EXPERIMENTAL_CACHEKEY_CACHEKEY_H_
+#pragma once
#include "common.h"
#include "configs.h"
@@ -80,5 +79,3 @@ private:
String _key; /**< @brief cache key */
String _separator; /**< @brief a separator used to separate the cache key elements extracted from the URI */
};
-
-#endif /* PLUGINS_EXPERIMENTAL_CACHEKEY_CACHEKEY_H_ */
diff --git a/plugins/experimental/cachekey/common.h b/plugins/experimental/cachekey/common.h
index 628b50f..a608683 100644
--- a/plugins/experimental/cachekey/common.h
+++ b/plugins/experimental/cachekey/common.h
@@ -21,8 +21,7 @@
* @brief Common declarations and definitions (header file).
*/
-#ifndef PLUGINS_EXPERIMENTAL_CACHEKEY_COMMON_H_
-#define PLUGINS_EXPERIMENTAL_CACHEKEY_COMMON_H_
+#pragma once
#define PLUGIN_NAME "cachekey"
@@ -58,5 +57,3 @@ void PrintToStdErr(const char *fmt, ...);
TSDebug(PLUGIN_NAME, "%s:%d:%s() " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \
} while (0)
#endif /* CACHEKEY_UNIT_TEST */
-
-#endif /* PLUGINS_EXPERIMENTAL_CACHEKEY_COMMON_H_ */
diff --git a/plugins/experimental/cachekey/configs.h b/plugins/experimental/cachekey/configs.h
index 9ae29f9..f959e9c 100644
--- a/plugins/experimental/cachekey/configs.h
+++ b/plugins/experimental/cachekey/configs.h
@@ -21,8 +21,7 @@
* @brief Plugin configuration (header file).
*/
-#ifndef PLUGINS_EXPERIMENTAL_CACHEKEY_CONFIGS_H_
-#define PLUGINS_EXPERIMENTAL_CACHEKEY_CONFIGS_H_
+#pragma once
#include "pattern.h"
#include "common.h"
@@ -198,5 +197,3 @@ private:
String _separator = "/"; /**< @brief a separator used to separate the cache key elements extracted from the URI */
CacheKeyUriType _uriType = REMAP; /**< @brief shows which URI the cache key will be based on */
};
-
-#endif // PLUGINS_EXPERIMENTAL_CACHEKEY_CONFIGS_H_
diff --git a/plugins/experimental/cachekey/pattern.h b/plugins/experimental/cachekey/pattern.h
index 1448862..4f1c78b 100644
--- a/plugins/experimental/cachekey/pattern.h
+++ b/plugins/experimental/cachekey/pattern.h
@@ -21,8 +21,7 @@
* @brief PRCE related classes (header file).
*/
-#ifndef PLUGINS_EXPERIMENTAL_CACHEKEY_PATTERN_H_
-#define PLUGINS_EXPERIMENTAL_CACHEKEY_PATTERN_H_
+#pragma once
#include "ts/ink_defs.h"
@@ -137,5 +136,3 @@ public:
private:
std::vector<MultiPattern *> _list; /**< @brief vector which dictates the multi-pattern evaluation order */
};
-
-#endif /* PLUGINS_EXPERIMENTAL_CACHEKEY_PATTERN_H_ */
diff --git a/plugins/experimental/collapsed_connection/P_collapsed_connection.h b/plugins/experimental/collapsed_connection/P_collapsed_connection.h
index fc61b28..2cef66e 100644
--- a/plugins/experimental/collapsed_connection/P_collapsed_connection.h
+++ b/plugins/experimental/collapsed_connection/P_collapsed_connection.h
@@ -26,8 +26,7 @@
#include <list>
#include <utility>
-#ifndef ATS_COLLAPSED_CONNECTION_PLUGIN_H_
-#define ATS_COLLAPSED_CONNECTION_PLUGIN_H_
+#pragma once
#define PLUGIN_NAME "collapsed_connection"
#define PLUGIN_VENDOR "Apache Software Foundation"
@@ -112,5 +111,3 @@ const unsigned int c_hashSeed = 27240313;
static CcPluginData *getCcPlugin();
static int collapsedConnectionMainHandler(TSCont contp, TSEvent event, void *edata);
-
-#endif // ATS_COLLAPSED_CONNECTION_PLUGIN_H_
diff --git a/plugins/experimental/geoip_acl/lulu.h b/plugins/experimental/geoip_acl/lulu.h
index ef97cce..77a786a 100644
--- a/plugins/experimental/geoip_acl/lulu.h
+++ b/plugins/experimental/geoip_acl/lulu.h
@@ -20,8 +20,7 @@
//
// Implement the classes for the various types of hash keys we support.
//
-#ifndef __LULU_H__
-#define __LULU_H__ 1
+#pragma once
#include <sys/types.h>
@@ -30,5 +29,3 @@
// Used for Debug etc.
static const char *PLUGIN_NAME = "geoip_acl";
-
-#endif // __LULU_H__
diff --git a/plugins/experimental/mysql_remap/default.h b/plugins/experimental/mysql_remap/default.h
index 1108fed..7cd5a84 100644
--- a/plugins/experimental/mysql_remap/default.h
+++ b/plugins/experimental/mysql_remap/default.h
@@ -16,10 +16,7 @@
limitations under the License.
*/
-#ifndef __DEFAULT_H__
-#define __DEFAULT_H__ 1
+#pragma once
static const char *PLUGIN_NAME = "mysql_remap";
#define QSIZE 2048
-
-#endif // __DEFAULT_H__
diff --git a/plugins/experimental/mysql_remap/lib/dictionary.h b/plugins/experimental/mysql_remap/lib/dictionary.h
index a480b20..1f784e4 100644
--- a/plugins/experimental/mysql_remap/lib/dictionary.h
+++ b/plugins/experimental/mysql_remap/lib/dictionary.h
@@ -42,8 +42,7 @@
$Revision: 1.12 $
*/
-#ifndef _DICTIONARY_H_
-#define _DICTIONARY_H_
+#pragma once
/*---------------------------------------------------------------------------
Includes
@@ -188,5 +187,3 @@ void dictionary_unset(dictionary *d, char *key);
*/
/*--------------------------------------------------------------------------*/
void dictionary_dump(dictionary *d, FILE *out);
-
-#endif
diff --git a/plugins/experimental/mysql_remap/lib/iniparser.h b/plugins/experimental/mysql_remap/lib/iniparser.h
index aa4e08b..d9bb650 100644
--- a/plugins/experimental/mysql_remap/lib/iniparser.h
+++ b/plugins/experimental/mysql_remap/lib/iniparser.h
@@ -36,8 +36,7 @@
$Revision: 1.24 $
*/
-#ifndef _INIPARSER_H_
-#define _INIPARSER_H_
+#pragma once
/*---------------------------------------------------------------------------
Includes
@@ -294,5 +293,3 @@ dictionary *iniparser_load(const char *ininame);
*/
/*--------------------------------------------------------------------------*/
void iniparser_freedict(dictionary *d);
-
-#endif
diff --git a/plugins/experimental/ssl_cert_loader/ats-util.h b/plugins/experimental/ssl_cert_loader/ats-util.h
index c9023f3..14f2fec 100644
--- a/plugins/experimental/ssl_cert_loader/ats-util.h
+++ b/plugins/experimental/ssl_cert_loader/ats-util.h
@@ -22,8 +22,7 @@
*/
-#if !defined(_ats_util_h)
-#define _ats_util_h
+#pragma once
#if defined(__cplusplus)
/** Set data to zero.
@@ -61,5 +60,3 @@ ink_zero(T &t ///< Object to zero.
memset(&t, 0, sizeof(t));
}
#endif /* __cplusplus */
-
-#endif // ats-util.h
diff --git a/plugins/experimental/tls_bridge/regex.h b/plugins/experimental/tls_bridge/regex.h
index 6c73c26..0cb5215 100644
--- a/plugins/experimental/tls_bridge/regex.h
+++ b/plugins/experimental/tls_bridge/regex.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __TS_REGEX_H__
-#define __TS_REGEX_H__
+#pragma once
#include <pcre.h>
#include <algorithm>
@@ -59,5 +58,3 @@ inline Regex::Regex(self_type &&that)
std::swap(regex, that.regex);
std::swap(regex_extra, that.regex_extra);
}
-
-#endif /* __TS_REGEX_H__ */
diff --git a/plugins/experimental/url_sig/url_sig.h b/plugins/experimental/url_sig/url_sig.h
index d5fbb95..a5e9961 100644
--- a/plugins/experimental/url_sig/url_sig.h
+++ b/plugins/experimental/url_sig/url_sig.h
@@ -16,8 +16,7 @@
limitations under the License.
*/
-#ifndef URL_SIG_H_
-#define URL_SIG_H_
+#pragma once
/* in the query string that we add to sign the url: */
#define CIP_QSTRING "C" /* C=24.0.33.12 designates the client IP address */
@@ -50,5 +49,3 @@
#define USIG_HMAC_SHA1 1
#define USIG_HMAC_MD5 2
-
-#endif /* URL_SIG_H_ */
diff --git a/plugins/gzip/configuration.h b/plugins/gzip/configuration.h
index 264fb27..93e7526 100644
--- a/plugins/gzip/configuration.h
+++ b/plugins/gzip/configuration.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef GZIP_CONFIGURATION_H_
-#define GZIP_CONFIGURATION_H_
+#pragma once
#include <set>
#include <string>
@@ -190,5 +189,3 @@ private:
}; // class Configuration
} // namespace
-
-#endif
diff --git a/plugins/gzip/misc.h b/plugins/gzip/misc.h
index 6c00cc0..ba1a2ff 100644
--- a/plugins/gzip/misc.h
+++ b/plugins/gzip/misc.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _GZIP_MISC_H_
-#define _GZIP_MISC_H_
+#pragma once
#include <zlib.h>
#include <ts/ts.h>
@@ -98,5 +97,3 @@ const char *init_hidden_header_name();
int check_ts_version();
int register_plugin();
void gzip_log_ratio(int64_t in, int64_t out);
-
-#endif
diff --git a/plugins/header_rewrite/condition.h b/plugins/header_rewrite/condition.h
index bebeeb5..eae138b 100644
--- a/plugins/header_rewrite/condition.h
+++ b/plugins/header_rewrite/condition.h
@@ -19,8 +19,7 @@
//
// Implement the classes for the various types of hash keys we support.
//
-#ifndef __CONDITION_H__
-#define __CONDITION_H__ 1
+#pragma once
#include <string>
@@ -130,5 +129,3 @@ private:
CondModifiers _mods;
};
-
-#endif // __CONDITION_H
diff --git a/plugins/header_rewrite/conditions.h b/plugins/header_rewrite/conditions.h
index a5c2db7..1caff80 100644
--- a/plugins/header_rewrite/conditions.h
+++ b/plugins/header_rewrite/conditions.h
@@ -19,8 +19,7 @@
//
// Declarations for all conditionals / conditional values we support.
//
-#ifndef __CONDITIONS_H__
-#define __CONDITIONS_H__ 1
+#pragma once
#include <string>
#include <cstring>
@@ -554,5 +553,3 @@ protected:
private:
NetworkSessionQualifiers _net_qual = NET_QUAL_STACK;
};
-
-#endif // __CONDITIONS_H
diff --git a/plugins/header_rewrite/expander.h b/plugins/header_rewrite/expander.h
index d3a5d25..668589d 100644
--- a/plugins/header_rewrite/expander.h
+++ b/plugins/header_rewrite/expander.h
@@ -19,8 +19,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////
// Public interface for the Variable Expander
//
-#ifndef __EXPANDER_H__
-#define __EXPANDER_H__ 1
+#pragma once
#include <string>
@@ -36,5 +35,3 @@ public:
private:
std::string _source;
};
-
-#endif // __EXPANDER_H
diff --git a/plugins/header_rewrite/factory.h b/plugins/header_rewrite/factory.h
index 2dc7b8a..860525b 100644
--- a/plugins/header_rewrite/factory.h
+++ b/plugins/header_rewrite/factory.h
@@ -19,8 +19,7 @@
//
// Implement the classes for the various types of hash keys we support.
//
-#ifndef __FACTORY_H__
-#define __FACTORY_H__ 1
+#pragma once
#include <string>
@@ -29,5 +28,3 @@
Operator *operator_factory(const std::string &op);
Condition *condition_factory(const std::string &cond);
-
-#endif
diff --git a/plugins/header_rewrite/lulu.h b/plugins/header_rewrite/lulu.h
index 43ac223..e9e0252 100644
--- a/plugins/header_rewrite/lulu.h
+++ b/plugins/header_rewrite/lulu.h
@@ -20,8 +20,7 @@
//
// Implement the classes for the various types of hash keys we support.
//
-#ifndef __LULU_H__
-#define __LULU_H__ 1
+#pragma once
#include <string>
@@ -41,5 +40,3 @@ extern const char PLUGIN_NAME_DBG[];
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName &) = delete; \
void operator=(const TypeName &) = delete
-
-#endif // __LULU_H__
diff --git a/plugins/header_rewrite/matcher.h b/plugins/header_rewrite/matcher.h
index 95af794..8fc3069 100644
--- a/plugins/header_rewrite/matcher.h
+++ b/plugins/header_rewrite/matcher.h
@@ -19,8 +19,7 @@
//
// Implement the classes for the various types of hash keys we support.
//
-#ifndef __MATCHER_H__
-#define __MATCHER_H__ 1
+#pragma once
#include <string>
#include <sstream>
@@ -218,5 +217,3 @@ private:
T _data;
regexHelper helper;
};
-
-#endif // __MATCHER_H
diff --git a/plugins/header_rewrite/operator.h b/plugins/header_rewrite/operator.h
index 839b7b5..123a050 100644
--- a/plugins/header_rewrite/operator.h
+++ b/plugins/header_rewrite/operator.h
@@ -19,8 +19,7 @@
// Public interface for creating all operators. Don't user the operator.h interface
// directly!
//
-#ifndef __OPERATOR_H__
-#define __OPERATOR_H__ 1
+#pragma once
#include <string>
@@ -99,5 +98,3 @@ protected:
private:
DISALLOW_COPY_AND_ASSIGN(OperatorCookies);
};
-
-#endif // __OPERATOR_H
diff --git a/plugins/header_rewrite/operators.h b/plugins/header_rewrite/operators.h
index fda974a..2ad7204 100644
--- a/plugins/header_rewrite/operators.h
+++ b/plugins/header_rewrite/operators.h
@@ -19,8 +19,7 @@
//
// Implement the classes for the various types of hash keys we support.
//
-#ifndef __OPERATORS_H__
-#define __OPERATORS_H__ 1
+#pragma once
#include <string>
@@ -341,5 +340,3 @@ protected:
private:
DISALLOW_COPY_AND_ASSIGN(OperatorSetDebug);
};
-
-#endif // __OPERATORS_H
diff --git a/plugins/header_rewrite/parser.h b/plugins/header_rewrite/parser.h
index cc66707..23e27b7 100644
--- a/plugins/header_rewrite/parser.h
+++ b/plugins/header_rewrite/parser.h
@@ -19,8 +19,7 @@
//
// Interface for the config line parser
//
-#ifndef __PARSER_H__
-#define __PARSER_H__ 1
+#pragma once
#include <string>
#include <vector>
@@ -88,5 +87,3 @@ private:
protected:
std::vector<std::string> _tokens;
};
-
-#endif // __PARSER_H
diff --git a/plugins/header_rewrite/regex_helper.h b/plugins/header_rewrite/regex_helper.h
index caad006..b657e07 100644
--- a/plugins/header_rewrite/regex_helper.h
+++ b/plugins/header_rewrite/regex_helper.h
@@ -15,8 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef REGEX_HELPER_H
-#define REGEX_HELPER_H
+#pragma once
#include "ts/ink_defs.h"
@@ -51,5 +50,3 @@ private:
std::string regexString;
int regexCcount;
};
-
-#endif
diff --git a/plugins/header_rewrite/resources.h b/plugins/header_rewrite/resources.h
index b6ef7aa..238989a 100644
--- a/plugins/header_rewrite/resources.h
+++ b/plugins/header_rewrite/resources.h
@@ -19,8 +19,7 @@
//
// Implement the classes for the various types of hash keys we support.
//
-#ifndef __RESOURCES_H__
-#define __RESOURCES_H__ 1
+#pragma once
#include <string>
@@ -103,5 +102,3 @@ private:
bool _ready;
};
-
-#endif // __RESOURCES_H
diff --git a/plugins/header_rewrite/ruleset.h b/plugins/header_rewrite/ruleset.h
index 043a03b..f7e3523 100644
--- a/plugins/header_rewrite/ruleset.h
+++ b/plugins/header_rewrite/ruleset.h
@@ -19,8 +19,7 @@
//
// Implement the classes for the various types of hash keys we support.
//
-#ifndef __RULESET_H__
-#define __RULESET_H__ 1
+#pragma once
#include <string>
@@ -118,5 +117,3 @@ private:
OperModifiers _opermods;
bool _last;
};
-
-#endif // __RULESET_H
diff --git a/plugins/header_rewrite/statement.h b/plugins/header_rewrite/statement.h
index 8e538ba..dd41706 100644
--- a/plugins/header_rewrite/statement.h
+++ b/plugins/header_rewrite/statement.h
@@ -20,8 +20,7 @@
// Base class for all Conditions and Operations. We share the "linked" list, and the
// resource management / requirements.
//
-#ifndef __STATEMENT_H__
-#define __STATEMENT_H__ 1
+#pragma once
#include <string>
#include <time.h>
@@ -184,5 +183,3 @@ private:
std::vector<TSHttpHookID> _allowed_hooks;
TSHttpHookID _hook;
};
-
-#endif // __STATEMENT_H
diff --git a/plugins/header_rewrite/value.h b/plugins/header_rewrite/value.h
index a9507ca..67579e9 100644
--- a/plugins/header_rewrite/value.h
+++ b/plugins/header_rewrite/value.h
@@ -19,8 +19,7 @@
// Public interface for creating all values.
//
//
-#ifndef __VALUE_H__
-#define __VALUE_H__ 1
+#pragma once
#include <string>
@@ -122,5 +121,3 @@ private:
double _float_value;
Condition *_cond_val;
};
-
-#endif // __VALUE_H
diff --git a/plugins/s3_auth/aws_auth_v4.h b/plugins/s3_auth/aws_auth_v4.h
index 94d2a52..6e0b94a 100644
--- a/plugins/s3_auth/aws_auth_v4.h
+++ b/plugins/s3_auth/aws_auth_v4.h
@@ -22,8 +22,7 @@
* @see aws_auth_v4.cc
*/
-#ifndef PLUGINS_S3_AUTH_AWS_AUTH_V4_CC_
-#define PLUGINS_S3_AUTH_AWS_AUTH_V4_CC_
+#pragma once
#include <algorithm> /* transform() */
#include <cstddef> /* soze_t */
@@ -109,4 +108,3 @@ private:
const StringSet &_excludedHeaders;
const StringMap &_regionMap;
};
-#endif /* PLUGINS_S3_AUTH_AWS_AUTH_V4_CC_ */
diff --git a/plugins/s3_auth/aws_auth_v4_wrap.h b/plugins/s3_auth/aws_auth_v4_wrap.h
index b14f9c6..c065e07 100644
--- a/plugins/s3_auth/aws_auth_v4_wrap.h
+++ b/plugins/s3_auth/aws_auth_v4_wrap.h
@@ -22,8 +22,7 @@
* @see aws_auth_v4.h
*/
-#ifndef PLUGINS_S3_AUTH_AWS_AUTH_V4_WRAP_H_
-#define PLUGINS_S3_AUTH_AWS_AUTH_V4_WRAP_H_
+#pragma once
/* Define a header iterator to be used in the plugin using ATS API */
class HeaderIterator
@@ -125,5 +124,3 @@ public:
TSMLoc _hdrs;
TSMLoc _url;
};
-
-#endif /* PLUGINS_S3_AUTH_AWS_AUTH_V4_WRAP_H_ */
diff --git a/plugins/s3_auth/unit-tests/test_aws_auth_v4.h b/plugins/s3_auth/unit-tests/test_aws_auth_v4.h
index b46274d..d30dd3b 100644
--- a/plugins/s3_auth/unit-tests/test_aws_auth_v4.h
+++ b/plugins/s3_auth/unit-tests/test_aws_auth_v4.h
@@ -22,8 +22,7 @@
* @see test_aws_auth_v4.cc
*/
-#ifndef PLUGINS_S3_AUTH_UNIT_TESTS_TEST_AWS_AUTH_V4_H_
-#define PLUGINS_S3_AUTH_UNIT_TESTS_TEST_AWS_AUTH_V4_H_
+#pragma once
#include <string> /* std::string */
@@ -142,5 +141,3 @@ size_t getIso8601Time(time_t *now, char *dateTime, size_t dateTimeLen);
extern const StringMap defaultDefaultRegionMap;
extern const StringSet defaultExcludeHeaders;
extern const StringSet defaultIncludeHeaders;
-
-#endif /* PLUGINS_S3_AUTH_UNIT_TESTS_TEST_AWS_AUTH_V4_H_ */
diff --git a/proxy/CacheControl.h b/proxy/CacheControl.h
index 2e4fff2..150a35d 100644
--- a/proxy/CacheControl.h
+++ b/proxy/CacheControl.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _CACHE_CONTROL_H_
-#define _CACHE_CONTROL_H_
+#pragma once
#include "Main.h"
#include "P_EventSystem.h"
@@ -144,5 +143,3 @@ inkcoreapi bool ip_rule_in_CacheControlTable();
void initCacheControl();
void reloadCacheControl();
-
-#endif /* _CACHE_CONTROL_H_ */
diff --git a/proxy/CompletionUtil.h b/proxy/CompletionUtil.h
index 6695c9c..18b7d68 100644
--- a/proxy/CompletionUtil.h
+++ b/proxy/CompletionUtil.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _COMPLETION_UTIL_H_
-#define _COMPLETION_UTIL_H_
+#pragma once
// interface
class completionUtil
{
@@ -43,5 +42,3 @@ public:
};
#include "UnixCompletionUtil.h"
-
-#endif
diff --git a/proxy/ControlBase.h b/proxy/ControlBase.h
index f78ae28..51b9e22 100644
--- a/proxy/ControlBase.h
+++ b/proxy/ControlBase.h
@@ -29,8 +29,7 @@
*
****************************************************************************/
-#ifndef _CONTROL_BASE_H_
-#define _CONTROL_BASE_H_
+#pragma once
#include "ts/ink_platform.h"
#include "vector"
@@ -107,5 +106,3 @@ ControlBase::CheckForMatch(HttpRequestData *request_data, int last_number)
{
return (last_number < 0 || last_number > this->line_num) && this->CheckModifiers(request_data);
}
-
-#endif
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 3bc3f5c..8c375a0 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -84,8 +84,7 @@
// ControlMatcher.cc
//
-#ifndef _CONTROL_MATCHER_H_
-#define _CONTROL_MATCHER_H_
+#pragma once
#include "ts/DynArray.h"
#include "ts/ink_hash_table.h"
@@ -367,5 +366,3 @@ public:
int m_numEntries = 0;
const char *matcher_name = "unknown"; // Used for Debug/Warning/Error messages
};
-
-#endif /* _CONTROL_MATCHER_H_ */
diff --git a/proxy/CoreUtils.h b/proxy/CoreUtils.h
index dd6ed93..43f58f3 100644
--- a/proxy/CoreUtils.h
+++ b/proxy/CoreUtils.h
@@ -28,8 +28,7 @@
Description: Automated processing of core files on Sparc & Linux
****************************************************************************/
-#ifndef _CORE_UTILS_H_
-#define _CORE_UTILS_H_
+#pragma once
#if defined(linux)
#include <stdio.h>
@@ -198,5 +197,3 @@ public:
// parses the core file
void process_core(char *fname);
-
-#endif /* _core_utils_h_ */
diff --git a/proxy/EventName.h b/proxy/EventName.h
index f7ef20b..ed038f4 100644
--- a/proxy/EventName.h
+++ b/proxy/EventName.h
@@ -28,11 +28,8 @@
Description: Stringifying Events
****************************************************************************/
-#ifndef _EVENT_NAME_H_
-#define _EVENT_NAME_H_
+#pragma once
#include <unistd.h>
const char *event_int_to_string(int event, int blen = 0, char *buffer = NULL);
-
-#endif /* _event_name_h_ */
diff --git a/proxy/FetchSM.h b/proxy/FetchSM.h
index f7cc849..6dd9c37 100644
--- a/proxy/FetchSM.h
+++ b/proxy/FetchSM.h
@@ -27,8 +27,7 @@
*
****************************************************************************/
-#ifndef _FETCH_SM_H
-#define _FETCH_SM_H
+#pragma once
#include "P_Net.h"
#include "HttpSM.h"
@@ -172,5 +171,3 @@ private:
int64_t resp_content_length = -1;
int64_t resp_received_body_len = 0;
};
-
-#endif
diff --git a/proxy/HostStatus.h b/proxy/HostStatus.h
index c8d80f7..6e1104a 100644
--- a/proxy/HostStatus.h
+++ b/proxy/HostStatus.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _HOST_SELECTION_H_
-#define _HOST_SELECTION_H_
+#pragma once
#include "ControlBase.h"
#include "ControlMatcher.h"
@@ -71,5 +70,3 @@ private:
ink_rwlock host_status_rwlock;
ink_rwlock host_statids_rwlock;
};
-
-#endif
diff --git a/proxy/IPAllow.h b/proxy/IPAllow.h
index 05023be..9994dae 100644
--- a/proxy/IPAllow.h
+++ b/proxy/IPAllow.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _IP_ALLOW_H_
-#define _IP_ALLOW_H_
+#pragma once
#include "Main.h"
#include "hdrs/HTTP.h"
@@ -186,5 +185,3 @@ IpAllow::match(sockaddr const *ip, match_key_t key) const
map.contains(ip, &raw);
return static_cast<AclRecord *>(raw);
}
-
-#endif
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index 4b2e58d..7d94c91 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __INK_API_INTERNAL_H__
-#define __INK_API_INTERNAL_H__
+#pragma once
#include "P_EventSystem.h"
#include "URL.h"
@@ -347,5 +346,3 @@ extern HttpAPIHooks *http_global_hooks;
extern LifecycleAPIHooks *lifecycle_hooks;
extern SslAPIHooks *ssl_hooks;
extern ConfigUpdateCbTable *global_config_cbs;
-
-#endif /* __INK_API_INTERNAL_H__ */
diff --git a/proxy/Main.h b/proxy/Main.h
index 0a76129..4df2e06 100644
--- a/proxy/Main.h
+++ b/proxy/Main.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef _Main_h_
-#define _Main_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_apidefs.h"
@@ -79,5 +78,3 @@ extern AppVersionInfo appVersionInfo;
void crash_logger_init();
void crash_logger_invoke(int signo, siginfo_t *info, void *ctx);
-
-#endif /* _Main_h_ */
diff --git a/proxy/Milestones.h b/proxy/Milestones.h
index 0472aff..52265cd 100644
--- a/proxy/Milestones.h
+++ b/proxy/Milestones.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_Milestones_h_)
-#define _Milestones_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_hrtime.h"
@@ -76,5 +75,3 @@ public:
private:
ink_hrtime milestones[TS_MILESTONE_LAST_ENTRY];
};
-
-#endif /* _Milestones_h_ */
diff --git a/proxy/ParentConsistentHash.h b/proxy/ParentConsistentHash.h
index 607a7e4..9f1897d 100644
--- a/proxy/ParentConsistentHash.h
+++ b/proxy/ParentConsistentHash.h
@@ -27,8 +27,7 @@
*
****************************************************************************/
-#ifndef _PARENT_CONSISTENT_HASH_H
-#define _PARENT_CONSISTENT_HASH_H
+#pragma once
#include "ts/HashSip.h"
#include "ParentSelection.h"
@@ -63,5 +62,3 @@ public:
uint32_t numParents(ParentResult *result) const;
void markParentUp(ParentResult *result);
};
-
-#endif
diff --git a/proxy/ParentRoundRobin.h b/proxy/ParentRoundRobin.h
index 3175940..af8935a 100644
--- a/proxy/ParentRoundRobin.h
+++ b/proxy/ParentRoundRobin.h
@@ -27,8 +27,7 @@
*
*****************************************************************************/
-#ifndef _PARENT_ROUND_ROBIN_H
-#define _PARENT_ROUND_ROBIN_H
+#pragma once
#include "ParentSelection.h"
@@ -50,5 +49,3 @@ public:
void selectParent(bool firstCall, ParentResult *result, RequestData *rdata, unsigned int fail_threshold, unsigned int retry_time);
uint32_t numParents(ParentResult *result) const;
};
-
-#endif
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index d718e53..ce790a4 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -28,8 +28,7 @@
*
****************************************************************************/
-#ifndef _PARENT_SELECTION_H_
-#define _PARENT_SELECTION_H_
+#pragma once
#include "Main.h"
#include "ProxyConfig.h"
@@ -416,5 +415,3 @@ struct SocksServerConfig {
static int m_id;
};
-
-#endif
diff --git a/proxy/Plugin.h b/proxy/Plugin.h
index 85edf1b..d0b3a97 100644
--- a/proxy/Plugin.h
+++ b/proxy/Plugin.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __PLUGIN_H__
-#define __PLUGIN_H__
+#pragma once
#include "ts/List.h"
@@ -86,5 +85,3 @@ public:
return 0;
}
};
-
-#endif /* __PLUGIN_H__ */
diff --git a/proxy/PluginVC.h b/proxy/PluginVC.h
index 34085bb..f591e8d 100644
--- a/proxy/PluginVC.h
+++ b/proxy/PluginVC.h
@@ -33,8 +33,7 @@
****************************************************************************/
-#ifndef _PLUGIN_VC_H_
-#define _PLUGIN_VC_H_
+#pragma once
#include "Plugin.h"
#include "P_Net.h"
@@ -281,5 +280,3 @@ inline PluginVCCore::PluginVCCore()
id = ink_atomic_increment(&nextid, 1);
}
-
-#endif
diff --git a/proxy/Prefetch.h b/proxy/Prefetch.h
index ae5aa02..439f8ac 100644
--- a/proxy/Prefetch.h
+++ b/proxy/Prefetch.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _PREFETCH_H_
-#define _PREFETCH_H_
+#pragma once
#include <ts/IpMap.h>
#include "TransformInternal.h"
@@ -431,5 +430,3 @@ public:
#define PREFETCH_CONFIG_UPDATE_TIMEOUT (HRTIME_SECOND * 60)
#endif // PREFETCH
-
-#endif // _PREFETCH_H_
diff --git a/proxy/ProtocolProbeSessionAccept.h b/proxy/ProtocolProbeSessionAccept.h
index d38082a..ae05040 100644
--- a/proxy/ProtocolProbeSessionAccept.h
+++ b/proxy/ProtocolProbeSessionAccept.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef ProtocolProbeSessionAccept_H_
-#define ProtocolProbeSessionAccept_H_
+#pragma once
#include "I_SessionAccept.h"
@@ -67,5 +66,3 @@ private:
friend struct ProtocolProbeTrampoline;
};
-
-#endif /* ProtocolProbeSessionAccept_H_ */
diff --git a/proxy/ProxyClientSession.h b/proxy/ProxyClientSession.h
index ec636bd..120d102 100644
--- a/proxy/ProxyClientSession.h
+++ b/proxy/ProxyClientSession.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __PROXY_CLIENT_SESSION_H__
-#define __PROXY_CLIENT_SESSION_H__
+#pragma once
#include <ts/ink_platform.h>
#include <ts/ink_resolver.h>
@@ -303,5 +302,3 @@ private:
// aborts.
bool m_active = false;
};
-
-#endif // __PROXY_CLIENT_SESSION_H__
diff --git a/proxy/ProxyClientTransaction.h b/proxy/ProxyClientTransaction.h
index 0ada783..79d7954 100644
--- a/proxy/ProxyClientTransaction.h
+++ b/proxy/ProxyClientTransaction.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __PROXY_CLIENT_TRANSACTION_H__
-#define __PROXY_CLIENT_TRANSACTION_H__
+#pragma once
#include "ProxyClientSession.h"
#include <ts/string_view.h>
@@ -287,5 +286,3 @@ protected:
private:
};
-
-#endif /* __PROXY_CLIENT_TRANSACTION_H__ */
diff --git a/proxy/RegressionSM.h b/proxy/RegressionSM.h
index ddb4c85..32f2f42 100644
--- a/proxy/RegressionSM.h
+++ b/proxy/RegressionSM.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _RegressionSM_h
-#define _RegressionSM_h
+#pragma once
#include "I_EventSystem.h"
#include "ts/Regression.h"
@@ -78,5 +77,3 @@ RegressionSM *r_sequential(RegressionTest *t, int n, RegressionSM *sm);
RegressionSM *r_sequential(RegressionTest *t, RegressionSM *sm, ...); // terminate list in NULL
RegressionSM *r_parallel(RegressionTest *t, int n, RegressionSM *sm);
RegressionSM *r_parallel(RegressionTest *t, RegressionSM *sm, ...); // terminate list in NULL
-
-#endif
diff --git a/proxy/ReverseProxy.h b/proxy/ReverseProxy.h
index 187dcd6..4009b14 100644
--- a/proxy/ReverseProxy.h
+++ b/proxy/ReverseProxy.h
@@ -30,8 +30,7 @@
*
****************************************************************************/
-#ifndef _REVERSE_PROXY_H_
-#define _REVERSE_PROXY_H_
+#pragma once
#include "P_RecProcess.h"
@@ -60,5 +59,3 @@ bool response_url_remap(HTTPHdr *response_header, UrlRewrite *table);
bool reloadUrlRewrite();
int url_rewrite_CB(const char *name, RecDataT data_type, RecData data, void *cookie);
-
-#endif
diff --git a/proxy/Show.h b/proxy/Show.h
index 1cc12eb..afd5326 100644
--- a/proxy/Show.h
+++ b/proxy/Show.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef _Show_h_
-#define _Show_h_
+#pragma once
#include "StatPages.h"
@@ -162,5 +161,3 @@ public:
ats_free(start);
}
};
-
-#endif
diff --git a/proxy/StatPages.h b/proxy/StatPages.h
index 3235b65..deff3ef 100644
--- a/proxy/StatPages.h
+++ b/proxy/StatPages.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef _StatPages_h_
-#define _StatPages_h_
+#pragma once
#include "P_EventSystem.h"
#include "HTTP.h"
@@ -120,5 +119,3 @@ protected:
int response_size;
int response_length;
};
-
-#endif
diff --git a/proxy/TestPreProc.h b/proxy/TestPreProc.h
index 2780e81..adcba16 100644
--- a/proxy/TestPreProc.h
+++ b/proxy/TestPreProc.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_TestPreProc_h_)
-#define _TestPreProc_h_
+#pragma once
class IOBuffer;
@@ -48,5 +47,3 @@ private:
unsigned m_len;
IOBuffer *m_cb;
};
-
-#endif
diff --git a/proxy/TimeTrace.h b/proxy/TimeTrace.h
index 15ad8a3..fb3f42f 100644
--- a/proxy/TimeTrace.h
+++ b/proxy/TimeTrace.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#ifndef _TimeTrace_h_
-#define _TimeTrace_h_
+#pragma once
// #define ENABLE_TIME_TRACE
@@ -76,7 +75,3 @@ extern int open_delay_events;
#else // !ENABLE_TIME_TRACE
#define LOG_EVENT_TIME(_start_time, _time_dist, _time_cnt)
#endif // !ENABLE_TIME_TRACE
-
-#endif // _TimeTrace_h_
-
-// End of TimeTrace.h
diff --git a/proxy/Transform.h b/proxy/Transform.h
index 522b510..ca00408 100644
--- a/proxy/Transform.h
+++ b/proxy/Transform.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __TRANSFORM_H__
-#define __TRANSFORM_H__
+#pragma once
#include "P_EventSystem.h"
#include "HTTP.h"
@@ -106,5 +105,3 @@ num_chars_for_int(int64_t i)
}
extern TransformProcessor transformProcessor;
-
-#endif /* __TRANSFORM_H__ */
diff --git a/proxy/TransformInternal.h b/proxy/TransformInternal.h
index 2e923c1..2eacc69 100644
--- a/proxy/TransformInternal.h
+++ b/proxy/TransformInternal.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __TRANSFORM_INTERNAL_H__
-#define __TRANSFORM_INTERNAL_H__
+#pragma once
#include "HttpSM.h"
#include "MIME.h"
@@ -153,5 +152,3 @@ public:
extern PrefetchProcessor prefetchProcessor;
#endif // PREFETCH
-
-#endif /* __TRANSFORM_INTERNAL_H__ */
diff --git a/proxy/UDPAPIClientTest.h b/proxy/UDPAPIClientTest.h
index 0b28f5f..65f7b46 100644
--- a/proxy/UDPAPIClientTest.h
+++ b/proxy/UDPAPIClientTest.h
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#pragma once
#include "api/include/experimental.h"
void UDPClientTestInit();
diff --git a/proxy/UDPAPITest.h b/proxy/UDPAPITest.h
index 542a33d..7ccb7eb 100644
--- a/proxy/UDPAPITest.h
+++ b/proxy/UDPAPITest.h
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#pragma once
#include "api/include/experimental.h"
void UDPTestInit();
diff --git a/proxy/UnixCompletionUtil.h b/proxy/UnixCompletionUtil.h
index 6990262..53f5038 100644
--- a/proxy/UnixCompletionUtil.h
+++ b/proxy/UnixCompletionUtil.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _UNIX_COMPLETION_UTIL_H_
-#define _UNIX_COMPLETION_UTIL_H_
+#pragma once
// platform specific wrappers for dealing with I/O completion events
// passed into and back from the I/O core.
@@ -101,4 +100,3 @@ completionUtil::getError(Event *e)
UDPIOEvent *u = (UDPIOEvent *)e;
return u->getError();
}
-#endif
diff --git a/proxy/api/ts/InkAPIPrivateIOCore.h b/proxy/api/ts/InkAPIPrivateIOCore.h
index 5c716a7..cb642ba 100644
--- a/proxy/api/ts/InkAPIPrivateIOCore.h
+++ b/proxy/api/ts/InkAPIPrivateIOCore.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __INK_API_PRIVATE_IOCORE_H__
-#define __INK_API_PRIVATE_IOCORE_H__
+#pragma once
#if !defined(__GNUC__)
#include "I_EventSystem.h"
#include "I_Cache.h"
@@ -201,5 +200,3 @@ tsapi INKUDPPacket INKUDPPacketGet(INKUDPacketQueue queuep);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
-#endif /* __INK_API_PRIVATE_IOCORE_H__ */
diff --git a/proxy/api/ts/TsException.h b/proxy/api/ts/TsException.h
index c43d00e..f113c46 100644
--- a/proxy/api/ts/TsException.h
+++ b/proxy/api/ts/TsException.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(TS_EXCEPTION_HEADER)
-#define TS_EXCEPTION_HEADER
+#pragma once
/** @file
Apache Traffic Server Exceptions.
@@ -63,5 +62,3 @@ inline Exception::Exception(const char *text) : m_text(text)
{
}
}
-
-#endif // TS_EXCEPTION_HEADER
diff --git a/proxy/api/ts/experimental.h b/proxy/api/ts/experimental.h
index 1acc179..8e2cda0 100644
--- a/proxy/api/ts/experimental.h
+++ b/proxy/api/ts/experimental.h
@@ -29,8 +29,7 @@
* Traffic Server, DO NOT USE anything in this file.
*/
-#ifndef __TS_API_EXPERIMENTAL_H__
-#define __TS_API_EXPERIMENTAL_H__
+#pragma once
#ifdef __cplusplus
extern "C" {
@@ -434,4 +433,3 @@ tsapi TSMLoc TSFetchRespHdrMLocGet(TSFetchSM fetch_sm);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* __TS_API_EXPERIMENTAL_H__ */
diff --git a/proxy/api/ts/remap.h b/proxy/api/ts/remap.h
index 2ad2cc2..70847bd 100644
--- a/proxy/api/ts/remap.h
+++ b/proxy/api/ts/remap.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __TS_REMAP_H__
-#define __TS_REMAP_H__
+#pragma once
#ifndef tsapi
#define tsapi
@@ -122,4 +121,3 @@ tsapi void TSRemapOSResponse(void *ih, TSHttpTxn rh, int os_response_type);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* #ifndef __TS_REMAP_H__ */
diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h
index 1d6314f..4887c2f 100644
--- a/proxy/api/ts/ts.h
+++ b/proxy/api/ts/ts.h
@@ -27,8 +27,7 @@
*/
-#ifndef __TS_API_H__
-#define __TS_API_H__
+#pragma once
#include <ts/apidefs.h>
@@ -2473,5 +2472,3 @@ tsapi TSIOBufferReader TSHttpTxnPostBufferReaderGet(TSHttpTxn txnp);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-
-#endif /* __TS_API_H__ */
diff --git a/proxy/hdrs/HTTP.h b/proxy/hdrs/HTTP.h
index 47d750b..597739f 100644
--- a/proxy/hdrs/HTTP.h
+++ b/proxy/hdrs/HTTP.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HTTP_H__
-#define __HTTP_H__
+#pragma once
#include <assert.h>
#include "ts/Arena.h"
@@ -1584,5 +1583,3 @@ HTTPInfo::get_frag_offset_count()
{
return m_alt ? m_alt->m_frag_offset_count : 0;
}
-
-#endif /* __HTTP_H__ */
diff --git a/proxy/hdrs/HdrHeap.h b/proxy/hdrs/HdrHeap.h
index 89b4829..af34383 100644
--- a/proxy/hdrs/HdrHeap.h
+++ b/proxy/hdrs/HdrHeap.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#ifndef _HDR_HEAP_H_
-#define _HDR_HEAP_H_
+#pragma once
#include "ts/Ptr.h"
#include "ts/ink_defs.h"
@@ -480,4 +479,3 @@ HdrHeapSDKHandle::set(const HdrHeapSDKHandle *from)
inkcoreapi HdrHeap *new_HdrHeap(int size = HDR_HEAP_DEFAULT_SIZE);
void hdr_heap_test();
-#endif
diff --git a/proxy/hdrs/HdrTest.h b/proxy/hdrs/HdrTest.h
index 445ecd5..df74d3b 100644
--- a/proxy/hdrs/HdrTest.h
+++ b/proxy/hdrs/HdrTest.h
@@ -32,8 +32,7 @@
****************************************************************************/
-#ifndef _HdrTest_H_
-#define _HdrTest_H_
+#pragma once
#include "ts/Regression.h"
@@ -77,5 +76,3 @@ private:
void bri_box(const char *s);
int failures_to_status(const char *testname, int nfail);
};
-
-#endif
diff --git a/proxy/hdrs/HdrToken.h b/proxy/hdrs/HdrToken.h
index c489092..1ce3c64 100644
--- a/proxy/hdrs/HdrToken.h
+++ b/proxy/hdrs/HdrToken.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HDRTOKEN_H__
-#define __HDRTOKEN_H__
+#pragma once
#include <assert.h>
#include <sys/types.h>
@@ -384,5 +383,3 @@ hdrtoken_wks_to_flags(const char *wks)
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-
-#endif /* __HDRTOKEN_H__ */
diff --git a/proxy/hdrs/HdrUtils.h b/proxy/hdrs/HdrUtils.h
index dd720a2..0f7e901 100644
--- a/proxy/hdrs/HdrUtils.h
+++ b/proxy/hdrs/HdrUtils.h
@@ -31,8 +31,7 @@
****************************************************************************/
-#ifndef _HDR_UTILS_H_
-#define _HDR_UTILS_H_
+#pragma once
#include "ts/ParseRules.h"
#include "MIME.h"
@@ -182,5 +181,3 @@ HdrCsvIter::get_next_int(int *valid)
return 0;
}
}
-
-#endif
diff --git a/proxy/hdrs/HttpCompat.h b/proxy/hdrs/HttpCompat.h
index d9d46da..d534c17 100644
--- a/proxy/hdrs/HttpCompat.h
+++ b/proxy/hdrs/HttpCompat.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HTTP_COMPAT_H__
-#define __HTTP_COMPAT_H__
+#pragma once
#include "ts/ink_string++.h"
#include "MIME.h"
@@ -91,5 +90,3 @@ public:
parse_tok_list(list, 1, comma_list_str, comma_list_len, ';');
}
};
-
-#endif /* __HTTP_COMPAT_H__ */
diff --git a/proxy/hdrs/MIME.h b/proxy/hdrs/MIME.h
index 207cb15..534e78a 100644
--- a/proxy/hdrs/MIME.h
+++ b/proxy/hdrs/MIME.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __MIME_H__
-#define __MIME_H__
+#pragma once
#include <sys/time.h>
@@ -1723,5 +1722,3 @@ MIMEHdr::set_server(const char *server_id_tag, int server_id_tag_size)
{
value_set(MIME_FIELD_SERVER, MIME_LEN_SERVER, server_id_tag, server_id_tag_size);
}
-
-#endif /* __MIME_H__ */
diff --git a/proxy/hdrs/URL.h b/proxy/hdrs/URL.h
index dda33bc..de8f820 100644
--- a/proxy/hdrs/URL.h
+++ b/proxy/hdrs/URL.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __URL_H__
-#define __URL_H__
+#pragma once
#include "ts/Arena.h"
#include "HdrToken.h"
@@ -723,5 +722,3 @@ URL::unescapify(Arena *arena, const char *str, int length)
{
return url_unescapify(arena, str, length);
}
-
-#endif /* __URL_H__ */
diff --git a/proxy/http/Http1ClientSession.h b/proxy/http/Http1ClientSession.h
index 7bd5b19..b0115b2 100644
--- a/proxy/http/Http1ClientSession.h
+++ b/proxy/http/Http1ClientSession.h
@@ -29,8 +29,7 @@
****************************************************************************/
-#ifndef _HTTP1_CLIENT_SESSION_H_
-#define _HTTP1_CLIENT_SESSION_H_
+#pragma once
//#include "libts.h"
#include "P_Net.h"
@@ -219,5 +218,3 @@ public:
};
extern ClassAllocator<Http1ClientSession> http1ClientSessionAllocator;
-
-#endif
diff --git a/proxy/http/Http1ClientTransaction.h b/proxy/http/Http1ClientTransaction.h
index e53372d..61d8d8a 100644
--- a/proxy/http/Http1ClientTransaction.h
+++ b/proxy/http/Http1ClientTransaction.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HTTP_CLIENT_TRANSACTION_H_
-#define __HTTP_CLIENT_TRANSACTION_H_
+#pragma once
#include "../ProxyClientTransaction.h"
@@ -141,5 +140,3 @@ public:
protected:
bool outbound_transparent{false};
};
-
-#endif
diff --git a/proxy/http/HttpBodyFactory.h b/proxy/http/HttpBodyFactory.h
index 3616286..277c0f1 100644
--- a/proxy/http/HttpBodyFactory.h
+++ b/proxy/http/HttpBodyFactory.h
@@ -52,8 +52,7 @@
****************************************************************************/
-#ifndef _HttpBodyFactory_h_
-#define _HttpBodyFactory_h_
+#pragma once
#include <strings.h>
#include <sys/types.h>
@@ -236,5 +235,3 @@ private:
bool callbacks_established = false; // all config variables present
RawHashTable *table_of_sets = nullptr; // sets of template hash tables
};
-
-#endif
diff --git a/proxy/http/HttpCacheSM.h b/proxy/http/HttpCacheSM.h
index b72d438..1380372 100644
--- a/proxy/http/HttpCacheSM.h
+++ b/proxy/http/HttpCacheSM.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#ifndef _HTTP_CACHE_SM_H_
-#define _HTTP_CACHE_SM_H_
+#pragma once
#include "P_Cache.h"
#include "ProxyConfig.h"
@@ -212,5 +211,3 @@ private:
int lookup_max_recursive;
int current_lookup_level;
};
-
-#endif
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 8a22a43..d28f778 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -31,8 +31,7 @@
****************************************************************************/
-#ifndef _HttpConfig_h_
-#define _HttpConfig_h_
+#pragma once
#include <stdlib.h>
#include <stdio.h>
@@ -928,4 +927,3 @@ inline HttpConfigParams::~HttpConfigParams()
delete connect_ports;
}
}
-#endif /* #ifndef _HttpConfig_h_ */
diff --git a/proxy/http/HttpConnectionCount.h b/proxy/http/HttpConnectionCount.h
index 916ce93..9567710 100644
--- a/proxy/http/HttpConnectionCount.h
+++ b/proxy/http/HttpConnectionCount.h
@@ -33,8 +33,7 @@
#include "Show.h"
#include <sstream>
-#ifndef _HTTP_CONNECTION_COUNT_H_
-#define _HTTP_CONNECTION_COUNT_H_
+#pragma once
/**
* Singleton class to keep track of the number of connections per host
@@ -256,5 +255,3 @@ private:
};
Action *register_ShowConnectionCount(Continuation *, HTTPHdr *);
-
-#endif
diff --git a/proxy/http/HttpDebugNames.h b/proxy/http/HttpDebugNames.h
index 9db419d..ed7d7aa 100644
--- a/proxy/http/HttpDebugNames.h
+++ b/proxy/http/HttpDebugNames.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_HttpDebugNames_h_)
-#define _HttpDebugNames_h_
+#pragma once
#include "HttpTransact.h"
@@ -36,5 +35,3 @@ public:
static const char *get_api_hook_name(TSHttpHookID t);
static const char *get_server_state_name(HttpTransact::ServerState_t state);
};
-
-#endif
diff --git a/proxy/http/HttpPages.h b/proxy/http/HttpPages.h
index 5cc78f1..d5f827a 100644
--- a/proxy/http/HttpPages.h
+++ b/proxy/http/HttpPages.h
@@ -31,8 +31,7 @@
****************************************************************************/
-#ifndef _HTTP_PAGES_H_
-#define _HTTP_PAGES_H_
+#pragma once
#include "ts/ink_platform.h"
#include "P_EventSystem.h"
@@ -86,5 +85,3 @@ private:
};
void http_pages_init();
-
-#endif
diff --git a/proxy/http/HttpProxyAPIEnums.h b/proxy/http/HttpProxyAPIEnums.h
index f8ff3b4..dc18bb8 100644
--- a/proxy/http/HttpProxyAPIEnums.h
+++ b/proxy/http/HttpProxyAPIEnums.h
@@ -27,6 +27,8 @@
*/
+#pragma once
+
#ifndef _HTTP_PROXY_API_ENUMS_H_
#define _HTTP_PROXY_API_ENUMS_H_
@@ -43,5 +45,4 @@ typedef enum {
TS_SERVER_SESSION_SHARING_POOL_GLOBAL,
TS_SERVER_SESSION_SHARING_POOL_THREAD,
} TSServerSessionSharingPoolType;
-
-#endif // _HTTP_PROXY_API_ENUMS_H_
+#endif
diff --git a/proxy/http/HttpProxyServerMain.h b/proxy/http/HttpProxyServerMain.h
index 039c334..c21a363 100644
--- a/proxy/http/HttpProxyServerMain.h
+++ b/proxy/http/HttpProxyServerMain.h
@@ -21,6 +21,8 @@
limitations under the License.
*/
+#pragma once
+
#include <atomic>
#include <mutex>
#include <condition_variable>
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index b47cc13..9289e60 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#ifndef _HTTP_SM_H_
-#define _HTTP_SM_H_
+#pragma once
#include "ts/ink_platform.h"
#include "P_EventSystem.h"
@@ -779,4 +778,3 @@ HttpSM::get_postbuf_clone_reader()
{
return this->_postbuf.get_post_data_buffer_clone_reader();
}
-#endif
diff --git a/proxy/http/HttpServerSession.h b/proxy/http/HttpServerSession.h
index ac1c50f..0b08a21 100644
--- a/proxy/http/HttpServerSession.h
+++ b/proxy/http/HttpServerSession.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#ifndef _HTTP_SERVER_SESSION_H_
-#define _HTTP_SERVER_SESSION_H_
+#pragma once
/* Enable LAZY_BUF_ALLOC to delay allocation of buffers until they
* are actually required.
* Enabling LAZY_BUF_ALLOC, stop Http code from allocation space
@@ -212,4 +211,3 @@ HttpServerSession::attach_hostname(const char *hostname)
CryptoContext().hash_immediate(hostname_hash, (unsigned char *)hostname, strlen(hostname));
}
}
-#endif
diff --git a/proxy/http/HttpSessionAccept.h b/proxy/http/HttpSessionAccept.h
index a677a89..950cf45 100644
--- a/proxy/http/HttpSessionAccept.h
+++ b/proxy/http/HttpSessionAccept.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_HttpSessionAccept_h_)
-#define _HttpSessionAccept_h_
+#pragma once
#include "ts/ink_platform.h"
#include "records/I_RecHttp.h"
@@ -212,5 +211,3 @@ public:
HttpSessionAccept(const HttpSessionAccept &) = delete;
HttpSessionAccept &operator=(const HttpSessionAccept &) = delete;
};
-
-#endif
diff --git a/proxy/http/HttpSessionManager.h b/proxy/http/HttpSessionManager.h
index 5cb0cae..7a43138 100644
--- a/proxy/http/HttpSessionManager.h
+++ b/proxy/http/HttpSessionManager.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#ifndef _HTTP_SESSION_MANAGER_H_
-#define _HTTP_SESSION_MANAGER_H_
+#pragma once
#include "P_EventSystem.h"
#include "HttpServerSession.h"
@@ -166,5 +165,3 @@ private:
};
extern HttpSessionManager httpSessionManager;
-
-#endif
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 240c473..7150896 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_HttpTransact_h_)
-#define _HttpTransact_h_
+#pragma once
#include "ts/ink_platform.h"
#include "P_HostDB.h"
@@ -1136,5 +1135,3 @@ is_response_body_precluded(HTTPStatus status_code, int method)
}
inkcoreapi extern ink_time_t ink_local_time(void);
-
-#endif
diff --git a/proxy/http/HttpTransactCache.h b/proxy/http/HttpTransactCache.h
index 7b6b9c9..1f3ec6a 100644
--- a/proxy/http/HttpTransactCache.h
+++ b/proxy/http/HttpTransactCache.h
@@ -28,8 +28,7 @@
****************************************************************************/
-#if !defined(_HttpTransactCache_h_)
-#define _HttpTransactCache_h_
+#pragma once
#include "ts/ink_platform.h"
#include "HttpConfig.h"
@@ -82,5 +81,3 @@ public:
static HTTPStatus match_response_to_request_conditionals(HTTPHdr *ua_request, HTTPHdr *c_response,
ink_time_t response_received_time);
};
-
-#endif
diff --git a/proxy/http/HttpTransactHeaders.h b/proxy/http/HttpTransactHeaders.h
index 3cfaa01..023490b 100644
--- a/proxy/http/HttpTransactHeaders.h
+++ b/proxy/http/HttpTransactHeaders.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_HttpTransactHeaders_h_)
-#define _HttpTransactHeaders_h_
+#pragma once
#define ink_time_t time_t
@@ -141,5 +140,3 @@ HttpTransactHeaders::is_request_proxy_authorized(HTTPHdr *incoming_hdr)
// TODO: What do we need to do here?
return true;
}
-
-#endif
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index ca15219..bf83781 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -30,8 +30,7 @@
****************************************************************************/
-#ifndef _HTTP_TUNNEL_H_
-#define _HTTP_TUNNEL_H_
+#pragma once
#include "ts/ink_platform.h"
#include "P_EventSystem.h"
@@ -575,5 +574,3 @@ HttpTunnelProducer::unthrottle()
inline HttpTunnel::FlowControl::FlowControl() : high_water(DEFAULT_WATER_MARK), low_water(DEFAULT_WATER_MARK), enabled_p(false)
{
}
-
-#endif
diff --git a/proxy/http/HttpUpdateSM.h b/proxy/http/HttpUpdateSM.h
index 30eb482..6766293 100644
--- a/proxy/http/HttpUpdateSM.h
+++ b/proxy/http/HttpUpdateSM.h
@@ -32,8 +32,7 @@
****************************************************************************/
-#ifndef _HTTP_SM_UPDATE_H_
-#define _HTTP_SM_UPDATE_H_
+#pragma once
#include "P_EventSystem.h"
#include "HttpSM.h"
@@ -76,5 +75,3 @@ HttpUpdateSM::allocate()
// Regression/Testing Routing
void init_http_update_test();
-
-#endif
diff --git a/proxy/http/remap/AclFiltering.h b/proxy/http/remap/AclFiltering.h
index 5e2303f..029fe3c 100644
--- a/proxy/http/remap/AclFiltering.h
+++ b/proxy/http/remap/AclFiltering.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _ACL_FILTERING_H_
-#define _ACL_FILTERING_H_
+#pragma once
#include "Main.h"
#include "ts/ink_inet.h"
@@ -106,5 +105,3 @@ public:
static void requeue_in_active_list(acl_filter_rule **list, acl_filter_rule *rp);
static void requeue_in_passive_list(acl_filter_rule **list, acl_filter_rule *rp);
};
-
-#endif
diff --git a/proxy/http/remap/RemapConfig.h b/proxy/http/remap/RemapConfig.h
index dacb442..a675ed9 100644
--- a/proxy/http/remap/RemapConfig.h
+++ b/proxy/http/remap/RemapConfig.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef REMAPCONFIG_H_E862FB4C_EFFC_4F2A_8BF2_9AB6E1E5E9CF
-#define REMAPCONFIG_H_E862FB4C_EFFC_4F2A_8BF2_9AB6E1E5E9CF
+#pragma once
#include "AclFiltering.h"
@@ -75,5 +74,3 @@ unsigned long remap_check_option(const char **argv, int argc, unsigned long find
const char **argptr = NULL);
bool remap_parse_config(const char *path, UrlRewrite *rewrite);
-
-#endif /* REMAPCONFIG_H_E862FB4C_EFFC_4F2A_8BF2_9AB6E1E5E9CF */
diff --git a/proxy/http/remap/RemapPluginInfo.h b/proxy/http/remap/RemapPluginInfo.h
index d23cb5e..9f9202c 100644
--- a/proxy/http/remap/RemapPluginInfo.h
+++ b/proxy/http/remap/RemapPluginInfo.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#if !defined(_REMAPPLUGININFO_h_)
-#define _REMAPPLUGININFO_h_
+#pragma once
#include "ts/ink_platform.h"
#include "ts/apidefs.h"
@@ -78,5 +77,3 @@ struct host_hdr_info {
int host_len;
int request_port;
};
-
-#endif
diff --git a/proxy/http/remap/RemapPlugins.h b/proxy/http/remap/RemapPlugins.h
index 8e133d4..355697a 100644
--- a/proxy/http/remap/RemapPlugins.h
+++ b/proxy/http/remap/RemapPlugins.h
@@ -25,8 +25,7 @@
* Remap plugins class
**/
-#if !defined(_REMAPPLUGINS_h_)
-#define _REMAPPLUGINS_h_
+#pragma once
#include "ts/ink_platform.h"
#include "I_EventSystem.h"
@@ -81,5 +80,3 @@ private:
HTTPHdr *_request_header = nullptr;
host_hdr_info *_hh_ptr = nullptr;
};
-
-#endif
diff --git a/proxy/http/remap/RemapProcessor.h b/proxy/http/remap/RemapProcessor.h
index 760410a..60b1671 100644
--- a/proxy/http/remap/RemapProcessor.h
+++ b/proxy/http/remap/RemapProcessor.h
@@ -24,8 +24,7 @@
/**
* Remap plugin processor
**/
-#if !defined(_REMAPPROCESSOR_h_)
-#define _REMAPPROCESSOR_h_
+#pragma once
#include "I_EventSystem.h"
#include "RemapPlugins.h"
@@ -71,5 +70,3 @@ private:
* the global remapProcessor that everyone uses
**/
extern RemapProcessor remapProcessor;
-
-#endif
diff --git a/proxy/http/remap/UrlMapping.h b/proxy/http/remap/UrlMapping.h
index dbf8b4f..f3e15c2 100644
--- a/proxy/http/remap/UrlMapping.h
+++ b/proxy/http/remap/UrlMapping.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _URL_MAPPING_H_
-#define _URL_MAPPING_H_
+#pragma once
#include <vector>
@@ -207,5 +206,3 @@ private:
URL _toURL;
HdrHeap *_heap;
};
-
-#endif
diff --git a/proxy/http/remap/UrlMappingPathIndex.h b/proxy/http/remap/UrlMappingPathIndex.h
index 2993a3d..f9c0236 100644
--- a/proxy/http/remap/UrlMappingPathIndex.h
+++ b/proxy/http/remap/UrlMappingPathIndex.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef _URL_MAPPING_PATH_INDEX_H
-#define _URL_MAPPING_PATH_INDEX_H
+#pragma once
#include "ts/ink_platform.h"
#undef std // FIXME: remove dependancy on the STL
@@ -96,5 +95,3 @@ private:
return 0;
}
};
-
-#endif // _URL_MAPPING_PATH_INDEX_H
diff --git a/proxy/http/remap/UrlRewrite.h b/proxy/http/remap/UrlRewrite.h
index 9850a21..2efa94d 100644
--- a/proxy/http/remap/UrlRewrite.h
+++ b/proxy/http/remap/UrlRewrite.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef _URL_REWRITE_H_
-#define _URL_REWRITE_H_
+#pragma once
#include "ts/ink_config.h"
#include "UrlMapping.h"
@@ -211,5 +210,3 @@ private:
};
void url_rewrite_remap_request(const UrlMappingContainer &mapping_container, URL *request_url, int scheme = -1);
-
-#endif
diff --git a/proxy/http2/HPACK.h b/proxy/http2/HPACK.h
index 39191a7..c20f40f 100644
--- a/proxy/http2/HPACK.h
+++ b/proxy/http2/HPACK.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HPACK_H__
-#define __HPACK_H__
+#pragma once
#include "ts/ink_platform.h"
#include "ts/Diags.h"
@@ -180,5 +179,3 @@ int64_t hpack_decode_header_block(HpackHandle &handle, HTTPHdr *hdr, const uint8
int64_t hpack_encode_header_block(HpackHandle &handle, uint8_t *out_buf, const size_t out_buf_len, HTTPHdr *hdr,
int32_t maximum_table_size = -1);
int32_t hpack_get_maximum_table_size(HpackHandle &handle);
-
-#endif /* __HPACK_H__ */
diff --git a/proxy/http2/HTTP2.h b/proxy/http2/HTTP2.h
index d510e99..bc8d338 100644
--- a/proxy/http2/HTTP2.h
+++ b/proxy/http2/HTTP2.h
@@ -21,8 +21,7 @@
* limitations under the License.
*/
-#ifndef __HTTP2_H__
-#define __HTTP2_H__
+#pragma once
#include "ts/ink_defs.h"
#include "ts/ink_memory.h"
@@ -381,5 +380,3 @@ public:
static void init();
};
-
-#endif /* __HTTP2_H__ */
diff --git a/proxy/http2/Http2ClientSession.h b/proxy/http2/Http2ClientSession.h
index 9b46afb..08050b8 100644
--- a/proxy/http2/Http2ClientSession.h
+++ b/proxy/http2/Http2ClientSession.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HTTP2_CLIENT_SESSION_H__
-#define __HTTP2_CLIENT_SESSION_H__
+#pragma once
#include "HTTP2.h"
#include "Plugin.h"
@@ -361,5 +360,3 @@ private:
};
extern ClassAllocator<Http2ClientSession> http2ClientSessionAllocator;
-
-#endif // __HTTP2_CLIENT_SESSION_H__
diff --git a/proxy/http2/Http2ConnectionState.h b/proxy/http2/Http2ConnectionState.h
index b3fe0e8..5ee8998 100644
--- a/proxy/http2/Http2ConnectionState.h
+++ b/proxy/http2/Http2ConnectionState.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HTTP2_CONNECTION_STATE_H__
-#define __HTTP2_CONNECTION_STATE_H__
+#pragma once
#include "HTTP2.h"
#include "HPACK.h"
@@ -313,5 +312,3 @@ private:
Event *shutdown_cont_event = nullptr;
Event *fini_event = nullptr;
};
-
-#endif // __HTTP2_CONNECTION_STATE_H__
diff --git a/proxy/http2/Http2DebugNames.h b/proxy/http2/Http2DebugNames.h
index c9160bf..790587d 100644
--- a/proxy/http2/Http2DebugNames.h
+++ b/proxy/http2/Http2DebugNames.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HTTP2_DEBUG_NAMES_H__
-#define __HTTP2_DEBUG_NAMES_H__
+#pragma once
#include "ts/ink_defs.h"
@@ -34,5 +33,3 @@ public:
static const char *get_settings_param_name(uint16_t id);
static const char *get_state_name(Http2StreamState id);
};
-
-#endif // __HTTP2_DEBUG_NAMES_H__
diff --git a/proxy/http2/Http2DependencyTree.h b/proxy/http2/Http2DependencyTree.h
index 3f3af9b..e7086bb 100644
--- a/proxy/http2/Http2DependencyTree.h
+++ b/proxy/http2/Http2DependencyTree.h
@@ -24,8 +24,7 @@
limitations under the License.
*/
-#ifndef __HTTP2_DEP_TREE_H__
-#define __HTTP2_DEP_TREE_H__
+#pragma once
#include "ts/List.h"
#include "ts/Diags.h"
@@ -437,4 +436,3 @@ Tree<T>::size() const
return _node_count;
}
} // namespce Http2DependencyTree
-#endif // __HTTP2_DEP_TREE_H__
diff --git a/proxy/http2/Http2SessionAccept.h b/proxy/http2/Http2SessionAccept.h
index 7353435..e742b3c 100644
--- a/proxy/http2/Http2SessionAccept.h
+++ b/proxy/http2/Http2SessionAccept.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HTTP2_SESSION_ACCEPT_H__
-#define __HTTP2_SESSION_ACCEPT_H__
+#pragma once
#include "ts/ink_platform.h"
#include "I_Net.h"
@@ -53,5 +52,3 @@ struct Http2SessionAccept : public SessionAccept {
private:
HttpSessionAccept::Options options;
};
-
-#endif // __HTTP2_SESSION_ACCEPT_H__
diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h
index be4a12d..7c642b5 100644
--- a/proxy/http2/Http2Stream.h
+++ b/proxy/http2/Http2Stream.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HTTP2_STREAM_H__
-#define __HTTP2_STREAM_H__
+#pragma once
#include "HTTP2.h"
#include "../ProxyClientTransaction.h"
@@ -309,5 +308,3 @@ extern ClassAllocator<Http2Stream> http2StreamAllocator;
extern bool check_continuation(Continuation *cont);
extern bool check_stream_thread(Continuation *cont);
-
-#endif
diff --git a/proxy/http2/HuffmanCodec.h b/proxy/http2/HuffmanCodec.h
index 49b5f0c..1d05ad9 100644
--- a/proxy/http2/HuffmanCodec.h
+++ b/proxy/http2/HuffmanCodec.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef __HPACK_HUFFMAN_H__
-#define __HPACK_HUFFMAN_H__
+#pragma once
#include <stddef.h>
#include <stdint.h>
@@ -32,5 +31,3 @@ void hpack_huffman_fin();
int64_t huffman_decode(char *dst_start, const uint8_t *src, uint32_t src_len);
uint8_t *huffman_encode_append(uint8_t *dst, uint32_t src, int n);
int64_t huffman_encode(uint8_t *dst_start, const uint8_t *src, uint32_t src_len);
-
-#endif /* __HPACK_Huffman_H__ */
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index 03df45e..297d798 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -49,8 +49,7 @@
*/
-#ifndef LOG_H
-#define LOG_H
+#pragma once
#include <stdarg.h>
#include "ts/ink_platform.h"
@@ -256,5 +255,3 @@ LogRollingEnabledIsValid(int enabled)
if (unlikely(flag)) \
Log::trace_out(__VA_ARGS__); \
} while (0)
-
-#endif
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index 47d368b..2e3d97a 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -26,8 +26,7 @@
***************************************************************************/
-#ifndef LOG_ACCESS_H
-#define LOG_ACCESS_H
+#pragma once
#include "ts/ink_platform.h"
#include "ts/ink_inet.h"
#include "ts/ink_align.h"
@@ -408,5 +407,3 @@ LogAccess::marshal_int(char *dest, int64_t source)
-------------------------------------------------------------------------*/
char *resolve_logfield_string(LogAccess *context, const char *format_str);
-
-#endif
diff --git a/proxy/logging/LogAccessHttp.h b/proxy/logging/LogAccessHttp.h
index 0c20ef2..e998bb1 100644
--- a/proxy/logging/LogAccessHttp.h
+++ b/proxy/logging/LogAccessHttp.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_ACCESS_HTTP_H
-#define LOG_ACCESS_HTTP_H
+#pragma once
#include "ts/Arena.h"
#include "HTTP.h"
@@ -214,5 +213,3 @@ private:
void validate_lookup_url(void);
};
-
-#endif
diff --git a/proxy/logging/LogAccessTest.h b/proxy/logging/LogAccessTest.h
index 233ae02..cb8938c 100644
--- a/proxy/logging/LogAccessTest.h
+++ b/proxy/logging/LogAccessTest.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_ACCESS_TEST_H
-#define LOG_ACCESS_TEST_H
+#pragma once
#include "LogAccess.h"
@@ -101,5 +100,3 @@ public:
LogAccessTest(const LogAccessTest &rhs) = delete;
LogAccessTest &operator=(LogAccessTest &rhs) = delete;
};
-
-#endif
diff --git a/proxy/logging/LogBindings.h b/proxy/logging/LogBindings.h
index 2b2f7c9..464c18b 100644
--- a/proxy/logging/LogBindings.h
+++ b/proxy/logging/LogBindings.h
@@ -21,13 +21,10 @@
* limitations under the License.
*/
-#ifndef LOGBINDINGS_H_B54572F3_71A3_4665_A66C_4EEA311CCE15
-#define LOGBINDINGS_H_B54572F3_71A3_4665_A66C_4EEA311CCE15
+#pragma once
#include "bindings/bindings.h"
class LogConfig;
bool MakeLogBindings(BindingInstance &binding, LogConfig *conf);
-
-#endif /* LOGBINDINGS_H_B54572F3_71A3_4665_A66C_4EEA311CCE15 */
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index c027419..8046fab 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_BUFFER_H
-#define LOG_BUFFER_H
+#pragma once
#include "ts/ink_platform.h"
#include "ts/Diags.h"
@@ -331,4 +330,3 @@ inline LogBufferIterator::LogBufferIterator(LogBufferHeader *header, bool in_net
inline LogBufferIterator::~LogBufferIterator()
{
}
-#endif
diff --git a/proxy/logging/LogBufferSink.h b/proxy/logging/LogBufferSink.h
index c630b6b..f7f0d3d 100644
--- a/proxy/logging/LogBufferSink.h
+++ b/proxy/logging/LogBufferSink.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_BUFFER_SINK
-#define LOG_BUFFER_SINK
+#pragma once
#include "LogBuffer.h"
@@ -47,5 +46,3 @@ public:
virtual int preproc_and_try_delete(LogBuffer *buffer) = 0;
virtual ~LogBufferSink(){};
};
-
-#endif
diff --git a/proxy/logging/LogCollationAccept.h b/proxy/logging/LogCollationAccept.h
index 45ba881..896130c 100644
--- a/proxy/logging/LogCollationAccept.h
+++ b/proxy/logging/LogCollationAccept.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_COLLATION_ACCEPT_H
-#define LOG_COLLATION_ACCEPT_H
+#pragma once
#include "P_EventSystem.h"
#include "P_Net.h"
@@ -41,5 +40,3 @@ private:
};
typedef int (LogCollationAccept::*LogCollationAcceptHandler)(int, void *);
-
-#endif /* LOG_COLLATION_ACCEPT_H */
diff --git a/proxy/logging/LogCollationBase.h b/proxy/logging/LogCollationBase.h
index c93fbfb..17b783a 100644
--- a/proxy/logging/LogCollationBase.h
+++ b/proxy/logging/LogCollationBase.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_COLLATION_BASE_H
-#define LOG_COLLATION_BASE_H
+#pragma once
//-------------------------------------------------------------------------
// LogCollationBase
@@ -44,5 +43,3 @@ protected:
LOG_COLL_EVENT_ERROR
};
};
-
-#endif // LOG_COLLATION_BASE_H
diff --git a/proxy/logging/LogCollationClientSM.h b/proxy/logging/LogCollationClientSM.h
index 4dc503f..d8d45bb 100644
--- a/proxy/logging/LogCollationClientSM.h
+++ b/proxy/logging/LogCollationClientSM.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_COLLATION_CLIENT_SM_H
-#define LOG_COLLATION_CLIENT_SM_H
+#pragma once
//-------------------------------------------------------------------------
// includes
@@ -115,5 +114,3 @@ private:
};
typedef int (LogCollationClientSM::*LogCollationClientSMHandler)(int, void *);
-
-#endif // LOG_COLLATION_CLIENT_SM_H
diff --git a/proxy/logging/LogCollationHostSM.h b/proxy/logging/LogCollationHostSM.h
index 791612d..d7038fc 100644
--- a/proxy/logging/LogCollationHostSM.h
+++ b/proxy/logging/LogCollationHostSM.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_COLLATION_HOST_SM_H
-#define LOG_COLLATION_HOST_SM_H
+#pragma once
//-------------------------------------------------------------------------
// includes
@@ -108,5 +107,3 @@ private:
};
typedef int (LogCollationHostSM::*LogCollationHostSMHandler)(int, void *);
-
-#endif // LOG_COLLATION_HOST_SM_H
diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h
index eb9e489..1b51dd0 100644
--- a/proxy/logging/LogConfig.h
+++ b/proxy/logging/LogConfig.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_CONFIG_H
-#define LOG_CONFIG_H
+#pragma once
#include "ts/ink_platform.h"
#include "P_RecProcess.h"
@@ -235,5 +234,3 @@ struct LogDeleteCandidate {
char *name;
int64_t size;
};
-
-#endif
diff --git a/proxy/logging/LogField.h b/proxy/logging/LogField.h
index 0d41143..20df638 100644
--- a/proxy/logging/LogField.h
+++ b/proxy/logging/LogField.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_FIELD_H
-#define LOG_FIELD_H
+#pragma once
#include "ts/ink_platform.h"
#include "ts/List.h"
@@ -281,5 +280,3 @@ union LogFieldIpStorage {
LogFieldIp4 _ip4;
LogFieldIp6 _ip6;
};
-
-#endif
diff --git a/proxy/logging/LogFieldAliasMap.h b/proxy/logging/LogFieldAliasMap.h
index 51ffde2..515e330 100644
--- a/proxy/logging/LogFieldAliasMap.h
+++ b/proxy/logging/LogFieldAliasMap.h
@@ -26,8 +26,7 @@
easily remembered names can be used to refer to log fields of integer type.
*/
-#ifndef LOG_FIELD_ALIAS_MAP_H
-#define LOG_FIELD_ALIAS_MAP_H
+#pragma once
#include <stdarg.h>
#include <string.h>
@@ -215,4 +214,3 @@ public:
};
// LOG_FIELD_ALIAS_MAP_H
-#endif
diff --git a/proxy/logging/LogFile.h b/proxy/logging/LogFile.h
index 5f47ea0..2a615c5 100644
--- a/proxy/logging/LogFile.h
+++ b/proxy/logging/LogFile.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_FILE_H
-#define LOG_FILE_H
+#pragma once
#include <stdarg.h>
#include <stdio.h>
@@ -136,5 +135,3 @@ private:
/***************************************************************************
LogFileList IS NOT USED
****************************************************************************/
-
-#endif
diff --git a/proxy/logging/LogFilter.h b/proxy/logging/LogFilter.h
index 92fc70b..669eed4 100644
--- a/proxy/logging/LogFilter.h
+++ b/proxy/logging/LogFilter.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_FILTER_H
-#define LOG_FILTER_H
+#pragma once
#include "ts/ink_platform.h"
#include "ts/IpMap.h"
@@ -507,5 +506,3 @@ LogFilterString::_checkConditionAndWipe(OperatorFunction f, char **field_value,
}
return retVal;
}
-
-#endif
diff --git a/proxy/logging/LogFormat.h b/proxy/logging/LogFormat.h
index cf68cff..910a14a 100644
--- a/proxy/logging/LogFormat.h
+++ b/proxy/logging/LogFormat.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_FORMAT_H
-#define LOG_FORMAT_H
+#pragma once
#define LOG_FIELD_MARKER '\377'
@@ -216,5 +215,3 @@ public:
private:
Queue<LogFormat> m_format_list;
};
-
-#endif
diff --git a/proxy/logging/LogHost.h b/proxy/logging/LogHost.h
index 1403856..20b210a 100644
--- a/proxy/logging/LogHost.h
+++ b/proxy/logging/LogHost.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef LOG_HOST_H
-#define LOG_HOST_H
+#pragma once
class LogSock;
class LogBuffer;
@@ -164,5 +163,3 @@ public:
private:
Queue<LogHost> m_host_list;
};
-
-#endif
diff --git a/proxy/logging/LogLimits.h b/proxy/logging/LogLimits.h
index a7a57ec..ef9d821 100644
--- a/proxy/logging/LogLimits.h
+++ b/proxy/logging/LogLimits.h
@@ -26,8 +26,7 @@
module.
***************************************************************************/
-#ifndef LOG_LIMITS_H
-#define LOG_LIMITS_H
+#pragma once
enum {
LOG_MAX_FORMAT_LINE = 2048, /* "format:enable:..." */
@@ -37,5 +36,3 @@ enum {
#define LOG_KILOBYTE ((int64_t)1024)
#define LOG_MEGABYTE ((int64_t)1048576)
-
-#endif
diff --git a/proxy/logging/LogObject.h b/proxy/logging/LogObject.h
index b932002..a218bb5 100644
--- a/proxy/logging/LogObject.h
+++ b/proxy/logging/LogObject.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_OBJECT_H
-#define LOG_OBJECT_H
+#pragma once
#include "ts/ink_platform.h"
#include "Log.h"
@@ -452,5 +451,3 @@ LogObject::get_file_size_bytes()
return max_size;
}
}
-
-#endif
diff --git a/proxy/logging/LogSock.h b/proxy/logging/LogSock.h
index 8583637..1394c0a 100644
--- a/proxy/logging/LogSock.h
+++ b/proxy/logging/LogSock.h
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#ifndef LOG_SOCK_H
-#define LOG_SOCK_H
+#pragma once
#include "ts/ink_platform.h"
@@ -127,5 +126,3 @@ private:
bool m_accept_connections; // do we accept new connections?
int m_max_connections; // max size of all tables
};
-
-#endif
diff --git a/proxy/logging/LogUtils.h b/proxy/logging/LogUtils.h
index b72e97d..f8d5038 100644
--- a/proxy/logging/LogUtils.h
+++ b/proxy/logging/LogUtils.h
@@ -20,8 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#ifndef LOG_UTILS_H
-#define LOG_UTILS_H
+#pragma once
#include "time.h"
@@ -61,4 +60,3 @@ int seconds_to_next_roll(time_t time_now, int rolling_offset, int rolling_interv
int file_is_writeable(const char *full_filename, off_t *size_bytes = 0, bool *has_size_limit = 0,
uint64_t *current_size_limit_bytes = 0);
};
-#endif
diff --git a/proxy/shared/DiagsConfig.h b/proxy/shared/DiagsConfig.h
index 6248c69..5aa5789 100644
--- a/proxy/shared/DiagsConfig.h
+++ b/proxy/shared/DiagsConfig.h
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#ifndef __DIAGSCONFIG_H__
-#define __DIAGSCONFIG_H__
+#pragma once
+
#include "ts/Diags.h"
#include "ts/BaseLogFile.h"
@@ -43,5 +43,3 @@ private:
public:
Diags *diags;
};
-
-#endif
diff --git a/tools/http_load/timers.h b/tools/http_load/timers.h
index 23de36b..f61c5e8 100644
--- a/tools/http_load/timers.h
+++ b/tools/http_load/timers.h
@@ -25,8 +25,7 @@
** SUCH DAMAGE.
*/
-#ifndef _TIMERS_H_
-#define _TIMERS_H_
+#pragma once
#include <sys/time.h>
@@ -100,5 +99,3 @@ extern void tmr_cleanup(void);
/* Cancel all timers and free storage, usually in preparation for exitting. */
extern void tmr_destroy(void);
-
-#endif /* _TIMERS_H_ */
--
To stop receiving notification emails like this one, please contact
dragon@apache.org.