You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2016/04/18 02:14:11 UTC
[trafficserver] branch master updated (afb415a -> a5cddca)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.
from afb415a Comment out the invocation for Solaris for the CI
new f2e3fbb TS-4164 Update to new clang-format version
new a5cddca TS-4164 Update indentation with latest tools
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.clang-format | 85 ++++--
cmd/traffic_cop/traffic_cop.cc | 11 -
cmd/traffic_ctl/traffic_ctl.h | 4 -
cmd/traffic_layout/traffic_layout.cc | 2 -
cmd/traffic_manager/AddConfigFilesHere.cc | 1 -
cmd/traffic_manager/StatProcessor.cc | 11 -
cmd/traffic_manager/StatProcessor.h | 1 -
cmd/traffic_manager/StatType.cc | 36 ---
cmd/traffic_manager/StatType.h | 2 -
cmd/traffic_manager/StatXML.cc | 1 -
cmd/traffic_manager/StatXML.h | 1 -
cmd/traffic_manager/WebOverview.cc | 4 +-
cmd/traffic_manager/metrics.cc | 2 -
cmd/traffic_manager/traffic_manager.cc | 1 -
cmd/traffic_top/stats.h | 6 -
cmd/traffic_top/traffic_top.cc | 2 -
cmd/traffic_via/traffic_via.cc | 2 -
example/add-header/add-header.c | 1 -
example/basic-auth/basic-auth.c | 3 -
example/blacklist-1/blacklist-1.c | 2 -
example/cache-scan/cache-scan.cc | 4 -
example/intercept/intercept.cc | 6 +-
example/protocol/Protocol.c | 2 -
example/protocol/Protocol.h | 1 -
example/protocol/TxnSM.c | 1 -
example/query-remap/query-remap.c | 4 -
example/redirect-1/redirect-1.c | 9 -
example/remap/remap.cc | 4 -
example/remap_header_add/remap_header_add.cc | 5 -
example/response-header-1/response-header-1.c | 5 -
example/session-1/session-1.c | 2 -
example/ssl-preaccept/ssl-preaccept.cc | 1 -
example/ssl-sni/ssl-sni.cc | 2 -
example/thread-1/thread-1.c | 1 -
example/thread-pool/psi.c | 16 --
example/thread-pool/test/SDKTest/psi_server.c | 2 -
example/thread-pool/thread.c | 2 -
example/thread-pool/thread.h | 4 -
example/version/version.c | 2 +-
iocore/aio/AIO.cc | 2 -
iocore/cache/Cache.cc | 19 --
iocore/cache/CacheDir.cc | 14 +-
iocore/cache/CacheDisk.cc | 2 -
iocore/cache/CacheHosting.cc | 4 -
iocore/cache/CacheHttp.cc | 5 -
iocore/cache/CachePages.cc | 7 -
iocore/cache/CachePagesInternal.cc | 10 -
iocore/cache/CacheRead.cc | 7 +-
iocore/cache/CacheTest.cc | 2 +-
iocore/cache/CacheVol.cc | 4 +-
iocore/cache/CacheWrite.cc | 2 -
iocore/cache/I_CacheDefs.h | 1 -
iocore/cache/I_Store.h | 12 +-
iocore/cache/P_CacheArray.h | 7 +-
iocore/cache/P_CacheBC.h | 2 -
iocore/cache/P_CacheDir.h | 1 -
iocore/cache/P_CacheDisk.h | 1 -
iocore/cache/P_CacheHosting.h | 2 -
iocore/cache/P_CacheHttp.h | 2 -
iocore/cache/P_CacheInternal.h | 5 -
iocore/cache/P_CacheVol.h | 6 -
iocore/cache/RamCacheCLFUS.cc | 3 +-
iocore/cache/Store.cc | 12 +-
iocore/cluster/ClusterAPI.cc | 1 -
iocore/cluster/ClusterCache.cc | 6 -
iocore/cluster/ClusterConfig.cc | 1 -
iocore/cluster/ClusterHandler.cc | 2 -
iocore/cluster/ClusterHandlerBase.cc | 1 -
iocore/cluster/ClusterHash.cc | 2 -
iocore/cluster/ClusterLib.cc | 1 -
iocore/cluster/ClusterLoadMonitor.cc | 1 -
iocore/cluster/ClusterProcessor.cc | 1 -
iocore/cluster/ClusterRPC.cc | 4 +-
iocore/cluster/ClusterVConnection.cc | 1 -
iocore/cluster/P_Cluster.h | 2 -
iocore/cluster/P_ClusterCache.h | 4 -
iocore/cluster/P_ClusterCacheInternal.h | 2 -
iocore/cluster/P_ClusterHandler.h | 3 -
iocore/cluster/P_ClusterInternal.h | 2 -
iocore/cluster/P_ClusterLoadMonitor.h | 1 -
iocore/cluster/P_ClusterMachine.h | 3 -
iocore/cluster/P_TimeTrace.h | 1 -
iocore/dns/DNS.cc | 12 +-
iocore/dns/DNSConnection.cc | 5 +-
iocore/dns/I_DNS.h | 1 -
iocore/dns/I_DNSProcessor.h | 3 -
iocore/dns/I_SplitDNSProcessor.h | 1 -
iocore/dns/P_DNSProcessor.h | 6 +-
iocore/dns/P_SplitDNS.h | 1 -
iocore/dns/P_SplitDNSProcessor.h | 14 -
iocore/dns/SRV.h | 5 +-
iocore/dns/SplitDNS.cc | 21 --
iocore/dns/test_P_DNS.cc | 1 -
iocore/eventsystem/IOBuffer.cc | 2 -
iocore/eventsystem/I_Action.h | 5 +-
iocore/eventsystem/I_EThread.h | 4 +-
iocore/eventsystem/I_Event.h | 1 -
iocore/eventsystem/I_EventProcessor.h | 2 -
iocore/eventsystem/I_IOBuffer.h | 28 +-
iocore/eventsystem/I_PriorityEventQueue.h | 1 -
iocore/eventsystem/I_Thread.h | 1 -
iocore/eventsystem/I_VIO.h | 1 -
iocore/eventsystem/P_IOBuffer.h | 3 -
iocore/eventsystem/P_ProtectedQueue.h | 1 -
iocore/eventsystem/P_UnixEventProcessor.h | 3 -
iocore/eventsystem/P_UnixSocketManager.h | 4 -
iocore/eventsystem/P_VConnection.h | 2 -
iocore/eventsystem/P_VIO.h | 1 -
iocore/eventsystem/Processor.cc | 1 -
iocore/eventsystem/ProtectedQueue.cc | 1 -
iocore/eventsystem/Tasks.cc | 1 -
iocore/eventsystem/UnixEThread.cc | 7 +-
iocore/eventsystem/UnixEventProcessor.cc | 1 -
iocore/hostdb/HostDB.cc | 52 ----
iocore/hostdb/I_HostDB.h | 1 -
iocore/hostdb/I_HostDBProcessor.h | 5 -
iocore/hostdb/MultiCache.cc | 4 -
iocore/hostdb/P_HostDB.h | 1 -
iocore/hostdb/P_HostDBProcessor.h | 9 +-
iocore/hostdb/P_MultiCache.h | 4 -
iocore/hostdb/include/Machine.h | 3 -
iocore/hostdb/test_I_HostDB.cc | 1 -
iocore/hostdb/test_P_HostDB.cc | 1 -
iocore/net/Connection.cc | 5 -
iocore/net/I_NetProcessor.h | 1 -
iocore/net/I_NetVConnection.h | 7 +-
iocore/net/I_SessionAccept.h | 2 -
iocore/net/I_Socks.h | 1 -
iocore/net/I_UDPPacket.h | 1 -
iocore/net/Net.cc | 2 -
iocore/net/NetTest-http-server.c | 9 -
iocore/net/NetVCTest.cc | 3 -
iocore/net/P_Connection.h | 1 -
iocore/net/P_InkBulkIO.h | 3 -
iocore/net/P_LibBulkIO.h | 1 -
iocore/net/P_NetAccept.h | 9 +-
iocore/net/P_NetVCTest.h | 3 -
iocore/net/P_NetVConnection.h | 1 -
iocore/net/P_SSLCertLookup.h | 1 -
iocore/net/P_SSLConfig.h | 1 -
iocore/net/P_SSLNetVConnection.h | 2 -
iocore/net/P_UDPConnection.h | 2 -
iocore/net/P_UDPNet.h | 5 -
iocore/net/P_UDPPacket.h | 1 -
iocore/net/P_UnixNet.h | 7 -
iocore/net/P_UnixNetProcessor.h | 1 -
iocore/net/P_UnixNetVConnection.h | 1 -
iocore/net/P_UnixPollDescriptor.h | 1 -
iocore/net/P_UnixUDPConnection.h | 1 -
iocore/net/SSLCertLookup.cc | 3 +-
iocore/net/SSLNetProcessor.cc | 1 -
iocore/net/SSLNetVConnection.cc | 9 +-
iocore/net/SSLSessionCache.h | 9 +-
iocore/net/SSLUtils.cc | 12 +-
iocore/net/UnixConnection.cc | 1 -
iocore/net/UnixNet.cc | 4 -
iocore/net/UnixNetAccept.cc | 9 -
iocore/net/UnixNetProcessor.cc | 4 -
iocore/net/UnixNetVConnection.cc | 6 -
iocore/net/UnixUDPNet.cc | 5 -
iocore/net/test_I_Net.cc | 3 -
iocore/net/test_P_Net.cc | 4 -
iocore/utils/I_Machine.h | 1 -
iocore/utils/OneWayTunnel.cc | 1 -
.../examples/async_http_fetch/AsyncHttpFetch.cc | 2 -
.../AsyncHttpFetchStreaming.cc | 1 -
lib/atscppapi/examples/async_timer/AsyncTimer.cc | 1 -
lib/atscppapi/examples/boom/boom.cc | 4 +-
.../examples/clientredirect/ClientRedirect.cc | 4 -
.../examples/clientrequest/ClientRequest.cc | 2 -
.../CustomErrorRemapPlugin.cc | 1 -
.../examples/customresponse/CustomResponse.cc | 3 -
.../examples/globalhook/GlobalHookPlugin.cc | 1 -
.../GzipTransformationPlugin.cc | 1 -
.../examples/helloworld/HelloWorldPlugin.cc | 1 -
.../InternalTransactionHandling.cc | 1 -
.../examples/logger_example/LoggerExample.cc | 1 -
.../MultipleTransactionHookPlugins.cc | 4 -
.../NullTransformationPlugin.cc | 1 -
lib/atscppapi/examples/post_buffer/PostBuffer.cc | 3 -
lib/atscppapi/examples/remap_plugin/RemapPlugin.cc | 2 -
lib/atscppapi/examples/stat_example/StatExample.cc | 1 -
.../timeout_example/TimeoutExamplePlugin.cc | 1 -
.../transactionhook/TransactionHookPlugin.cc | 1 -
.../src/CaseInsensitiveStringComparator.cc | 3 +-
lib/atscppapi/src/GzipDeflateTransformation.cc | 1 -
lib/atscppapi/src/GzipInflateTransformation.cc | 1 -
lib/atscppapi/src/Headers.cc | 51 ++--
lib/atscppapi/src/Logger.cc | 1 -
lib/atscppapi/src/Plugin.cc | 7 +-
lib/atscppapi/src/Transaction.cc | 8 +-
lib/atscppapi/src/include/atscppapi/Async.h | 14 +-
lib/atscppapi/src/include/atscppapi/GlobalPlugin.h | 1 -
.../include/atscppapi/GzipDeflateTransformation.h | 1 -
lib/atscppapi/src/include/atscppapi/Headers.h | 1 -
.../src/include/atscppapi/InterceptPlugin.h | 1 -
lib/atscppapi/src/include/atscppapi/Logger.h | 1 -
lib/atscppapi/src/include/atscppapi/Mutex.h | 8 -
lib/atscppapi/src/include/atscppapi/Plugin.h | 1 -
lib/atscppapi/src/include/atscppapi/PluginInit.h | 1 -
lib/atscppapi/src/include/atscppapi/Stat.h | 1 -
lib/atscppapi/src/include/atscppapi/Transaction.h | 3 -
.../src/include/atscppapi/TransactionPlugin.h | 1 -
.../src/include/atscppapi/TransformationPlugin.h | 1 -
lib/atscppapi/src/include/atscppapi/noncopyable.h | 2 -
lib/atscppapi/src/utils_internal.cc | 1 -
lib/raft/raft.h | 1 -
lib/raft/raft_impl.h | 15 +-
lib/raft/raft_test.cc | 16 +-
lib/records/I_RecCore.h | 2 -
lib/records/I_RecDefs.h | 6 -
lib/records/I_RecHttp.h | 7 +-
lib/records/I_RecProcess.h | 4 -
lib/records/P_RecCore.cc | 17 --
lib/records/P_RecUtils.h | 3 -
lib/records/RecCore.cc | 14 -
lib/records/RecDebug.cc | 3 -
lib/records/RecHttp.cc | 1 -
lib/records/RecLocal.cc | 3 -
lib/records/RecProcess.cc | 9 -
lib/records/RecRawStats.cc | 14 -
lib/records/RecUtils.cc | 3 -
lib/records/test_I_RecLocal.cc | 3 -
lib/ts/Allocator.h | 1 -
lib/ts/Arena.cc | 3 -
lib/ts/Arena.h | 6 -
lib/ts/BaseLogFile.cc | 2 -
lib/ts/BaseLogFile.h | 2 -
lib/ts/Bitops.cc | 1 -
lib/ts/CompileParseRules.cc | 1 -
lib/ts/ConsistentHash.cc | 3 +-
lib/ts/ContFlags.cc | 1 -
lib/ts/ContFlags.h | 3 +-
lib/ts/CryptoHash.h | 17 +-
lib/ts/Diags.cc | 10 +-
lib/ts/Diags.h | 9 +-
lib/ts/DynArray.h | 9 +-
lib/ts/Hash.cc | 9 +-
lib/ts/Hash.h | 12 +-
lib/ts/HashFNV.h | 1 -
lib/ts/HostLookup.cc | 5 -
lib/ts/HostLookup.h | 3 -
lib/ts/I_Version.h | 3 +-
lib/ts/IntrusiveDList.h | 13 +-
lib/ts/IntrusivePtrTest.cc | 2 +-
lib/ts/IpMap.cc | 68 ++++-
lib/ts/IpMap.h | 10 +-
lib/ts/List.h | 13 +-
lib/ts/MMH.cc | 1 -
lib/ts/Map.h | 73 ++---
lib/ts/MatcherUtils.cc | 1 -
lib/ts/MatcherUtils.h | 5 +-
lib/ts/ParseRules.h | 1 -
lib/ts/PriorityQueue.h | 11 +-
lib/ts/Ptr.h | 76 ++++--
lib/ts/RawHashTable.h | 4 +-
lib/ts/RbTree.cc | 13 +-
lib/ts/RbTree.h | 3 -
lib/ts/Regex.cc | 1 -
lib/ts/Regex.h | 1 -
lib/ts/Regression.h | 1 -
lib/ts/SimpleTokenizer.h | 1 -
lib/ts/TestBox.h | 5 +-
lib/ts/TestHttpHeader.cc | 1 -
lib/ts/Tokenizer.cc | 3 -
lib/ts/Trie.h | 9 +-
lib/ts/TsBuffer.h | 30 ++-
lib/ts/Vec.h | 4 +-
lib/ts/Version.cc | 2 -
lib/ts/X509HostnameValidator.cc | 4 -
lib/ts/X509HostnameValidator.h | 1 -
lib/ts/ink_args.cc | 5 +-
lib/ts/ink_atomic.h | 2 -
lib/ts/ink_base64.cc | 1 -
lib/ts/ink_defs.h | 4 +-
lib/ts/ink_exception.h | 1 -
lib/ts/ink_hash_table.cc | 14 -
lib/ts/ink_hash_table.h | 1 -
lib/ts/ink_hrtime.cc | 1 -
lib/ts/ink_hrtime.h | 1 -
lib/ts/ink_inet.cc | 6 +-
lib/ts/ink_inet.h | 77 ++++--
lib/ts/ink_inout.h | 1 -
lib/ts/ink_llqueue.h | 1 -
lib/ts/ink_lockfile.h | 3 -
lib/ts/ink_memory.h | 53 ++--
lib/ts/ink_platform.h | 3 -
lib/ts/ink_queue.cc | 2 -
lib/ts/ink_queue.h | 6 +-
lib/ts/ink_rand.cc | 1 -
lib/ts/ink_rand.h | 2 -
lib/ts/ink_res_init.cc | 1 -
lib/ts/ink_res_mkquery.cc | 1 -
lib/ts/ink_sock.cc | 2 -
lib/ts/ink_sprintf.cc | 1 -
lib/ts/ink_string++.cc | 1 -
lib/ts/ink_string.cc | 3 -
lib/ts/ink_string.h | 4 -
lib/ts/ink_syslog.cc | 28 +-
lib/ts/ink_thread.h | 3 -
lib/ts/ink_time.cc | 2 -
lib/ts/llqueue.cc | 4 -
lib/ts/load_http_hdr.cc | 4 -
lib/ts/lockfile.cc | 1 -
lib/ts/mkdfa.c | 70 ++---
lib/ts/test_List.cc | 1 -
lib/ts/test_Map.cc | 1 -
lib/ts/test_PriorityQueue.cc | 7 +-
lib/ts/test_Vec.cc | 1 -
lib/ts/test_X509HostnameValidator.cc | 1 -
lib/ts/test_arena.cc | 1 -
lib/ts/test_atomic.cc | 4 -
lib/ts/test_freelist.cc | 3 -
lib/wccp/Wccp.h | 5 +-
lib/wccp/WccpConfig.cc | 12 +-
lib/wccp/WccpLocal.h | 9 +-
lib/wccp/WccpMeta.h | 20 +-
lib/wccp/WccpMsg.cc | 4 +-
mgmt/Alarms.cc | 39 +--
mgmt/Alarms.h | 1 -
mgmt/BaseManager.cc | 5 -
mgmt/BaseManager.h | 3 -
mgmt/FileManager.cc | 16 +-
mgmt/LocalManager.cc | 15 --
mgmt/MultiFile.cc | 1 -
mgmt/ProcessManager.cc | 7 -
mgmt/ProxyConfig.cc | 12 +-
mgmt/ProxyConfig.h | 4 -
mgmt/RecordsConfig.cc | 2 -
mgmt/RecordsConfig.h | 1 -
mgmt/Rollback.cc | 7 -
mgmt/WebMgmtUtils.cc | 5 -
mgmt/api/APITestCliRemote.cc | 22 --
mgmt/api/CfgContextImpl.cc | 8 -
mgmt/api/CfgContextImpl.h | 7 -
mgmt/api/CfgContextManager.cc | 5 -
mgmt/api/CfgContextManager.h | 2 -
mgmt/api/CfgContextUtils.cc | 13 -
mgmt/api/CfgContextUtils.h | 2 -
mgmt/api/CoreAPI.cc | 1 -
mgmt/api/CoreAPI.h | 1 -
mgmt/api/CoreAPIRemote.cc | 3 +-
mgmt/api/CoreAPIShared.cc | 2 -
mgmt/api/EventCallback.cc | 3 -
mgmt/api/GenericParser.cc | 22 --
mgmt/api/GenericParser.h | 1 -
mgmt/api/NetworkMessage.cc | 2 +-
mgmt/api/include/mgmtapi.h | 12 +-
mgmt/cluster/ClusterCom.cc | 31 ---
mgmt/cluster/VMap.cc | 20 --
mgmt/cluster/VMap.h | 3 -
mgmt/utils/MgmtHashTable.h | 1 -
plugins/cacheurl/cacheurl.cc | 2 -
plugins/conf_remap/conf_remap.cc | 5 -
.../experimental/ats_pagespeed/ats_base_fetch.cc | 3 -
.../experimental/ats_pagespeed/ats_base_fetch.h | 2 -
plugins/experimental/ats_pagespeed/ats_config.cc | 3 -
plugins/experimental/ats_pagespeed/ats_config.h | 2 -
.../experimental/ats_pagespeed/ats_header_utils.h | 1 -
.../ats_pagespeed/ats_log_message_handler.cc | 1 -
.../ats_pagespeed/ats_log_message_handler.h | 1 -
.../ats_pagespeed/ats_message_handler.cc | 2 -
.../experimental/ats_pagespeed/ats_pagespeed.cc | 14 +-
.../ats_pagespeed/ats_process_context.h | 1 -
.../ats_pagespeed/ats_resource_intercept.cc | 5 -
.../ats_pagespeed/ats_resource_intercept.h | 1 -
.../ats_pagespeed/ats_rewrite_driver_factory.cc | 2 -
.../ats_pagespeed/ats_rewrite_driver_factory.h | 1 -
.../ats_pagespeed/ats_rewrite_options.cc | 2 -
.../ats_pagespeed/ats_rewrite_options.h | 5 -
.../ats_pagespeed/ats_server_context.cc | 1 -
.../experimental/ats_pagespeed/ats_thread_system.h | 1 -
.../ats_pagespeed/gzip/configuration.cc | 1 -
.../ats_pagespeed/gzip/configuration.h | 2 -
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 10 -
plugins/experimental/ats_pagespeed/gzip/misc.h | 1 -
plugins/experimental/authproxy/authproxy.cc | 1 -
plugins/experimental/authproxy/utils.h | 1 -
.../background_fetch/background_fetch.cc | 12 -
plugins/experimental/background_fetch/configs.cc | 1 -
plugins/experimental/background_fetch/configs.h | 2 -
plugins/experimental/background_fetch/headers.cc | 3 -
plugins/experimental/balancer/balancer.h | 2 +-
plugins/experimental/balancer/hash.cc | 8 +-
plugins/experimental/balancer/roundrobin.cc | 1 -
.../experimental/buffer_upload/buffer_upload.cc | 2 -
.../experimental/cache_promote/cache_promote.cc | 29 +-
plugins/experimental/cachekey/configs.h | 2 -
plugins/experimental/cachekey/pattern.h | 2 -
.../experimental/channel_stats/channel_stats.cc | 7 +-
.../collapsed_connection/MurmurHash3.cc | 1 -
.../custom_redirect/custom_redirect.cc | 2 -
plugins/experimental/escalate/escalate.cc | 8 -
plugins/experimental/esi/combo_handler.cc | 1 -
plugins/experimental/esi/esi.cc | 2 -
.../experimental/esi/fetcher/HttpDataFetcherImpl.h | 1 -
plugins/experimental/esi/lib/DocNode.h | 1 -
plugins/experimental/esi/lib/EsiGunzip.cc | 2 -
plugins/experimental/esi/lib/EsiGunzip.h | 1 -
plugins/experimental/esi/lib/EsiGzip.h | 1 -
plugins/experimental/esi/lib/EsiParser.cc | 7 +-
plugins/experimental/esi/lib/EsiProcessor.cc | 1 -
plugins/experimental/esi/lib/EsiProcessor.h | 1 -
plugins/experimental/esi/lib/Expression.cc | 1 -
plugins/experimental/esi/lib/FailureInfo.h | 3 +-
plugins/experimental/esi/lib/Stats.h | 1 -
plugins/experimental/esi/lib/StringHash.h | 6 +-
plugins/experimental/esi/lib/Variables.h | 1 -
plugins/experimental/esi/lib/gzip.h | 1 -
.../experimental/esi/test/TestHttpDataFetcher.h | 1 -
plugins/experimental/esi/test/parser_test.cc | 14 +-
plugins/experimental/esi/test/processor_test.cc | 1 -
plugins/experimental/esi/test/sampleProb.cc | 16 +-
plugins/experimental/esi/test/vars_test.cc | 15 +-
plugins/experimental/generator/generator.cc | 2 -
plugins/experimental/geoip_acl/acl.cc | 5 -
plugins/experimental/geoip_acl/acl.h | 7 -
plugins/experimental/geoip_acl/geoip_acl.cc | 4 -
plugins/experimental/geoip_acl/lulu.h | 1 -
.../header_normalize/header_normalize.cc | 3 +-
plugins/experimental/hipes/gen_escape.c | 1 -
plugins/experimental/hipes/hipes.cc | 6 -
plugins/experimental/inliner/ts.cc | 33 ++-
plugins/experimental/inliner/ts.h | 8 +-
plugins/experimental/memcache/protocol_binary.h | 1 -
plugins/experimental/memcache/tsmemcache.cc | 1 -
.../memcached_remap/memcached_remap.cc | 1 -
plugins/experimental/mp4/mp4.cc | 2 -
plugins/experimental/mp4/mp4_common.h | 1 -
plugins/experimental/mp4/mp4_meta.cc | 21 +-
plugins/experimental/mp4/mp4_meta.h | 4 -
plugins/experimental/multiplexer/dispatch.cc | 3 +-
plugins/experimental/mysql_remap/lib/dictionary.c | 1 -
plugins/experimental/mysql_remap/lib/dictionary.h | 5 -
plugins/experimental/mysql_remap/lib/iniparser.c | 1 -
plugins/experimental/mysql_remap/lib/iniparser.h | 5 -
plugins/experimental/remap_stats/remap_stats.c | 6 -
plugins/experimental/s3_auth/s3_auth.cc | 17 +-
plugins/experimental/ssl_cert_loader/domain-tree.h | 2 -
.../ssl_cert_loader/ssl-cert-loader.cc | 5 -
plugins/experimental/sslheaders/sslheaders.h | 1 -
plugins/experimental/sslheaders/util.cc | 9 +-
.../experimental/stream_editor/stream_editor.cc | 16 +-
plugins/experimental/ts_lua/ts_lua.c | 3 -
.../experimental/ts_lua/ts_lua_cached_response.c | 5 -
.../experimental/ts_lua/ts_lua_cached_response.h | 1 -
.../experimental/ts_lua/ts_lua_client_request.c | 4 -
.../experimental/ts_lua/ts_lua_client_request.h | 1 -
.../experimental/ts_lua/ts_lua_client_response.c | 3 -
.../experimental/ts_lua/ts_lua_client_response.h | 1 -
plugins/experimental/ts_lua/ts_lua_common.h | 4 -
plugins/experimental/ts_lua/ts_lua_constant.c | 2 -
plugins/experimental/ts_lua/ts_lua_constant.h | 1 -
plugins/experimental/ts_lua/ts_lua_context.c | 3 -
plugins/experimental/ts_lua/ts_lua_context.h | 1 -
plugins/experimental/ts_lua/ts_lua_coroutine.h | 3 -
plugins/experimental/ts_lua/ts_lua_crypto.c | 1 -
plugins/experimental/ts_lua/ts_lua_crypto.h | 1 -
plugins/experimental/ts_lua/ts_lua_fetch.c | 2 -
plugins/experimental/ts_lua/ts_lua_hook.c | 26 +-
plugins/experimental/ts_lua/ts_lua_hook.h | 1 -
plugins/experimental/ts_lua/ts_lua_http.c | 1 -
plugins/experimental/ts_lua/ts_lua_http.h | 1 -
plugins/experimental/ts_lua/ts_lua_http_cntl.c | 4 -
plugins/experimental/ts_lua/ts_lua_http_cntl.h | 1 -
plugins/experimental/ts_lua/ts_lua_http_config.c | 64 +++--
plugins/experimental/ts_lua/ts_lua_http_config.h | 1 -
.../experimental/ts_lua/ts_lua_http_intercept.c | 2 -
.../experimental/ts_lua/ts_lua_http_intercept.h | 1 -
.../experimental/ts_lua/ts_lua_http_milestone.c | 38 +--
.../experimental/ts_lua/ts_lua_http_milestone.h | 1 -
plugins/experimental/ts_lua/ts_lua_log.c | 2 -
plugins/experimental/ts_lua/ts_lua_log.h | 1 -
plugins/experimental/ts_lua/ts_lua_mgmt.c | 2 -
plugins/experimental/ts_lua/ts_lua_mgmt.h | 1 -
plugins/experimental/ts_lua/ts_lua_misc.c | 2 -
plugins/experimental/ts_lua/ts_lua_misc.h | 1 -
plugins/experimental/ts_lua/ts_lua_package.c | 6 -
plugins/experimental/ts_lua/ts_lua_package.h | 1 -
plugins/experimental/ts_lua/ts_lua_remap.c | 3 -
plugins/experimental/ts_lua/ts_lua_remap.h | 1 -
.../experimental/ts_lua/ts_lua_server_request.c | 1 -
.../experimental/ts_lua/ts_lua_server_request.h | 1 -
.../experimental/ts_lua/ts_lua_server_response.c | 4 -
.../experimental/ts_lua/ts_lua_server_response.h | 1 -
plugins/experimental/ts_lua/ts_lua_stat.c | 1 -
plugins/experimental/ts_lua/ts_lua_stat.h | 1 -
plugins/experimental/ts_lua/ts_lua_string.h | 1 -
plugins/experimental/ts_lua/ts_lua_transform.c | 3 -
plugins/experimental/ts_lua/ts_lua_transform.h | 1 -
plugins/experimental/ts_lua/ts_lua_util.c | 3 -
plugins/experimental/ts_lua/ts_lua_util.h | 1 -
.../experimental/webp_transform/ImageTransform.cc | 2 -
plugins/experimental/xdebug/xdebug.cc | 4 +-
plugins/gzip/configuration.h | 2 -
plugins/gzip/gzip.cc | 10 -
plugins/gzip/misc.h | 1 -
plugins/header_rewrite/condition.cc | 2 -
plugins/header_rewrite/condition.h | 3 -
plugins/header_rewrite/conditions.cc | 27 --
plugins/header_rewrite/conditions.h | 22 --
plugins/header_rewrite/expander.h | 2 -
plugins/header_rewrite/factory.cc | 2 -
plugins/header_rewrite/factory.h | 1 -
plugins/header_rewrite/header_rewrite.cc | 9 -
plugins/header_rewrite/header_rewrite_test.cc | 1 -
plugins/header_rewrite/lulu.h | 2 -
plugins/header_rewrite/matcher.h | 4 -
plugins/header_rewrite/operator.h | 5 -
plugins/header_rewrite/operators.cc | 15 --
plugins/header_rewrite/operators.h | 12 -
plugins/header_rewrite/parser.h | 2 -
plugins/header_rewrite/regex_helper.h | 4 -
plugins/header_rewrite/resources.cc | 2 -
plugins/header_rewrite/resources.h | 3 -
plugins/header_rewrite/ruleset.cc | 3 -
plugins/header_rewrite/ruleset.h | 2 -
plugins/header_rewrite/statement.cc | 4 -
plugins/header_rewrite/statement.h | 3 -
plugins/header_rewrite/value.h | 2 -
plugins/regex_remap/regex_remap.cc | 11 +-
plugins/tcpinfo/tcpinfo.cc | 9 +-
proxy/AbstractBuffer.cc | 1 -
proxy/AbstractBuffer.h | 14 +-
proxy/CacheControl.cc | 2 -
proxy/ControlBase.h | 1 -
proxy/ControlMatcher.cc | 3 -
proxy/ControlMatcher.h | 3 -
proxy/CoreUtils.cc | 7 -
proxy/CoreUtils.h | 1 -
proxy/EventName.cc | 4 -
proxy/FetchSM.h | 1 -
proxy/ICP.cc | 2 -
proxy/ICP.h | 11 +-
proxy/ICPConfig.cc | 54 +++-
proxy/ICPProcessor.cc | 1 -
proxy/ICPProcessor.h | 1 -
proxy/ICPStats.cc | 1 -
proxy/ICPlog.h | 1 -
proxy/IPAllow.cc | 1 -
proxy/IPAllow.h | 2 -
proxy/InkAPI.cc | 48 +---
proxy/InkAPIInternal.h | 2 -
proxy/InkAPITest.cc | 223 ++++++++--------
proxy/InkAPITestTool.cc | 17 --
proxy/InkIOCoreAPI.cc | 8 -
proxy/Main.cc | 8 -
proxy/Main.h | 1 -
proxy/Milestones.h | 3 -
proxy/ParentConsistentHash.cc | 1 -
proxy/ParentSelection.cc | 32 ++-
proxy/Plugin.cc | 1 -
proxy/Plugin.h | 1 -
proxy/PluginVC.cc | 3 -
proxy/Prefetch.cc | 34 ++-
proxy/Prefetch.h | 6 -
proxy/ProtocolProbeSessionAccept.h | 1 -
proxy/ProxyClientTransaction.h | 2 -
proxy/ReverseProxy.cc | 1 -
proxy/Show.h | 1 -
proxy/SocksProxy.cc | 5 -
proxy/StatPages.cc | 1 -
proxy/StatPages.h | 1 -
proxy/StufferUdpReceiver.cc | 1 -
proxy/TestClusterHash.cc | 1 -
proxy/TestDNS.cc | 2 -
proxy/TestPreProc.cc | 2 -
proxy/TestPreProc.h | 1 -
proxy/TestProxy.cc | 1 -
proxy/TestSimpleProxy.cc | 1 -
proxy/TimeTrace.h | 1 -
proxy/Transform.cc | 17 --
proxy/Transform.h | 2 -
proxy/TransformInternal.h | 8 -
proxy/UDPAPIClientTest.cc | 2 -
proxy/UDPAPITest.cc | 5 -
proxy/api/ts/InkAPIPrivateIOCore.h | 1 -
proxy/api/ts/experimental.h | 7 -
proxy/api/ts/remap.h | 7 -
proxy/api/ts/ts.h | 30 +--
proxy/congest/Congestion.h | 3 -
proxy/congest/CongestionDB.cc | 2 -
proxy/congest/CongestionDB.h | 3 -
proxy/congest/CongestionTest.cc | 2 -
proxy/congest/MT_hashtable.h | 4 -
proxy/hdrs/HTTP.cc | 9 -
proxy/hdrs/HTTP.h | 46 ++--
proxy/hdrs/HdrHeap.cc | 20 +-
proxy/hdrs/HdrHeap.h | 7 -
proxy/hdrs/HdrTSOnly.cc | 2 -
proxy/hdrs/HdrTest.cc | 56 ++--
proxy/hdrs/HdrToken.cc | 2 -
proxy/hdrs/HdrUtils.cc | 2 -
proxy/hdrs/HdrUtils.h | 2 -
proxy/hdrs/HttpCompat.cc | 4 -
proxy/hdrs/HttpCompat.h | 1 -
proxy/hdrs/MIME.cc | 15 --
proxy/hdrs/MIME.h | 2 -
proxy/hdrs/URL.cc | 6 -
proxy/hdrs/URL.h | 3 -
proxy/hdrs/load_http_hdr.cc | 6 -
proxy/hdrs/test_header.cc | 15 --
proxy/hdrs/test_urlhash.cc | 1 -
proxy/http/Http1ClientSession.h | 2 -
proxy/http/Http1ClientTransaction.h | 1 -
proxy/http/HttpBodyFactory.cc | 16 --
proxy/http/HttpBodyFactory.h | 3 -
proxy/http/HttpCacheSM.cc | 1 -
proxy/http/HttpConfig.cc | 15 +-
proxy/http/HttpConfig.h | 2 -
proxy/http/HttpConnectionCount.cc | 1 -
proxy/http/HttpConnectionCount.h | 3 -
proxy/http/HttpDebugNames.cc | 3 -
proxy/http/HttpPages.cc | 3 -
proxy/http/HttpPages.h | 1 -
proxy/http/HttpSM.cc | 44 +--
proxy/http/HttpSM.h | 1 -
proxy/http/HttpServerSession.cc | 1 -
proxy/http/HttpSessionAccept.cc | 1 -
proxy/http/HttpSessionAccept.h | 1 -
proxy/http/HttpSessionManager.cc | 1 -
proxy/http/HttpSessionManager.h | 3 -
proxy/http/HttpTransact.cc | 47 ----
proxy/http/HttpTransact.h | 4 -
proxy/http/HttpTransactCache.cc | 7 -
proxy/http/HttpTransactCache.h | 7 +-
proxy/http/HttpTransactHeaders.cc | 25 --
proxy/http/HttpTransactHeaders.h | 2 -
proxy/http/HttpTunnel.cc | 4 -
proxy/http/HttpTunnel.h | 2 +-
proxy/http/HttpUpdateSM.cc | 1 -
proxy/http/HttpUpdateSM.h | 1 -
proxy/http/TestHttpTransact.cc | 1 -
proxy/http/TestUrl.cc | 3 -
proxy/http/remap/RemapConfig.cc | 1 -
proxy/http/remap/RemapPluginInfo.cc | 3 -
proxy/http/remap/RemapPluginInfo.h | 2 -
proxy/http/remap/RemapPlugins.h | 2 -
proxy/http/remap/RemapProcessor.h | 2 -
proxy/http/remap/UrlMapping.cc | 5 -
proxy/http/remap/UrlMapping.h | 5 -
proxy/http/remap/UrlMappingPathIndex.h | 11 +-
proxy/http/test_socket_close.cc | 2 -
proxy/http2/HPACK.cc | 2 -
proxy/http2/HPACK.h | 7 -
proxy/http2/HTTP2.cc | 4 +-
proxy/http2/HTTP2.h | 4 -
proxy/http2/Http2ClientSession.h | 1 -
proxy/http2/Http2ConnectionState.cc | 1 -
proxy/http2/Http2Stream.h | 1 -
proxy/http2/HuffmanCodec.cc | 295 +++------------------
proxy/http2/RegressionHPACK.cc | 207 +++++++--------
proxy/http2/test_Huffmancode.cc | 13 +-
proxy/logcat.cc | 1 -
proxy/logging/Log.cc | 37 ++-
proxy/logging/Log.h | 2 -
proxy/logging/LogAccess.cc | 7 -
proxy/logging/LogAccess.h | 4 -
proxy/logging/LogAccessHttp.cc | 12 -
proxy/logging/LogAccessHttp.h | 1 -
proxy/logging/LogAccessICP.h | 1 -
proxy/logging/LogAccessTest.h | 1 -
proxy/logging/LogBuffer.cc | 3 -
proxy/logging/LogBuffer.h | 9 +-
proxy/logging/LogConfig.cc | 41 +--
proxy/logging/LogConfig.h | 1 -
proxy/logging/LogField.cc | 17 +-
proxy/logging/LogField.h | 3 -
proxy/logging/LogFieldAliasMap.h | 5 -
proxy/logging/LogFile.h | 1 -
proxy/logging/LogFilter.cc | 18 +-
proxy/logging/LogFilter.h | 3 -
proxy/logging/LogHost.cc | 4 +-
proxy/logging/LogObject.cc | 27 --
proxy/logging/LogObject.h | 7 +-
proxy/logging/LogSock.h | 1 -
proxy/logging/LogStandalone.cc | 2 -
proxy/logging/LogUtils.cc | 3 -
proxy/logstats.cc | 38 +--
proxy/shared/DiagsConfig.cc | 22 +-
proxy/shared/DiagsConfig.h | 1 -
proxy/shared/Error.cc | 3 +-
proxy/shared/Error.h | 2 -
proxy/shared/InkXml.h | 2 -
proxy/shared/UglyLogStubs.cc | 1 -
proxy/spdy/SpdyClientSession.cc | 9 +-
proxy/spdy/SpdyClientSession.h | 4 +-
proxy/spdy/SpdySessionAccept.h | 1 -
tools/clang-format.sh | 28 +-
tools/http_load/http_load.c | 22 --
tools/http_load/timers.c | 14 -
tools/jtest/jtest.cc | 2 +-
tools/lighttpd_mod_generator/mod_generator.c | 2 -
693 files changed, 1387 insertions(+), 3522 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 02/02: TS-4164 Update indentation with latest tools
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit a5cddca1811b0fd541c74fc357d17126ff7fbbad
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Sun Apr 17 18:11:17 2016 -0600
TS-4164 Update indentation with latest tools
---
cmd/traffic_cop/traffic_cop.cc | 11 -
cmd/traffic_ctl/traffic_ctl.h | 4 -
cmd/traffic_layout/traffic_layout.cc | 2 -
cmd/traffic_manager/AddConfigFilesHere.cc | 1 -
cmd/traffic_manager/StatProcessor.cc | 11 -
cmd/traffic_manager/StatProcessor.h | 1 -
cmd/traffic_manager/StatType.cc | 36 ---
cmd/traffic_manager/StatType.h | 2 -
cmd/traffic_manager/StatXML.cc | 1 -
cmd/traffic_manager/StatXML.h | 1 -
cmd/traffic_manager/WebOverview.cc | 4 +-
cmd/traffic_manager/metrics.cc | 2 -
cmd/traffic_manager/traffic_manager.cc | 1 -
cmd/traffic_top/stats.h | 6 -
cmd/traffic_top/traffic_top.cc | 2 -
cmd/traffic_via/traffic_via.cc | 2 -
example/add-header/add-header.c | 1 -
example/basic-auth/basic-auth.c | 3 -
example/blacklist-1/blacklist-1.c | 2 -
example/cache-scan/cache-scan.cc | 4 -
example/intercept/intercept.cc | 6 +-
example/protocol/Protocol.c | 2 -
example/protocol/Protocol.h | 1 -
example/protocol/TxnSM.c | 1 -
example/query-remap/query-remap.c | 4 -
example/redirect-1/redirect-1.c | 9 -
example/remap/remap.cc | 4 -
example/remap_header_add/remap_header_add.cc | 5 -
example/response-header-1/response-header-1.c | 5 -
example/session-1/session-1.c | 2 -
example/ssl-preaccept/ssl-preaccept.cc | 1 -
example/ssl-sni/ssl-sni.cc | 2 -
example/thread-1/thread-1.c | 1 -
example/thread-pool/psi.c | 16 --
example/thread-pool/test/SDKTest/psi_server.c | 2 -
example/thread-pool/thread.c | 2 -
example/thread-pool/thread.h | 4 -
example/version/version.c | 2 +-
iocore/aio/AIO.cc | 2 -
iocore/cache/Cache.cc | 19 --
iocore/cache/CacheDir.cc | 14 +-
iocore/cache/CacheDisk.cc | 2 -
iocore/cache/CacheHosting.cc | 4 -
iocore/cache/CacheHttp.cc | 5 -
iocore/cache/CachePages.cc | 7 -
iocore/cache/CachePagesInternal.cc | 10 -
iocore/cache/CacheRead.cc | 7 +-
iocore/cache/CacheTest.cc | 2 +-
iocore/cache/CacheVol.cc | 4 +-
iocore/cache/CacheWrite.cc | 2 -
iocore/cache/I_CacheDefs.h | 1 -
iocore/cache/I_Store.h | 12 +-
iocore/cache/P_CacheArray.h | 7 +-
iocore/cache/P_CacheBC.h | 2 -
iocore/cache/P_CacheDir.h | 1 -
iocore/cache/P_CacheDisk.h | 1 -
iocore/cache/P_CacheHosting.h | 2 -
iocore/cache/P_CacheHttp.h | 2 -
iocore/cache/P_CacheInternal.h | 5 -
iocore/cache/P_CacheVol.h | 6 -
iocore/cache/RamCacheCLFUS.cc | 3 +-
iocore/cache/Store.cc | 12 +-
iocore/cluster/ClusterAPI.cc | 1 -
iocore/cluster/ClusterCache.cc | 6 -
iocore/cluster/ClusterConfig.cc | 1 -
iocore/cluster/ClusterHandler.cc | 2 -
iocore/cluster/ClusterHandlerBase.cc | 1 -
iocore/cluster/ClusterHash.cc | 2 -
iocore/cluster/ClusterLib.cc | 1 -
iocore/cluster/ClusterLoadMonitor.cc | 1 -
iocore/cluster/ClusterProcessor.cc | 1 -
iocore/cluster/ClusterRPC.cc | 4 +-
iocore/cluster/ClusterVConnection.cc | 1 -
iocore/cluster/P_Cluster.h | 2 -
iocore/cluster/P_ClusterCache.h | 4 -
iocore/cluster/P_ClusterCacheInternal.h | 2 -
iocore/cluster/P_ClusterHandler.h | 3 -
iocore/cluster/P_ClusterInternal.h | 2 -
iocore/cluster/P_ClusterLoadMonitor.h | 1 -
iocore/cluster/P_ClusterMachine.h | 3 -
iocore/cluster/P_TimeTrace.h | 1 -
iocore/dns/DNS.cc | 12 +-
iocore/dns/DNSConnection.cc | 5 +-
iocore/dns/I_DNS.h | 1 -
iocore/dns/I_DNSProcessor.h | 3 -
iocore/dns/I_SplitDNSProcessor.h | 1 -
iocore/dns/P_DNSProcessor.h | 6 +-
iocore/dns/P_SplitDNS.h | 1 -
iocore/dns/P_SplitDNSProcessor.h | 14 -
iocore/dns/SRV.h | 5 +-
iocore/dns/SplitDNS.cc | 21 --
iocore/dns/test_P_DNS.cc | 1 -
iocore/eventsystem/IOBuffer.cc | 2 -
iocore/eventsystem/I_Action.h | 5 +-
iocore/eventsystem/I_EThread.h | 4 +-
iocore/eventsystem/I_Event.h | 1 -
iocore/eventsystem/I_EventProcessor.h | 2 -
iocore/eventsystem/I_IOBuffer.h | 28 +-
iocore/eventsystem/I_PriorityEventQueue.h | 1 -
iocore/eventsystem/I_Thread.h | 1 -
iocore/eventsystem/I_VIO.h | 1 -
iocore/eventsystem/P_IOBuffer.h | 3 -
iocore/eventsystem/P_ProtectedQueue.h | 1 -
iocore/eventsystem/P_UnixEventProcessor.h | 3 -
iocore/eventsystem/P_UnixSocketManager.h | 4 -
iocore/eventsystem/P_VConnection.h | 2 -
iocore/eventsystem/P_VIO.h | 1 -
iocore/eventsystem/Processor.cc | 1 -
iocore/eventsystem/ProtectedQueue.cc | 1 -
iocore/eventsystem/Tasks.cc | 1 -
iocore/eventsystem/UnixEThread.cc | 7 +-
iocore/eventsystem/UnixEventProcessor.cc | 1 -
iocore/hostdb/HostDB.cc | 52 ----
iocore/hostdb/I_HostDB.h | 1 -
iocore/hostdb/I_HostDBProcessor.h | 5 -
iocore/hostdb/MultiCache.cc | 4 -
iocore/hostdb/P_HostDB.h | 1 -
iocore/hostdb/P_HostDBProcessor.h | 9 +-
iocore/hostdb/P_MultiCache.h | 4 -
iocore/hostdb/include/Machine.h | 3 -
iocore/hostdb/test_I_HostDB.cc | 1 -
iocore/hostdb/test_P_HostDB.cc | 1 -
iocore/net/Connection.cc | 5 -
iocore/net/I_NetProcessor.h | 1 -
iocore/net/I_NetVConnection.h | 7 +-
iocore/net/I_SessionAccept.h | 2 -
iocore/net/I_Socks.h | 1 -
iocore/net/I_UDPPacket.h | 1 -
iocore/net/Net.cc | 2 -
iocore/net/NetTest-http-server.c | 9 -
iocore/net/NetVCTest.cc | 3 -
iocore/net/P_Connection.h | 1 -
iocore/net/P_InkBulkIO.h | 3 -
iocore/net/P_LibBulkIO.h | 1 -
iocore/net/P_NetAccept.h | 9 +-
iocore/net/P_NetVCTest.h | 3 -
iocore/net/P_NetVConnection.h | 1 -
iocore/net/P_SSLCertLookup.h | 1 -
iocore/net/P_SSLConfig.h | 1 -
iocore/net/P_SSLNetVConnection.h | 2 -
iocore/net/P_UDPConnection.h | 2 -
iocore/net/P_UDPNet.h | 5 -
iocore/net/P_UDPPacket.h | 1 -
iocore/net/P_UnixNet.h | 7 -
iocore/net/P_UnixNetProcessor.h | 1 -
iocore/net/P_UnixNetVConnection.h | 1 -
iocore/net/P_UnixPollDescriptor.h | 1 -
iocore/net/P_UnixUDPConnection.h | 1 -
iocore/net/SSLCertLookup.cc | 3 +-
iocore/net/SSLNetProcessor.cc | 1 -
iocore/net/SSLNetVConnection.cc | 9 +-
iocore/net/SSLSessionCache.h | 9 +-
iocore/net/SSLUtils.cc | 12 +-
iocore/net/UnixConnection.cc | 1 -
iocore/net/UnixNet.cc | 4 -
iocore/net/UnixNetAccept.cc | 9 -
iocore/net/UnixNetProcessor.cc | 4 -
iocore/net/UnixNetVConnection.cc | 6 -
iocore/net/UnixUDPNet.cc | 5 -
iocore/net/test_I_Net.cc | 3 -
iocore/net/test_P_Net.cc | 4 -
iocore/utils/I_Machine.h | 1 -
iocore/utils/OneWayTunnel.cc | 1 -
.../examples/async_http_fetch/AsyncHttpFetch.cc | 2 -
.../AsyncHttpFetchStreaming.cc | 1 -
lib/atscppapi/examples/async_timer/AsyncTimer.cc | 1 -
lib/atscppapi/examples/boom/boom.cc | 4 +-
.../examples/clientredirect/ClientRedirect.cc | 4 -
.../examples/clientrequest/ClientRequest.cc | 2 -
.../CustomErrorRemapPlugin.cc | 1 -
.../examples/customresponse/CustomResponse.cc | 3 -
.../examples/globalhook/GlobalHookPlugin.cc | 1 -
.../GzipTransformationPlugin.cc | 1 -
.../examples/helloworld/HelloWorldPlugin.cc | 1 -
.../InternalTransactionHandling.cc | 1 -
.../examples/logger_example/LoggerExample.cc | 1 -
.../MultipleTransactionHookPlugins.cc | 4 -
.../NullTransformationPlugin.cc | 1 -
lib/atscppapi/examples/post_buffer/PostBuffer.cc | 3 -
lib/atscppapi/examples/remap_plugin/RemapPlugin.cc | 2 -
lib/atscppapi/examples/stat_example/StatExample.cc | 1 -
.../timeout_example/TimeoutExamplePlugin.cc | 1 -
.../transactionhook/TransactionHookPlugin.cc | 1 -
.../src/CaseInsensitiveStringComparator.cc | 3 +-
lib/atscppapi/src/GzipDeflateTransformation.cc | 1 -
lib/atscppapi/src/GzipInflateTransformation.cc | 1 -
lib/atscppapi/src/Headers.cc | 51 ++--
lib/atscppapi/src/Logger.cc | 1 -
lib/atscppapi/src/Plugin.cc | 7 +-
lib/atscppapi/src/Transaction.cc | 8 +-
lib/atscppapi/src/include/atscppapi/Async.h | 14 +-
lib/atscppapi/src/include/atscppapi/GlobalPlugin.h | 1 -
.../include/atscppapi/GzipDeflateTransformation.h | 1 -
lib/atscppapi/src/include/atscppapi/Headers.h | 1 -
.../src/include/atscppapi/InterceptPlugin.h | 1 -
lib/atscppapi/src/include/atscppapi/Logger.h | 1 -
lib/atscppapi/src/include/atscppapi/Mutex.h | 8 -
lib/atscppapi/src/include/atscppapi/Plugin.h | 1 -
lib/atscppapi/src/include/atscppapi/PluginInit.h | 1 -
lib/atscppapi/src/include/atscppapi/Stat.h | 1 -
lib/atscppapi/src/include/atscppapi/Transaction.h | 3 -
.../src/include/atscppapi/TransactionPlugin.h | 1 -
.../src/include/atscppapi/TransformationPlugin.h | 1 -
lib/atscppapi/src/include/atscppapi/noncopyable.h | 2 -
lib/atscppapi/src/utils_internal.cc | 1 -
lib/raft/raft.h | 1 -
lib/raft/raft_impl.h | 15 +-
lib/raft/raft_test.cc | 16 +-
lib/records/I_RecCore.h | 2 -
lib/records/I_RecDefs.h | 6 -
lib/records/I_RecHttp.h | 7 +-
lib/records/I_RecProcess.h | 4 -
lib/records/P_RecCore.cc | 17 --
lib/records/P_RecUtils.h | 3 -
lib/records/RecCore.cc | 14 -
lib/records/RecDebug.cc | 3 -
lib/records/RecHttp.cc | 1 -
lib/records/RecLocal.cc | 3 -
lib/records/RecProcess.cc | 9 -
lib/records/RecRawStats.cc | 14 -
lib/records/RecUtils.cc | 3 -
lib/records/test_I_RecLocal.cc | 3 -
lib/ts/Allocator.h | 1 -
lib/ts/Arena.cc | 3 -
lib/ts/Arena.h | 6 -
lib/ts/BaseLogFile.cc | 2 -
lib/ts/BaseLogFile.h | 2 -
lib/ts/Bitops.cc | 1 -
lib/ts/CompileParseRules.cc | 1 -
lib/ts/ConsistentHash.cc | 3 +-
lib/ts/ContFlags.cc | 1 -
lib/ts/ContFlags.h | 3 +-
lib/ts/CryptoHash.h | 17 +-
lib/ts/Diags.cc | 10 +-
lib/ts/Diags.h | 9 +-
lib/ts/DynArray.h | 9 +-
lib/ts/Hash.cc | 9 +-
lib/ts/Hash.h | 12 +-
lib/ts/HashFNV.h | 1 -
lib/ts/HostLookup.cc | 5 -
lib/ts/HostLookup.h | 3 -
lib/ts/I_Version.h | 3 +-
lib/ts/IntrusiveDList.h | 13 +-
lib/ts/IntrusivePtrTest.cc | 2 +-
lib/ts/IpMap.cc | 68 ++++-
lib/ts/IpMap.h | 10 +-
lib/ts/List.h | 13 +-
lib/ts/MMH.cc | 1 -
lib/ts/Map.h | 73 ++---
lib/ts/MatcherUtils.cc | 1 -
lib/ts/MatcherUtils.h | 5 +-
lib/ts/ParseRules.h | 1 -
lib/ts/PriorityQueue.h | 11 +-
lib/ts/Ptr.h | 76 ++++--
lib/ts/RawHashTable.h | 4 +-
lib/ts/RbTree.cc | 13 +-
lib/ts/RbTree.h | 3 -
lib/ts/Regex.cc | 1 -
lib/ts/Regex.h | 1 -
lib/ts/Regression.h | 1 -
lib/ts/SimpleTokenizer.h | 1 -
lib/ts/TestBox.h | 5 +-
lib/ts/TestHttpHeader.cc | 1 -
lib/ts/Tokenizer.cc | 3 -
lib/ts/Trie.h | 9 +-
lib/ts/TsBuffer.h | 30 ++-
lib/ts/Vec.h | 4 +-
lib/ts/Version.cc | 2 -
lib/ts/X509HostnameValidator.cc | 4 -
lib/ts/X509HostnameValidator.h | 1 -
lib/ts/ink_args.cc | 5 +-
lib/ts/ink_atomic.h | 2 -
lib/ts/ink_base64.cc | 1 -
lib/ts/ink_defs.h | 4 +-
lib/ts/ink_exception.h | 1 -
lib/ts/ink_hash_table.cc | 14 -
lib/ts/ink_hash_table.h | 1 -
lib/ts/ink_hrtime.cc | 1 -
lib/ts/ink_hrtime.h | 1 -
lib/ts/ink_inet.cc | 6 +-
lib/ts/ink_inet.h | 77 ++++--
lib/ts/ink_inout.h | 1 -
lib/ts/ink_llqueue.h | 1 -
lib/ts/ink_lockfile.h | 3 -
lib/ts/ink_memory.h | 53 ++--
lib/ts/ink_platform.h | 3 -
lib/ts/ink_queue.cc | 2 -
lib/ts/ink_queue.h | 6 +-
lib/ts/ink_rand.cc | 1 -
lib/ts/ink_rand.h | 2 -
lib/ts/ink_res_init.cc | 1 -
lib/ts/ink_res_mkquery.cc | 1 -
lib/ts/ink_sock.cc | 2 -
lib/ts/ink_sprintf.cc | 1 -
lib/ts/ink_string++.cc | 1 -
lib/ts/ink_string.cc | 3 -
lib/ts/ink_string.h | 4 -
lib/ts/ink_syslog.cc | 28 +-
lib/ts/ink_thread.h | 3 -
lib/ts/ink_time.cc | 2 -
lib/ts/llqueue.cc | 4 -
lib/ts/load_http_hdr.cc | 4 -
lib/ts/lockfile.cc | 1 -
lib/ts/mkdfa.c | 70 ++---
lib/ts/test_List.cc | 1 -
lib/ts/test_Map.cc | 1 -
lib/ts/test_PriorityQueue.cc | 7 +-
lib/ts/test_Vec.cc | 1 -
lib/ts/test_X509HostnameValidator.cc | 1 -
lib/ts/test_arena.cc | 1 -
lib/ts/test_atomic.cc | 4 -
lib/ts/test_freelist.cc | 3 -
lib/wccp/Wccp.h | 5 +-
lib/wccp/WccpConfig.cc | 12 +-
lib/wccp/WccpLocal.h | 9 +-
lib/wccp/WccpMeta.h | 20 +-
lib/wccp/WccpMsg.cc | 4 +-
mgmt/Alarms.cc | 39 +--
mgmt/Alarms.h | 1 -
mgmt/BaseManager.cc | 5 -
mgmt/BaseManager.h | 3 -
mgmt/FileManager.cc | 16 +-
mgmt/LocalManager.cc | 15 --
mgmt/MultiFile.cc | 1 -
mgmt/ProcessManager.cc | 7 -
mgmt/ProxyConfig.cc | 12 +-
mgmt/ProxyConfig.h | 4 -
mgmt/RecordsConfig.cc | 2 -
mgmt/RecordsConfig.h | 1 -
mgmt/Rollback.cc | 7 -
mgmt/WebMgmtUtils.cc | 5 -
mgmt/api/APITestCliRemote.cc | 22 --
mgmt/api/CfgContextImpl.cc | 8 -
mgmt/api/CfgContextImpl.h | 7 -
mgmt/api/CfgContextManager.cc | 5 -
mgmt/api/CfgContextManager.h | 2 -
mgmt/api/CfgContextUtils.cc | 13 -
mgmt/api/CfgContextUtils.h | 2 -
mgmt/api/CoreAPI.cc | 1 -
mgmt/api/CoreAPI.h | 1 -
mgmt/api/CoreAPIRemote.cc | 3 +-
mgmt/api/CoreAPIShared.cc | 2 -
mgmt/api/EventCallback.cc | 3 -
mgmt/api/GenericParser.cc | 22 --
mgmt/api/GenericParser.h | 1 -
mgmt/api/NetworkMessage.cc | 2 +-
mgmt/api/include/mgmtapi.h | 12 +-
mgmt/cluster/ClusterCom.cc | 31 ---
mgmt/cluster/VMap.cc | 20 --
mgmt/cluster/VMap.h | 3 -
mgmt/utils/MgmtHashTable.h | 1 -
plugins/cacheurl/cacheurl.cc | 2 -
plugins/conf_remap/conf_remap.cc | 5 -
.../experimental/ats_pagespeed/ats_base_fetch.cc | 3 -
.../experimental/ats_pagespeed/ats_base_fetch.h | 2 -
plugins/experimental/ats_pagespeed/ats_config.cc | 3 -
plugins/experimental/ats_pagespeed/ats_config.h | 2 -
.../experimental/ats_pagespeed/ats_header_utils.h | 1 -
.../ats_pagespeed/ats_log_message_handler.cc | 1 -
.../ats_pagespeed/ats_log_message_handler.h | 1 -
.../ats_pagespeed/ats_message_handler.cc | 2 -
.../experimental/ats_pagespeed/ats_pagespeed.cc | 14 +-
.../ats_pagespeed/ats_process_context.h | 1 -
.../ats_pagespeed/ats_resource_intercept.cc | 5 -
.../ats_pagespeed/ats_resource_intercept.h | 1 -
.../ats_pagespeed/ats_rewrite_driver_factory.cc | 2 -
.../ats_pagespeed/ats_rewrite_driver_factory.h | 1 -
.../ats_pagespeed/ats_rewrite_options.cc | 2 -
.../ats_pagespeed/ats_rewrite_options.h | 5 -
.../ats_pagespeed/ats_server_context.cc | 1 -
.../experimental/ats_pagespeed/ats_thread_system.h | 1 -
.../ats_pagespeed/gzip/configuration.cc | 1 -
.../ats_pagespeed/gzip/configuration.h | 2 -
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 10 -
plugins/experimental/ats_pagespeed/gzip/misc.h | 1 -
plugins/experimental/authproxy/authproxy.cc | 1 -
plugins/experimental/authproxy/utils.h | 1 -
.../background_fetch/background_fetch.cc | 12 -
plugins/experimental/background_fetch/configs.cc | 1 -
plugins/experimental/background_fetch/configs.h | 2 -
plugins/experimental/background_fetch/headers.cc | 3 -
plugins/experimental/balancer/balancer.h | 2 +-
plugins/experimental/balancer/hash.cc | 8 +-
plugins/experimental/balancer/roundrobin.cc | 1 -
.../experimental/buffer_upload/buffer_upload.cc | 2 -
.../experimental/cache_promote/cache_promote.cc | 29 +-
plugins/experimental/cachekey/configs.h | 2 -
plugins/experimental/cachekey/pattern.h | 2 -
.../experimental/channel_stats/channel_stats.cc | 7 +-
.../collapsed_connection/MurmurHash3.cc | 1 -
.../custom_redirect/custom_redirect.cc | 2 -
plugins/experimental/escalate/escalate.cc | 8 -
plugins/experimental/esi/combo_handler.cc | 1 -
plugins/experimental/esi/esi.cc | 2 -
.../experimental/esi/fetcher/HttpDataFetcherImpl.h | 1 -
plugins/experimental/esi/lib/DocNode.h | 1 -
plugins/experimental/esi/lib/EsiGunzip.cc | 2 -
plugins/experimental/esi/lib/EsiGunzip.h | 1 -
plugins/experimental/esi/lib/EsiGzip.h | 1 -
plugins/experimental/esi/lib/EsiParser.cc | 7 +-
plugins/experimental/esi/lib/EsiProcessor.cc | 1 -
plugins/experimental/esi/lib/EsiProcessor.h | 1 -
plugins/experimental/esi/lib/Expression.cc | 1 -
plugins/experimental/esi/lib/FailureInfo.h | 3 +-
plugins/experimental/esi/lib/Stats.h | 1 -
plugins/experimental/esi/lib/StringHash.h | 6 +-
plugins/experimental/esi/lib/Variables.h | 1 -
plugins/experimental/esi/lib/gzip.h | 1 -
.../experimental/esi/test/TestHttpDataFetcher.h | 1 -
plugins/experimental/esi/test/parser_test.cc | 14 +-
plugins/experimental/esi/test/processor_test.cc | 1 -
plugins/experimental/esi/test/sampleProb.cc | 16 +-
plugins/experimental/esi/test/vars_test.cc | 15 +-
plugins/experimental/generator/generator.cc | 2 -
plugins/experimental/geoip_acl/acl.cc | 5 -
plugins/experimental/geoip_acl/acl.h | 7 -
plugins/experimental/geoip_acl/geoip_acl.cc | 4 -
plugins/experimental/geoip_acl/lulu.h | 1 -
.../header_normalize/header_normalize.cc | 3 +-
plugins/experimental/hipes/gen_escape.c | 1 -
plugins/experimental/hipes/hipes.cc | 6 -
plugins/experimental/inliner/ts.cc | 33 ++-
plugins/experimental/inliner/ts.h | 8 +-
plugins/experimental/memcache/protocol_binary.h | 1 -
plugins/experimental/memcache/tsmemcache.cc | 1 -
.../memcached_remap/memcached_remap.cc | 1 -
plugins/experimental/mp4/mp4.cc | 2 -
plugins/experimental/mp4/mp4_common.h | 1 -
plugins/experimental/mp4/mp4_meta.cc | 21 +-
plugins/experimental/mp4/mp4_meta.h | 4 -
plugins/experimental/multiplexer/dispatch.cc | 3 +-
plugins/experimental/mysql_remap/lib/dictionary.c | 1 -
plugins/experimental/mysql_remap/lib/dictionary.h | 5 -
plugins/experimental/mysql_remap/lib/iniparser.c | 1 -
plugins/experimental/mysql_remap/lib/iniparser.h | 5 -
plugins/experimental/remap_stats/remap_stats.c | 6 -
plugins/experimental/s3_auth/s3_auth.cc | 17 +-
plugins/experimental/ssl_cert_loader/domain-tree.h | 2 -
.../ssl_cert_loader/ssl-cert-loader.cc | 5 -
plugins/experimental/sslheaders/sslheaders.h | 1 -
plugins/experimental/sslheaders/util.cc | 9 +-
.../experimental/stream_editor/stream_editor.cc | 16 +-
plugins/experimental/ts_lua/ts_lua.c | 3 -
.../experimental/ts_lua/ts_lua_cached_response.c | 5 -
.../experimental/ts_lua/ts_lua_cached_response.h | 1 -
.../experimental/ts_lua/ts_lua_client_request.c | 4 -
.../experimental/ts_lua/ts_lua_client_request.h | 1 -
.../experimental/ts_lua/ts_lua_client_response.c | 3 -
.../experimental/ts_lua/ts_lua_client_response.h | 1 -
plugins/experimental/ts_lua/ts_lua_common.h | 4 -
plugins/experimental/ts_lua/ts_lua_constant.c | 2 -
plugins/experimental/ts_lua/ts_lua_constant.h | 1 -
plugins/experimental/ts_lua/ts_lua_context.c | 3 -
plugins/experimental/ts_lua/ts_lua_context.h | 1 -
plugins/experimental/ts_lua/ts_lua_coroutine.h | 3 -
plugins/experimental/ts_lua/ts_lua_crypto.c | 1 -
plugins/experimental/ts_lua/ts_lua_crypto.h | 1 -
plugins/experimental/ts_lua/ts_lua_fetch.c | 2 -
plugins/experimental/ts_lua/ts_lua_hook.c | 26 +-
plugins/experimental/ts_lua/ts_lua_hook.h | 1 -
plugins/experimental/ts_lua/ts_lua_http.c | 1 -
plugins/experimental/ts_lua/ts_lua_http.h | 1 -
plugins/experimental/ts_lua/ts_lua_http_cntl.c | 4 -
plugins/experimental/ts_lua/ts_lua_http_cntl.h | 1 -
plugins/experimental/ts_lua/ts_lua_http_config.c | 64 +++--
plugins/experimental/ts_lua/ts_lua_http_config.h | 1 -
.../experimental/ts_lua/ts_lua_http_intercept.c | 2 -
.../experimental/ts_lua/ts_lua_http_intercept.h | 1 -
.../experimental/ts_lua/ts_lua_http_milestone.c | 38 +--
.../experimental/ts_lua/ts_lua_http_milestone.h | 1 -
plugins/experimental/ts_lua/ts_lua_log.c | 2 -
plugins/experimental/ts_lua/ts_lua_log.h | 1 -
plugins/experimental/ts_lua/ts_lua_mgmt.c | 2 -
plugins/experimental/ts_lua/ts_lua_mgmt.h | 1 -
plugins/experimental/ts_lua/ts_lua_misc.c | 2 -
plugins/experimental/ts_lua/ts_lua_misc.h | 1 -
plugins/experimental/ts_lua/ts_lua_package.c | 6 -
plugins/experimental/ts_lua/ts_lua_package.h | 1 -
plugins/experimental/ts_lua/ts_lua_remap.c | 3 -
plugins/experimental/ts_lua/ts_lua_remap.h | 1 -
.../experimental/ts_lua/ts_lua_server_request.c | 1 -
.../experimental/ts_lua/ts_lua_server_request.h | 1 -
.../experimental/ts_lua/ts_lua_server_response.c | 4 -
.../experimental/ts_lua/ts_lua_server_response.h | 1 -
plugins/experimental/ts_lua/ts_lua_stat.c | 1 -
plugins/experimental/ts_lua/ts_lua_stat.h | 1 -
plugins/experimental/ts_lua/ts_lua_string.h | 1 -
plugins/experimental/ts_lua/ts_lua_transform.c | 3 -
plugins/experimental/ts_lua/ts_lua_transform.h | 1 -
plugins/experimental/ts_lua/ts_lua_util.c | 3 -
plugins/experimental/ts_lua/ts_lua_util.h | 1 -
.../experimental/webp_transform/ImageTransform.cc | 2 -
plugins/experimental/xdebug/xdebug.cc | 4 +-
plugins/gzip/configuration.h | 2 -
plugins/gzip/gzip.cc | 10 -
plugins/gzip/misc.h | 1 -
plugins/header_rewrite/condition.cc | 2 -
plugins/header_rewrite/condition.h | 3 -
plugins/header_rewrite/conditions.cc | 27 --
plugins/header_rewrite/conditions.h | 22 --
plugins/header_rewrite/expander.h | 2 -
plugins/header_rewrite/factory.cc | 2 -
plugins/header_rewrite/factory.h | 1 -
plugins/header_rewrite/header_rewrite.cc | 9 -
plugins/header_rewrite/header_rewrite_test.cc | 1 -
plugins/header_rewrite/lulu.h | 2 -
plugins/header_rewrite/matcher.h | 4 -
plugins/header_rewrite/operator.h | 5 -
plugins/header_rewrite/operators.cc | 15 --
plugins/header_rewrite/operators.h | 12 -
plugins/header_rewrite/parser.h | 2 -
plugins/header_rewrite/regex_helper.h | 4 -
plugins/header_rewrite/resources.cc | 2 -
plugins/header_rewrite/resources.h | 3 -
plugins/header_rewrite/ruleset.cc | 3 -
plugins/header_rewrite/ruleset.h | 2 -
plugins/header_rewrite/statement.cc | 4 -
plugins/header_rewrite/statement.h | 3 -
plugins/header_rewrite/value.h | 2 -
plugins/regex_remap/regex_remap.cc | 11 +-
plugins/tcpinfo/tcpinfo.cc | 9 +-
proxy/AbstractBuffer.cc | 1 -
proxy/AbstractBuffer.h | 14 +-
proxy/CacheControl.cc | 2 -
proxy/ControlBase.h | 1 -
proxy/ControlMatcher.cc | 3 -
proxy/ControlMatcher.h | 3 -
proxy/CoreUtils.cc | 7 -
proxy/CoreUtils.h | 1 -
proxy/EventName.cc | 4 -
proxy/FetchSM.h | 1 -
proxy/ICP.cc | 2 -
proxy/ICP.h | 11 +-
proxy/ICPConfig.cc | 54 +++-
proxy/ICPProcessor.cc | 1 -
proxy/ICPProcessor.h | 1 -
proxy/ICPStats.cc | 1 -
proxy/ICPlog.h | 1 -
proxy/IPAllow.cc | 1 -
proxy/IPAllow.h | 2 -
proxy/InkAPI.cc | 48 +---
proxy/InkAPIInternal.h | 2 -
proxy/InkAPITest.cc | 223 ++++++++--------
proxy/InkAPITestTool.cc | 17 --
proxy/InkIOCoreAPI.cc | 8 -
proxy/Main.cc | 8 -
proxy/Main.h | 1 -
proxy/Milestones.h | 3 -
proxy/ParentConsistentHash.cc | 1 -
proxy/ParentSelection.cc | 32 ++-
proxy/Plugin.cc | 1 -
proxy/Plugin.h | 1 -
proxy/PluginVC.cc | 3 -
proxy/Prefetch.cc | 34 ++-
proxy/Prefetch.h | 6 -
proxy/ProtocolProbeSessionAccept.h | 1 -
proxy/ProxyClientTransaction.h | 2 -
proxy/ReverseProxy.cc | 1 -
proxy/Show.h | 1 -
proxy/SocksProxy.cc | 5 -
proxy/StatPages.cc | 1 -
proxy/StatPages.h | 1 -
proxy/StufferUdpReceiver.cc | 1 -
proxy/TestClusterHash.cc | 1 -
proxy/TestDNS.cc | 2 -
proxy/TestPreProc.cc | 2 -
proxy/TestPreProc.h | 1 -
proxy/TestProxy.cc | 1 -
proxy/TestSimpleProxy.cc | 1 -
proxy/TimeTrace.h | 1 -
proxy/Transform.cc | 17 --
proxy/Transform.h | 2 -
proxy/TransformInternal.h | 8 -
proxy/UDPAPIClientTest.cc | 2 -
proxy/UDPAPITest.cc | 5 -
proxy/api/ts/InkAPIPrivateIOCore.h | 1 -
proxy/api/ts/experimental.h | 7 -
proxy/api/ts/remap.h | 7 -
proxy/api/ts/ts.h | 30 +--
proxy/congest/Congestion.h | 3 -
proxy/congest/CongestionDB.cc | 2 -
proxy/congest/CongestionDB.h | 3 -
proxy/congest/CongestionTest.cc | 2 -
proxy/congest/MT_hashtable.h | 4 -
proxy/hdrs/HTTP.cc | 9 -
proxy/hdrs/HTTP.h | 46 ++--
proxy/hdrs/HdrHeap.cc | 20 +-
proxy/hdrs/HdrHeap.h | 7 -
proxy/hdrs/HdrTSOnly.cc | 2 -
proxy/hdrs/HdrTest.cc | 56 ++--
proxy/hdrs/HdrToken.cc | 2 -
proxy/hdrs/HdrUtils.cc | 2 -
proxy/hdrs/HdrUtils.h | 2 -
proxy/hdrs/HttpCompat.cc | 4 -
proxy/hdrs/HttpCompat.h | 1 -
proxy/hdrs/MIME.cc | 15 --
proxy/hdrs/MIME.h | 2 -
proxy/hdrs/URL.cc | 6 -
proxy/hdrs/URL.h | 3 -
proxy/hdrs/load_http_hdr.cc | 6 -
proxy/hdrs/test_header.cc | 15 --
proxy/hdrs/test_urlhash.cc | 1 -
proxy/http/Http1ClientSession.h | 2 -
proxy/http/Http1ClientTransaction.h | 1 -
proxy/http/HttpBodyFactory.cc | 16 --
proxy/http/HttpBodyFactory.h | 3 -
proxy/http/HttpCacheSM.cc | 1 -
proxy/http/HttpConfig.cc | 15 +-
proxy/http/HttpConfig.h | 2 -
proxy/http/HttpConnectionCount.cc | 1 -
proxy/http/HttpConnectionCount.h | 3 -
proxy/http/HttpDebugNames.cc | 3 -
proxy/http/HttpPages.cc | 3 -
proxy/http/HttpPages.h | 1 -
proxy/http/HttpSM.cc | 44 +--
proxy/http/HttpSM.h | 1 -
proxy/http/HttpServerSession.cc | 1 -
proxy/http/HttpSessionAccept.cc | 1 -
proxy/http/HttpSessionAccept.h | 1 -
proxy/http/HttpSessionManager.cc | 1 -
proxy/http/HttpSessionManager.h | 3 -
proxy/http/HttpTransact.cc | 47 ----
proxy/http/HttpTransact.h | 4 -
proxy/http/HttpTransactCache.cc | 7 -
proxy/http/HttpTransactCache.h | 7 +-
proxy/http/HttpTransactHeaders.cc | 25 --
proxy/http/HttpTransactHeaders.h | 2 -
proxy/http/HttpTunnel.cc | 4 -
proxy/http/HttpTunnel.h | 2 +-
proxy/http/HttpUpdateSM.cc | 1 -
proxy/http/HttpUpdateSM.h | 1 -
proxy/http/TestHttpTransact.cc | 1 -
proxy/http/TestUrl.cc | 3 -
proxy/http/remap/RemapConfig.cc | 1 -
proxy/http/remap/RemapPluginInfo.cc | 3 -
proxy/http/remap/RemapPluginInfo.h | 2 -
proxy/http/remap/RemapPlugins.h | 2 -
proxy/http/remap/RemapProcessor.h | 2 -
proxy/http/remap/UrlMapping.cc | 5 -
proxy/http/remap/UrlMapping.h | 5 -
proxy/http/remap/UrlMappingPathIndex.h | 11 +-
proxy/http/test_socket_close.cc | 2 -
proxy/http2/HPACK.cc | 2 -
proxy/http2/HPACK.h | 7 -
proxy/http2/HTTP2.cc | 4 +-
proxy/http2/HTTP2.h | 4 -
proxy/http2/Http2ClientSession.h | 1 -
proxy/http2/Http2ConnectionState.cc | 1 -
proxy/http2/Http2Stream.h | 1 -
proxy/http2/HuffmanCodec.cc | 295 +++------------------
proxy/http2/RegressionHPACK.cc | 207 +++++++--------
proxy/http2/test_Huffmancode.cc | 13 +-
proxy/logcat.cc | 1 -
proxy/logging/Log.cc | 37 ++-
proxy/logging/Log.h | 2 -
proxy/logging/LogAccess.cc | 7 -
proxy/logging/LogAccess.h | 4 -
proxy/logging/LogAccessHttp.cc | 12 -
proxy/logging/LogAccessHttp.h | 1 -
proxy/logging/LogAccessICP.h | 1 -
proxy/logging/LogAccessTest.h | 1 -
proxy/logging/LogBuffer.cc | 3 -
proxy/logging/LogBuffer.h | 9 +-
proxy/logging/LogConfig.cc | 41 +--
proxy/logging/LogConfig.h | 1 -
proxy/logging/LogField.cc | 17 +-
proxy/logging/LogField.h | 3 -
proxy/logging/LogFieldAliasMap.h | 5 -
proxy/logging/LogFile.h | 1 -
proxy/logging/LogFilter.cc | 18 +-
proxy/logging/LogFilter.h | 3 -
proxy/logging/LogHost.cc | 4 +-
proxy/logging/LogObject.cc | 27 --
proxy/logging/LogObject.h | 7 +-
proxy/logging/LogSock.h | 1 -
proxy/logging/LogStandalone.cc | 2 -
proxy/logging/LogUtils.cc | 3 -
proxy/logstats.cc | 38 +--
proxy/shared/DiagsConfig.cc | 22 +-
proxy/shared/DiagsConfig.h | 1 -
proxy/shared/Error.cc | 3 +-
proxy/shared/Error.h | 2 -
proxy/shared/InkXml.h | 2 -
proxy/shared/UglyLogStubs.cc | 1 -
proxy/spdy/SpdyClientSession.cc | 9 +-
proxy/spdy/SpdyClientSession.h | 4 +-
proxy/spdy/SpdySessionAccept.h | 1 -
tools/http_load/http_load.c | 22 --
tools/http_load/timers.c | 14 -
tools/jtest/jtest.cc | 2 +-
tools/lighttpd_mod_generator/mod_generator.c | 2 -
691 files changed, 1308 insertions(+), 3488 deletions(-)
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index 034eb5c..c6a1336 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -141,9 +141,7 @@ static void get_admin_user(void);
struct ConfigValue {
ConfigValue() : config_type(RECT_NULL), data_type(RECD_NULL) {}
-
ConfigValue(RecT _t, RecDataT _d, const std::string &_v) : config_type(_t), data_type(_d), data_value(_v) {}
-
RecT config_type;
RecDataT data_type;
std::string data_value;
@@ -201,7 +199,6 @@ cop_log(int priority, const char *format, ...)
va_end(args);
}
-
void
chown_file_to_admin_user(const char *file)
{
@@ -409,7 +406,6 @@ safe_kill(const char *lockfile_name, const char *pname, bool group)
cop_log_trace("Leaving safe_kill(%s, %s, %d)\n", lockfile_name, pname, group);
}
-
// ink_hrtime milliseconds()
//
// Returns the result of gettimeofday converted to
@@ -760,7 +756,6 @@ spawn_manager()
cop_log_trace("Leaving spawn_manager()\n");
}
-
static int
poll_read_or_write(int fd, int timeout, int inorout)
{
@@ -1119,7 +1114,6 @@ read_mgmt_cli_int(const char *variable, int *value)
return 0;
}
-
static int
test_rs_port()
{
@@ -1139,7 +1133,6 @@ test_rs_port()
return 0;
}
-
static int
test_mgmt_cli_port()
{
@@ -1161,7 +1154,6 @@ test_mgmt_cli_port()
return ret;
}
-
static int
test_http_port(int port, char *request, int timeout, char const *ip = NULL, char const *ip_to_bind = NULL)
{
@@ -1344,7 +1336,6 @@ server_up()
}
}
-
// | state | status | action
// --------|---------|----------|---------------
// manager | up | ok | nothing
@@ -1359,7 +1350,6 @@ server_up()
// manager | up | ok | kill server
// server | up | bad |
-
static void
check_programs()
{
@@ -1616,7 +1606,6 @@ check(void *arg)
return arg;
}
-
static void
check_lockfile()
{
diff --git a/cmd/traffic_ctl/traffic_ctl.h b/cmd/traffic_ctl/traffic_ctl.h
index c91c451..daa61c1 100644
--- a/cmd/traffic_ctl/traffic_ctl.h
+++ b/cmd/traffic_ctl/traffic_ctl.h
@@ -66,9 +66,7 @@ int CtrlGenericSubcommand(const char *, const subcommand *cmds, unsigned ncmds,
struct CtrlMgmtRecord {
explicit CtrlMgmtRecord(TSRecordEle *e) : ele(e) {}
-
CtrlMgmtRecord() : ele(TSRecordEleCreate()) {}
-
~CtrlMgmtRecord()
{
if (this->ele) {
@@ -129,7 +127,6 @@ struct RecordListPolicy {
template <typename T> struct CtrlMgmtList {
CtrlMgmtList() : list(TSListCreate()) {}
-
~CtrlMgmtList()
{
this->clear();
@@ -170,7 +167,6 @@ struct CtrlMgmtRecordList : CtrlMgmtList<RecordListPolicy> {
struct CtrlCommandLine {
CtrlCommandLine() { this->args.push_back(NULL); }
-
void
init(unsigned argc, const char **argv)
{
diff --git a/cmd/traffic_layout/traffic_layout.cc b/cmd/traffic_layout/traffic_layout.cc
index f5dabac..064c11b 100644
--- a/cmd/traffic_layout/traffic_layout.cc
+++ b/cmd/traffic_layout/traffic_layout.cc
@@ -45,7 +45,6 @@ const ArgumentDescription argument_descriptions[] = {
HELP_ARGUMENT_DESCRIPTION(),
VERSION_ARGUMENT_DESCRIPTION()};
-
// Produce output about compile time features, useful for checking how things were built, as well
// as for our TSQA test harness.
static void
@@ -124,7 +123,6 @@ produce_features(bool json)
}
}
-
static void
print_var(const char *name, char *value, bool json, bool free = true, bool last = false)
{
diff --git a/cmd/traffic_manager/AddConfigFilesHere.cc b/cmd/traffic_manager/AddConfigFilesHere.cc
index 2cd111c..24e1143 100644
--- a/cmd/traffic_manager/AddConfigFilesHere.cc
+++ b/cmd/traffic_manager/AddConfigFilesHere.cc
@@ -42,7 +42,6 @@ testcall(char *foo, bool /* incVersion */)
Debug("lm", "Received Callback that %s has changed\n", foo);
}
-
//
// initializeRegistry()
//
diff --git a/cmd/traffic_manager/StatProcessor.cc b/cmd/traffic_manager/StatProcessor.cc
index 0e1c84e..7dbcb3d 100644
--- a/cmd/traffic_manager/StatProcessor.cc
+++ b/cmd/traffic_manager/StatProcessor.cc
@@ -65,7 +65,6 @@ xml_strcmp(const xmlchar *s1, const char *s2)
return strcmp((const char *)s1, s2);
}
-
static void
elementStart(void * /* userData ATS_UNUSED */, const xmlchar *name, const xmlchar **atts)
{
@@ -139,7 +138,6 @@ elementStart(void * /* userData ATS_UNUSED */, const xmlchar *name, const xmlcha
}
}
-
static void
elementEnd(void * /* userData ATS_UNUSED */, const xmlchar * /* name ATS_UNUSED */)
{
@@ -159,7 +157,6 @@ elementEnd(void * /* userData ATS_UNUSED */, const xmlchar * /* name ATS_UNUSED
}
}
-
static void
charDataHandler(void * /* userData ATS_UNUSED */, const xmlchar *name, int /* len ATS_UNUSED */)
{
@@ -180,13 +177,11 @@ charDataHandler(void * /* userData ATS_UNUSED */, const xmlchar *name, int /* le
}
}
-
StatProcessor::StatProcessor(FileManager *configFiles) : m_lmgmt(NULL), m_overviewGenerator(NULL)
{
rereadConfig(configFiles);
}
-
void
StatProcessor::rereadConfig(FileManager *configFiles)
{
@@ -257,19 +252,16 @@ StatProcessor::rereadConfig(FileManager *configFiles)
xmlFreeParserCtxt(parser);
#endif
-
delete fileContent;
Debug(MODULE_INIT, "\n\n---------- END OF PARSING & INITIALIZING ---------\n\n");
}
-
StatProcessor::~StatProcessor()
{
Debug(MODULE_INIT, "[StatProcessor] Destructing Statistics Processor\n");
}
-
void
setTest()
{
@@ -288,7 +280,6 @@ setTest()
}
}
-
void
verifyTest()
{
@@ -320,7 +311,6 @@ verifyTest()
}
}
-
/**
* Updating the statistics NOW.
**/
@@ -338,7 +328,6 @@ StatProcessor::processStat()
return (result);
}
-
/**
* ExpressionEval
* --------------
diff --git a/cmd/traffic_manager/StatProcessor.h b/cmd/traffic_manager/StatProcessor.h
index 1b7baa2..966f06c 100644
--- a/cmd/traffic_manager/StatProcessor.h
+++ b/cmd/traffic_manager/StatProcessor.h
@@ -71,7 +71,6 @@ public:
overviewPage *m_overviewGenerator;
};
-
/**
* External expression evaluation API.
*
diff --git a/cmd/traffic_manager/StatType.cc b/cmd/traffic_manager/StatType.cc
index a7516ec..d1505ca 100644
--- a/cmd/traffic_manager/StatType.cc
+++ b/cmd/traffic_manager/StatType.cc
@@ -53,7 +53,6 @@ StatExprToken::StatExprToken()
memset(&m_token_value_delta, 0, sizeof(m_token_value_delta));
}
-
/**
* StatExprToken::copy()
* ---------------------
@@ -84,7 +83,6 @@ StatExprToken::copy(const StatExprToken &source)
m_sum_var = source.m_sum_var;
}
-
/**
* StatExprToken::assignTokenName()
* --------------------------------
@@ -135,7 +133,6 @@ StatExprToken::assignTokenName(const char *name)
}
}
-
/**
* assignTokenType()
* -----------------
@@ -164,7 +161,6 @@ StatExprToken::assignTokenType()
return (m_token_type != RECD_NULL);
}
-
void
StatExprToken::clean()
{
@@ -172,7 +168,6 @@ StatExprToken::clean()
delete m_token_value_delta;
}
-
/**
* FOR DEBUGGING ONLY
* Print the token according to its type in a human-readable format. :)
@@ -187,7 +182,6 @@ StatExprToken::print(const char *prefix)
}
}
-
/**
* StatExprToken::precedence()
* ---------------------------
@@ -214,7 +208,6 @@ StatExprToken::precedence()
}
}
-
/**
* StatExprToken::statVarSet()
* ---------------------------
@@ -280,7 +273,6 @@ StatExprToken::statVarSet(RecDataT type, RecData value)
return varSetData(m_token_type, m_token_name, converted_value);
}
-
/***********************************************************************
StatExprList
**********************************************************************/
@@ -293,7 +285,6 @@ StatExprList::StatExprList() : m_size(0)
{
}
-
/**
* StatExprList::clean()
* ---------------------
@@ -310,7 +301,6 @@ StatExprList::clean()
ink_assert(m_size == 0);
}
-
void
StatExprList::enqueue(StatExprToken *entry)
{
@@ -319,7 +309,6 @@ StatExprList::enqueue(StatExprToken *entry)
m_size += 1;
}
-
void
StatExprList::push(StatExprToken *entry)
{
@@ -328,7 +317,6 @@ StatExprList::push(StatExprToken *entry)
m_size += 1;
}
-
StatExprToken *
StatExprList::dequeue()
{
@@ -339,7 +327,6 @@ StatExprList::dequeue()
return (StatExprToken *)m_tokenList.dequeue();
}
-
StatExprToken *
StatExprList::pop()
{
@@ -350,7 +337,6 @@ StatExprList::pop()
return m_tokenList.pop();
}
-
StatExprToken *
StatExprList::top()
{
@@ -360,7 +346,6 @@ StatExprList::top()
return m_tokenList.head;
}
-
StatExprToken *
StatExprList::first()
{
@@ -370,7 +355,6 @@ StatExprList::first()
return m_tokenList.head;
}
-
StatExprToken *
StatExprList::next(StatExprToken *current)
{
@@ -380,7 +364,6 @@ StatExprList::next(StatExprToken *current)
return (current->link).next;
}
-
/**
* StatExprList::print()
* ---------------------
@@ -394,7 +377,6 @@ StatExprList::print(const char *prefix)
}
}
-
/**
* StatExprToken::count()
* ----------------------
@@ -406,12 +388,10 @@ StatExprList::count()
return m_size;
}
-
/***********************************************************************
StatObject
**********************************************************************/
-
/**
* StatObject::StatObject()
* ------------------------
@@ -424,7 +404,6 @@ StatObject::StatObject()
{
}
-
StatObject::StatObject(unsigned identifier)
: m_id(identifier), m_debug(false), m_expr_string(NULL), m_node_dest(NULL), m_cluster_dest(NULL), m_expression(NULL),
m_postfix(NULL), m_last_update(-1), m_current_time(-1), m_update_interval(-1), m_stats_max(FLT_MAX), m_stats_min(FLT_MIN),
@@ -432,7 +411,6 @@ StatObject::StatObject(unsigned identifier)
{
}
-
/**
* StatObject::clean()
* -------------------
@@ -446,7 +424,6 @@ StatObject::clean()
delete m_postfix;
}
-
/**
* StatObject::assignDst()
* -----------------------
@@ -489,7 +466,6 @@ StatObject::assignDst(const char *str, bool m_node_var, bool m_sum_var)
}
}
-
/**
* StatObject::assignExpr()
* ------------------------
@@ -553,7 +529,6 @@ StatObject::assignExpr(char *str)
infix2postfix();
}
-
/**
* StatObject::infix2postfix()
* ---------------------------
@@ -628,7 +603,6 @@ StatObject::infix2postfix()
m_expression = NULL;
}
-
/**
* StatObject::NodeStatEval()
* --------------------------
@@ -715,7 +689,6 @@ StatObject::NodeStatEval(RecDataT *result_type, bool cluster)
return tempValue;
}
-
/**
* StatObject::ClusterStatEval()
* -----------------------------
@@ -743,7 +716,6 @@ StatObject::ClusterStatEval(RecDataT *result_type)
}
}
-
/**
* StatObject::setTokenValue()
* ---------------------------
@@ -804,7 +776,6 @@ StatObject::setTokenValue(StatExprToken *token, bool cluster)
} // m_token_name?
}
-
/**
* StatObject::StatBinaryEval()
* ------------------------
@@ -934,7 +905,6 @@ StatObject::StatBinaryEval(StatExprToken *left, char op, StatExprToken *right, b
return (result);
}
-
/***********************************************************************
StatObjectList
**********************************************************************/
@@ -943,7 +913,6 @@ StatObjectList::StatObjectList() : m_size(0)
{
}
-
void
StatObjectList::clean()
{
@@ -957,7 +926,6 @@ StatObjectList::clean()
ink_assert(m_size == 0);
}
-
void
StatObjectList::enqueue(StatObject *object)
{
@@ -972,21 +940,18 @@ StatObjectList::enqueue(StatObject *object)
m_size += 1;
}
-
StatObject *
StatObjectList::first()
{
return m_statList.head;
}
-
StatObject *
StatObjectList::next(StatObject *current)
{
return (current->link).next;
}
-
/**
* StatObjectList::Eval()
* ----------------------
@@ -1128,7 +1093,6 @@ StatObjectList::Eval()
return count;
} /* Eval() */
-
/**
* StatObjectList::print()
* --------------------------
diff --git a/cmd/traffic_manager/StatType.h b/cmd/traffic_manager/StatType.h
index 663b63b..04eee9b 100644
--- a/cmd/traffic_manager/StatType.h
+++ b/cmd/traffic_manager/StatType.h
@@ -112,7 +112,6 @@ public:
bool statVarSet(RecDataT, RecData);
};
-
/**
* StatExprList
* simply a list of StatExprToken.
@@ -181,7 +180,6 @@ private:
void infix2postfix();
};
-
/**
* StatObjectList
* simply a list of StatObject.
diff --git a/cmd/traffic_manager/StatXML.cc b/cmd/traffic_manager/StatXML.cc
index bda2005..0a2d7d0 100644
--- a/cmd/traffic_manager/StatXML.cc
+++ b/cmd/traffic_manager/StatXML.cc
@@ -56,7 +56,6 @@ XML_extractContent(const char *name, char *content, size_t result_len)
return (strlen(content));
}
-
//
// Returns true if 'c'is an operator (in our definition),
// false otherwise
diff --git a/cmd/traffic_manager/StatXML.h b/cmd/traffic_manager/StatXML.h
index a7aa3f2..897821b 100644
--- a/cmd/traffic_manager/StatXML.h
+++ b/cmd/traffic_manager/StatXML.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _STATXML_H_
#define _STATXML_H_
diff --git a/cmd/traffic_manager/WebOverview.cc b/cmd/traffic_manager/WebOverview.cc
index 42d4ed8..9eb8b89 100644
--- a/cmd/traffic_manager/WebOverview.cc
+++ b/cmd/traffic_manager/WebOverview.cc
@@ -76,7 +76,6 @@ overviewRecord::overviewRecord(unsigned long inet_addr, bool local, ClusterPeerI
RecGetRecordOrderAndId(node_rec_data.recs[0].name, &node_rec_first_ix, NULL);
}
-
// Query for the name of the node. If it is not there, some
// their cluster ip address
name_l = this->readString("proxy.node.hostname_FQ", &name_found);
@@ -331,7 +330,6 @@ overviewPage::checkForUpdates()
ink_mutex_release(&accessLock);
}
-
// overrviewPage::sortHosts()
//
// resorts sortRecords, but always leaves the local node
@@ -388,7 +386,7 @@ overviewPage::addSelfRecord()
newRec = new overviewRecord(ourAddr, true);
newRec->up = true;
- ink_hash_table_insert(nodeRecords, (InkHashTableKey) this->ourAddr, (InkHashTableEntry *)newRec);
+ ink_hash_table_insert(nodeRecords, (InkHashTableKey)this->ourAddr, (InkHashTableEntry *)newRec);
sortRecords.addEntry(newRec);
numHosts++;
diff --git a/cmd/traffic_manager/metrics.cc b/cmd/traffic_manager/metrics.cc
index 93a9967..8049d3f 100644
--- a/cmd/traffic_manager/metrics.cc
+++ b/cmd/traffic_manager/metrics.cc
@@ -36,7 +36,6 @@
struct Evaluator {
Evaluator() : rec_name(NULL), data_type(RECD_NULL), ref(-1) {}
-
~Evaluator()
{
ats_free(this->rec_name);
@@ -146,7 +145,6 @@ struct EvaluatorList {
ink_hrtime elapsed;
forv_Vec(Evaluator, e, this->evaluators) { e->eval(L); }
-
elapsed = ink_hrtime_diff(ink_get_hrtime_internal(), start);
Debug("lua", "evaluated %u metrics in %fmsec", evaluators.length(), ink_hrtime_to_usec(elapsed) / 1000.0);
}
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index 3754d06..7096874 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -728,7 +728,6 @@ main(int argc, const char **argv)
ink_thread_create(ts_ctrl_main, &mgmtapiFD);
ink_thread_create(event_callback_main, &eventapiFD);
-
ticker = time(NULL);
mgmt_log("[TrafficManager] Setup complete\n");
diff --git a/cmd/traffic_top/stats.h b/cmd/traffic_top/stats.h
index 3241473..a1e2f86 100644
--- a/cmd/traffic_top/stats.h
+++ b/cmd/traffic_top/stats.h
@@ -55,7 +55,6 @@ const char seperator[] = "\": \"";
const char end[] = "\",\n";
};
-
//----------------------------------------------------------------------------
class Stats
{
@@ -116,7 +115,6 @@ public:
lookup_table.insert(make_pair("server_req_conn", LookupItem("Req/Conn", "server_req", "server_conn", 3)));
lookup_table.insert(make_pair("server_curr_conn", LookupItem("Curr Conn", "proxy.process.http.current_server_connections", 1)));
-
lookup_table.insert(
make_pair("client_head", LookupItem("Head Bytes", "proxy.process.http.user_agent_response_header_total_size", 2)));
lookup_table.insert(
@@ -132,7 +130,6 @@ public:
lookup_table.insert(make_pair("ka_total", LookupItem("KA Total", "proxy.process.net.dynamic_keep_alive_timeout_in_total", 2)));
lookup_table.insert(make_pair("ka_count", LookupItem("KA Count", "proxy.process.net.dynamic_keep_alive_timeout_in_count", 2)));
-
lookup_table.insert(make_pair("client_abort", LookupItem("Clnt Abort", "proxy.process.http.err_client_abort_count_stat", 2)));
lookup_table.insert(make_pair("conn_fail", LookupItem("Conn Fail", "proxy.process.http.err_connect_fail_count_stat", 2)));
lookup_table.insert(make_pair("abort", LookupItem("Abort", "proxy.process.http.transaction_counts.errors.aborts", 2)));
@@ -222,7 +219,6 @@ public:
lookup_table.insert(make_pair("s_1m", LookupItem("1 MB", "proxy.process.http.response_document_size_1M", 5)));
lookup_table.insert(make_pair("s_>1m", LookupItem("> 1 MB", "proxy.process.http.response_document_size_inf", 5)));
-
// sum together
lookup_table.insert(make_pair("ram_hit_miss", LookupItem("Ram Hit+Miss", "ram_hit", "ram_miss", 6)));
lookup_table.insert(make_pair("client_net", LookupItem("Net (bits)", "client_head", "client_body", 7)));
@@ -233,7 +229,6 @@ public:
lookup_table.insert(make_pair("server_size", LookupItem("Total Size", "server_head", "server_body", 6)));
lookup_table.insert(make_pair("server_avg_size", LookupItem("Avg Size", "server_size", "server_req", 3)));
-
lookup_table.insert(make_pair("total_time", LookupItem("Total Time", "proxy.process.http.total_transactions_time", 2)));
// ratio
@@ -345,7 +340,6 @@ public:
getStat(key, value, strtmp, typetmp, overrideType);
}
-
void
getStat(const string &key, string &value)
{
diff --git a/cmd/traffic_top/traffic_top.cc b/cmd/traffic_top/traffic_top.cc
index c50140a..64a549c 100644
--- a/cmd/traffic_top/traffic_top.cc
+++ b/cmd/traffic_top/traffic_top.cc
@@ -424,7 +424,6 @@ main(int argc, char **argv)
init_pair(colorPair::border, COLOR_WHITE, COLOR_BLUE);
// mvchgat(0, 0, -1, A_BLINK, 1, NULL);
-
enum Page {
MAIN_PAGE,
RESPONSE_PAGE,
@@ -447,7 +446,6 @@ main(int argc, char **argv)
attroff(COLOR_PAIR(colorPair::border));
attroff(A_BOLD);
-
if (page == MAIN_PAGE) {
main_stats_page(stats);
} else if (page == RESPONSE_PAGE) {
diff --git a/cmd/traffic_via/traffic_via.cc b/cmd/traffic_via/traffic_via.cc
index bbf39af..82b9ad3 100644
--- a/cmd/traffic_via/traffic_via.cc
+++ b/cmd/traffic_via/traffic_via.cc
@@ -44,9 +44,7 @@ static AppVersionInfo appVersionInfo;
struct VIA {
VIA(const char *t) : title(t), next(NULL) { memset(viaData, 0, sizeof(viaData)); }
-
~VIA() { delete next; }
-
const char *title;
const char *viaData[128];
VIA *next;
diff --git a/example/add-header/add-header.c b/example/add-header/add-header.c
index 1783cdc..4647a6e 100644
--- a/example/add-header/add-header.c
+++ b/example/add-header/add-header.c
@@ -96,7 +96,6 @@ add_header(TSHttpTxn txnp, TSCont contp ATS_UNUSED)
field_loc = next_field_loc;
}
-
error:
TSHandleMLocRelease(req_bufp, TS_NULL_MLOC, req_loc);
diff --git a/example/basic-auth/basic-auth.c b/example/basic-auth/basic-auth.c
index 4e6c0b6..8c22472 100644
--- a/example/basic-auth/basic-auth.c
+++ b/example/basic-auth/basic-auth.c
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include <stdio.h>
#include <string.h>
@@ -30,10 +29,8 @@
#include "ts/ts.h"
#include "ts/ink_defs.h"
-
static char base64_codes[256];
-
static char *
base64_decode(const char *input)
{
diff --git a/example/blacklist-1/blacklist-1.c b/example/blacklist-1/blacklist-1.c
index 9226edd..5b178f9 100644
--- a/example/blacklist-1/blacklist-1.c
+++ b/example/blacklist-1/blacklist-1.c
@@ -63,7 +63,6 @@ destroy_continuation(TSHttpTxn txnp, TSCont contp)
return;
}
-
static void
handle_dns(TSHttpTxn txnp, TSCont contp)
{
@@ -303,7 +302,6 @@ handle_txn_start(TSCont contp ATS_UNUSED, TSHttpTxn txnp)
TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
-
void
TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
{
diff --git a/example/cache-scan/cache-scan.cc b/example/cache-scan/cache-scan.cc
index eff1163..998a2fb 100644
--- a/example/cache-scan/cache-scan.cc
+++ b/example/cache-scan/cache-scan.cc
@@ -59,7 +59,6 @@ struct cache_scan_state_t {
typedef struct cache_scan_state_t cache_scan_state;
-
//----------------------------------------------------------------------------
static int
handle_scan(TSCont contp, TSEvent event, void *edata)
@@ -140,14 +139,12 @@ handle_scan(TSCont contp, TSEvent event, void *edata)
TSHandleMLocRelease(req_bufp, req_hdr_loc, url_loc);
TSHandleMLocRelease(req_bufp, TS_NULL_MLOC, req_hdr_loc);
-
// print the response headers
TSCacheHttpInfoRespGet(cache_infop, &resp_bufp, &resp_hdr_loc);
cstate->total_bytes += TSMimeHdrLengthGet(resp_bufp, resp_hdr_loc);
TSMimeHdrPrint(resp_bufp, resp_hdr_loc, cstate->resp_buffer);
TSHandleMLocRelease(resp_bufp, TS_NULL_MLOC, resp_hdr_loc);
-
cstate->total_bytes += TSIOBufferWrite(cstate->resp_buffer, s2, sizeof(s2) - 1);
if (!cstate->write_pending) {
cstate->write_pending = 1;
@@ -300,7 +297,6 @@ handle_io(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
return 0;
}
-
//----------------------------------------------------------------------------
// handler for VConnection and CacheScan events
static int
diff --git a/example/intercept/intercept.cc b/example/intercept/intercept.cc
index c133e9d..e36351d 100644
--- a/example/intercept/intercept.cc
+++ b/example/intercept/intercept.cc
@@ -75,7 +75,6 @@ struct InterceptIOChannel {
TSIOBufferReader reader;
InterceptIOChannel() : vio(NULL), iobuf(NULL), reader(NULL) {}
-
~InterceptIOChannel()
{
if (this->reader) {
@@ -137,7 +136,6 @@ struct InterceptState {
InterceptIO server; // Intercept origin VC state.
InterceptState() : txn(NULL) {}
-
~InterceptState() {}
};
@@ -166,8 +164,8 @@ InterceptProxySide(const InterceptState *istate, const InterceptIO *io)
static const char *
InterceptProxySideVC(const InterceptState *istate, TSVConn vc)
{
- return (istate->client.vc && vc == istate->client.vc) ? "<client>" : (istate->server.vc && vc == istate->server.vc) ? "<server>" :
- "<unknown>";
+ return (istate->client.vc && vc == istate->client.vc) ? "<client>" :
+ (istate->server.vc && vc == istate->server.vc) ? "<server>" : "<unknown>";
}
static bool
diff --git a/example/protocol/Protocol.c b/example/protocol/Protocol.c
index c07ec08..cdf1074 100644
--- a/example/protocol/Protocol.c
+++ b/example/protocol/Protocol.c
@@ -38,7 +38,6 @@ static int server_port;
static void protocol_init(int accept_port, int server_port);
static int accept_handler(TSCont contp, TSEvent event, void *edata);
-
/* When the handle is called, the net_vc is returned. */
static int
accept_handler(TSCont contp, TSEvent event, void *edata)
@@ -117,7 +116,6 @@ TSPluginInit(int argc, const char *argv[])
goto error;
}
-
/* default value */
accept_port = 4666;
server_port = 4666;
diff --git a/example/protocol/Protocol.h b/example/protocol/Protocol.h
index d45efbc..8da3a4a 100644
--- a/example/protocol/Protocol.h
+++ b/example/protocol/Protocol.h
@@ -46,5 +46,4 @@
_d = _s; \
}
-
#endif /* PROTOCOL_H */
diff --git a/example/protocol/TxnSM.c b/example/protocol/TxnSM.c
index 5f723c6..b905c11 100644
--- a/example/protocol/TxnSM.c
+++ b/example/protocol/TxnSM.c
@@ -753,7 +753,6 @@ state_send_response_to_client(TSCont contp, TSEvent event, TSVIO vio)
return TS_SUCCESS;
}
-
/* There is something wrong, abort client, server and cache vc
if they exist. */
int
diff --git a/example/query-remap/query-remap.c b/example/query-remap/query-remap.c
index 262cc61..97ab869 100644
--- a/example/query-remap/query-remap.c
+++ b/example/query-remap/query-remap.c
@@ -41,7 +41,6 @@ typedef struct _query_remap_info {
int num_hosts;
} query_remap_info;
-
int
TSRemapInit(TSRemapInterface *api_info ATS_UNUSED, char *errbuf ATS_UNUSED, int errbuf_size ATS_UNUSED)
{
@@ -50,7 +49,6 @@ TSRemapInit(TSRemapInterface *api_info ATS_UNUSED, char *errbuf ATS_UNUSED, int
return 0;
}
-
int
TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf ATS_UNUSED, int errbuf_size ATS_UNUSED)
{
@@ -110,7 +108,6 @@ TSRemapDeleteInstance(void *ih)
}
}
-
TSRemapStatus
TSRemapDoRemap(void *ih, TSHttpTxn rh ATS_UNUSED, TSRemapRequestInfo *rri)
{
@@ -167,7 +164,6 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh ATS_UNUSED, TSRemapRequestInfo *rri)
return TSREMAP_NO_REMAP;
}
-
/* FNV (Fowler/Noll/Vo) hash
(description: http://www.isthe.com/chongo/tech/comp/fnv/index.html) */
uint32_t
diff --git a/example/redirect-1/redirect-1.c b/example/redirect-1/redirect-1.c
index afedb06..17f54a0 100644
--- a/example/redirect-1/redirect-1.c
+++ b/example/redirect-1/redirect-1.c
@@ -58,7 +58,6 @@ static INKStat method_count_redirected_put;
static INKStat method_count_redirected_trace;
static INKStat method_count_redirected_unknown;
-
/*
* coupled statistics variables:
* coupled stat category for the following stats
@@ -70,14 +69,12 @@ static INKStat requests_all;
static INKStat requests_redirects;
static INKStat requests_unchanged;
-
void update_redirected_method_stats(TSMBuffer bufp, TSMLoc hdr_loc);
static char *url_redirect;
static char *uri_redirect;
static char *block_ip;
-
static void
handle_client_lookup(TSHttpTxn txnp, TSCont contp)
{
@@ -102,7 +99,6 @@ handle_client_lookup(TSHttpTxn txnp, TSCont contp)
*/
local_request_outcomes = INKStatCoupledLocalCopyCreate("local_request_outcomes", request_outcomes);
-
/*
* Create the local copies of the global coupled stats:
*/
@@ -110,7 +106,6 @@ handle_client_lookup(TSHttpTxn txnp, TSCont contp)
local_requests_redirects = INKStatCoupledLocalAdd(local_request_outcomes, "requests.redirects.local", INKSTAT_TYPE_INT64);
local_requests_unchanged = INKStatCoupledLocalAdd(local_request_outcomes, "requests.unchanged.local", INKSTAT_TYPE_INT64);
-
/*
* Increment the count of total requests:
* (it is more natural to treat the number of requests as an
@@ -197,7 +192,6 @@ done:
TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
-
static void
handle_response(TSHttpTxn txnp)
{
@@ -229,12 +223,10 @@ handle_response(TSHttpTxn txnp)
TSHandleMLocRelease(bufp, hdr_loc, newfield_loc);
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
-
done:
TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
-
static int
redirect_plugin(TSCont contp, TSEvent event, void *edata)
{
@@ -258,7 +250,6 @@ redirect_plugin(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
/*
* Global statistics functions:
*/
diff --git a/example/remap/remap.cc b/example/remap/remap.cc
index 5b644c9..ee4ef24 100644
--- a/example/remap/remap.cc
+++ b/example/remap/remap.cc
@@ -29,7 +29,6 @@
# tsxs -i -o remap.so
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -48,7 +47,6 @@
#include "ts/ts.h"
#include "ts/remap.h"
-
class remap_entry
{
public:
@@ -191,7 +189,6 @@ TSRemapDone(void)
fprintf(stderr, "Remap Plugin: TSRemapDone()\n");
}
-
// Plugin new instance for new remapping rule.
// This function can be called multiple times (depends on remap.config)
/* ------------------------ TSRemapNewInstance --------------------------- */
@@ -201,7 +198,6 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf, int errbuf_s
remap_entry *ri;
int i;
-
fprintf(stderr, "Remap Plugin: TSRemapNewInstance()\n");
if (argc < 2) {
diff --git a/example/remap_header_add/remap_header_add.cc b/example/remap_header_add/remap_header_add.cc
index 5e61929..beb79be 100644
--- a/example/remap_header_add/remap_header_add.cc
+++ b/example/remap_header_add/remap_header_add.cc
@@ -47,7 +47,6 @@ struct remap_line {
#define NOWARN_UNUSED __attribute__((unused))
#define EXTERN extern "C"
-
EXTERN void
ParseArgIntoNv(const char *arg, char **n, char **v)
{
@@ -80,14 +79,12 @@ ParseArgIntoNv(const char *arg, char **n, char **v)
TSDebug(TAG, "\t name_len=%zu, val_len=%zu, %s=%s", name_len, val_len, *n, *v);
}
-
TSReturnCode
TSRemapInit(NOWARN_UNUSED TSRemapInterface *api_info, NOWARN_UNUSED char *errbuf, NOWARN_UNUSED int errbuf_size)
{
return TS_SUCCESS;
}
-
TSReturnCode
TSRemapNewInstance(int argc, char *argv[], void **ih, NOWARN_UNUSED char *errbuf, NOWARN_UNUSED int errbuf_size)
{
@@ -121,7 +118,6 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, NOWARN_UNUSED char *errbuf
return TS_SUCCESS;
}
-
void
TSRemapDeleteInstance(void *ih)
{
@@ -140,7 +136,6 @@ TSRemapDeleteInstance(void *ih)
}
}
-
TSRemapStatus
TSRemapDoRemap(void *ih, NOWARN_UNUSED TSHttpTxn txn, NOWARN_UNUSED TSRemapRequestInfo *rri)
{
diff --git a/example/response-header-1/response-header-1.c b/example/response-header-1/response-header-1.c
index 3160639..cc9b7f9 100644
--- a/example/response-header-1/response-header-1.c
+++ b/example/response-header-1/response-header-1.c
@@ -108,7 +108,6 @@ modify_header(TSHttpTxn txnp)
/*********** Unclear why this is needed **************/
TSMimeHdrFieldAppend(resp_bufp, resp_loc, new_field_loc);
-
/* Cache-Control: Public */
TSMimeHdrFieldCreate(resp_bufp, resp_loc, &new_field_loc); /* Probably should check for errors */
TSDebug("resphdr", "Created new resp field with loc %p", new_field_loc);
@@ -162,7 +161,6 @@ modify_header(TSHttpTxn txnp)
}
TSDebug("resphdr", "Header field value is %s, with length %d", chkptr, chklength);
-
/* Get the cached MIME value for this name in this HTTP header */
/*
TSMimeHdrFieldValueUintGet(cached_bufp, cached_loc, cached_field_loc, 0, &num_refreshes);
@@ -208,7 +206,6 @@ modify_header(TSHttpTxn txnp)
/* Caller reneables */
}
-
static int
modify_response_header_plugin(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
{
@@ -256,7 +253,6 @@ TSPluginInit(int argc, const char *argv[])
* basis.
*/
-
hdr_bufp = TSMBufferCreate();
TSMimeHdrCreate(hdr_bufp, &hdr_loc);
@@ -277,7 +273,6 @@ TSPluginInit(int argc, const char *argv[])
TSDebug("resphdr", "init buffer hdr, field and value locs are %p, %p and %p", hdr_loc, field_loc, value_loc);
init_buffer_status = 1;
-
TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK, TSContCreate(modify_response_header_plugin, NULL));
/*
diff --git a/example/session-1/session-1.c b/example/session-1/session-1.c
index bd1e761..aa36bce 100644
--- a/example/session-1/session-1.c
+++ b/example/session-1/session-1.c
@@ -37,7 +37,6 @@ static INKStat transaction_count;
static INKStat session_count;
static INKStat av_transaction;
-
static void
txn_handler(TSHttpTxn txnp, TSCont contp)
{
@@ -48,7 +47,6 @@ txn_handler(TSHttpTxn txnp, TSCont contp)
TSDebug("tag_session", "The number of transactions is %" PRId64, num_txns);
}
-
static void
handle_session(TSHttpSsn ssnp, TSCont contp)
{
diff --git a/example/ssl-preaccept/ssl-preaccept.cc b/example/ssl-preaccept/ssl-preaccept.cc
index 10384ab..189dc36 100644
--- a/example/ssl-preaccept/ssl-preaccept.cc
+++ b/example/ssl-preaccept/ssl-preaccept.cc
@@ -87,7 +87,6 @@ Load_Config_Value(Value const &parent, char const *name, IpRangeQueue &addrs)
}
}
-
int
Load_Config_File()
{
diff --git a/example/ssl-sni/ssl-sni.cc b/example/ssl-sni/ssl-sni.cc
index 55d1dd6..58263f9 100644
--- a/example/ssl-sni/ssl-sni.cc
+++ b/example/ssl-sni/ssl-sni.cc
@@ -25,7 +25,6 @@
limitations under the License.
*/
-
#include <stdio.h>
#include <memory.h>
#include <inttypes.h>
@@ -116,7 +115,6 @@ CB_servername(TSCont /* contp */, TSEvent /* event */, void *edata)
}
}
-
// All done, reactivate things
TSVConnReenable(ssl_vc);
return TS_SUCCESS;
diff --git a/example/thread-1/thread-1.c b/example/thread-1/thread-1.c
index 8431075..2a98344 100644
--- a/example/thread-1/thread-1.c
+++ b/example/thread-1/thread-1.c
@@ -64,7 +64,6 @@ thread_plugin(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
return 0;
}
-
void
TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
{
diff --git a/example/thread-pool/psi.c b/example/thread-pool/psi.c
index 8fd93c9..d9befe7 100644
--- a/example/thread-pool/psi.c
+++ b/example/thread-pool/psi.c
@@ -61,7 +61,6 @@
blocking calls duration, etc... */
#define NB_THREADS 3
-
#define PSI_FILENAME_MAX_SIZE 512
#define PSI_PATH_MAX_SIZE 256
#define PSI_PATH "include"
@@ -85,7 +84,6 @@ typedef enum {
PARSE_EXTRACT,
} ParseState;
-
typedef struct {
unsigned int magic;
TSVIO output_vio;
@@ -104,26 +102,22 @@ typedef struct {
int transform_bytes;
} ContData;
-
typedef struct {
TSCont contp;
TSEvent event;
} TryLockData;
-
typedef enum {
STR_SUCCESS,
STR_PARTIAL,
STR_FAIL,
} StrOperationResult;
-
extern Queue job_queue;
static TSTextLogObject log;
static char psi_directory[PSI_PATH_MAX_SIZE];
-
static int trylock_handler(TSCont contp, TSEvent event, void *edata);
/*-------------------------------------------------------------------------
@@ -160,7 +154,6 @@ cont_data_alloc()
return data;
}
-
/*-------------------------------------------------------------------------
cont_data_destroy
Deallocate ContData structure associated to a transaction
@@ -198,7 +191,6 @@ cont_data_destroy(ContData *data)
}
}
-
/*-------------------------------------------------------------------------
strsearch_ioreader
Looks for string pattern in an iobuffer
@@ -261,7 +253,6 @@ strsearch_ioreader(TSIOBufferReader reader, const char *pattern, int *nparse)
}
}
-
/*-------------------------------------------------------------------------
strextract_ioreader
Extract a string from an iobuffer.
@@ -347,7 +338,6 @@ strextract_ioreader(TSIOBufferReader reader, int offset, const char *end_pattern
}
}
-
/*-------------------------------------------------------------------------
parse_data
Search for psi filename in the data.
@@ -401,7 +391,6 @@ parse_data(TSCont contp, TSIOBufferReader input_reader, int avail, int *toconsum
}
}
-
/* And now let's extract the filename */
status = strextract_ioreader(input_reader, nparse + PSI_START_TAG_LEN, PSI_END_TAG, data->psi_filename, &data->psi_filename_len);
switch (status) {
@@ -584,7 +573,6 @@ wake_up_streams(TSCont contp)
return 1;
}
-
/*-------------------------------------------------------------------------
handle_transform
Get data from upstream vconn.
@@ -697,7 +685,6 @@ handle_transform(TSCont contp)
return 1;
}
-
/*-------------------------------------------------------------------------
dump_psi
Dump the psi_output to the downstream vconnection.
@@ -747,7 +734,6 @@ dump_psi(TSCont contp)
return 0;
}
-
/*-------------------------------------------------------------------------
transform_handler
Handler for all events received during the transformation process
@@ -865,7 +851,6 @@ trylock_handler(TSCont contp, TSEvent event ATS_UNUSED, void *edata ATS_UNUSED)
return 0;
}
-
/*-------------------------------------------------------------------------
transformable
Determine if the current transaction should be transformed or not
@@ -975,7 +960,6 @@ read_response_handler(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
return 0;
}
-
/*-------------------------------------------------------------------------
TSPluginInit
Function called at plugin init time
diff --git a/example/thread-pool/test/SDKTest/psi_server.c b/example/thread-pool/test/SDKTest/psi_server.c
index 15f4c6b..ebced59 100644
--- a/example/thread-pool/test/SDKTest/psi_server.c
+++ b/example/thread-pool/test/SDKTest/psi_server.c
@@ -76,7 +76,6 @@ generate_psibility()
}
}
-
void
TSOptionsProcess(char *option, char *value)
{
@@ -86,7 +85,6 @@ TSOptionsProcess(char *option, char *value)
}
}
-
void
TSPluginInit()
{
diff --git a/example/thread-pool/thread.c b/example/thread-pool/thread.c
index db27906..d49ffbe 100644
--- a/example/thread-pool/thread.c
+++ b/example/thread-pool/thread.c
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include <stdio.h>
#include <pthread.h>
#include "ts/ts.h"
@@ -39,7 +38,6 @@ Queue job_queue;
static pthread_cond_t cond;
static pthread_mutex_t cond_mutex;
-
void
init_queue(Queue *q)
{
diff --git a/example/thread-pool/thread.h b/example/thread-pool/thread.h
index fe127a8..54df3ec 100644
--- a/example/thread-pool/thread.h
+++ b/example/thread-pool/thread.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _THREAD_H_
#define _THREAD_H_
@@ -58,7 +57,6 @@ typedef struct {
TSMutex mutex;
} Queue;
-
/* queue manipulation functions */
void init_queue(Queue *q);
@@ -68,13 +66,11 @@ void *remove_from_queue(Queue *q);
int get_nbelem_queue(Queue *q);
-
/* Job functions */
Job *job_create(TSCont contp, ExecFunc func, void *data);
void job_delete(Job *job);
-
/* thread functions */
void thread_signal_job();
diff --git a/example/version/version.c b/example/version/version.c
index 19e447d..a0a7b50 100644
--- a/example/version/version.c
+++ b/example/version/version.c
@@ -55,7 +55,7 @@ TSPluginInit(int argc, const char *argv[])
// partial compilation
#if (TS_VERSION_NUMBER < 3000000)
if (TSPluginRegister(TS_SDK_VERSION_2_0, &info) != TS_SUCCESS) {
-#elif(TS_VERSION_NUMBER < 6000000)
+#elif (TS_VERSION_NUMBER < 6000000)
if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
#else
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/iocore/aio/AIO.cc b/iocore/aio/AIO.cc
index 3f9f2a8..ad1536d 100644
--- a/iocore/aio/AIO.cc
+++ b/iocore/aio/AIO.cc
@@ -106,7 +106,6 @@ aio_stats_cb(const char * /* name ATS_UNUSED */, RecDataT data_type, RecData *da
return 0;
}
-
#ifdef AIO_STATS
/* total number of requests received - for debugging */
static int num_requests = 0;
@@ -209,7 +208,6 @@ struct AIOThreadInfo : public Continuation {
highest priority first. If both the queues are empty, the aio threads
check if there is any request on the other disks */
-
/* insert an entry for file descriptor fildes into aio_reqs */
static AIO_Reqs *
aio_init_fildes(int fildes, int fromAPI = 0)
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index ae25d10..8d13438 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "P_Cache.h"
// Cache Inspector and State Pages
@@ -55,7 +54,6 @@ static short int const CACHE_DB_MAJOR_VERSION_COMPATIBLE = 21;
RecSetRawStatCount(rsb, x, 0); \
} while (0);
-
// Configuration
int64_t cache_config_ram_cache_size = AUTO_SIZE_RAM_CACHE;
@@ -89,7 +87,6 @@ static int enable_cache_empty_http_doc = 0;
int cache_config_compatibility_4_2_0_fixup = 1;
#endif
-
// Globals
RecRawStatBlock *cache_rsb = NULL;
@@ -937,7 +934,6 @@ CacheProcessor::cacheInitialized()
cacheProcessor.max_stripe_version = v->header->version;
}
-
if (caches_ready) {
Debug("cache_init", "CacheProcessor::cacheInitialized - caches_ready=0x%0X, gnvol=%d", (unsigned int)caches_ready, gnvol);
@@ -974,12 +970,10 @@ CacheProcessor::cacheInitialized()
CACHE_VOL_SUM_DYN_STAT(cache_bytes_total_stat, vol_total_cache_bytes);
-
vol_total_direntries = gvol[i]->buckets * gvol[i]->segments * DIR_DEPTH;
total_direntries += vol_total_direntries;
CACHE_VOL_SUM_DYN_STAT(cache_direntries_total_stat, vol_total_direntries);
-
vol_used_direntries = dir_entries_used(gvol[i]);
CACHE_VOL_SUM_DYN_STAT(cache_direntries_used_stat, vol_used_direntries);
used_direntries += vol_used_direntries;
@@ -1030,7 +1024,6 @@ CacheProcessor::cacheInitialized()
total_direntries += vol_total_direntries;
CACHE_VOL_SUM_DYN_STAT(cache_direntries_total_stat, vol_total_direntries);
-
vol_used_direntries = dir_entries_used(gvol[i]);
CACHE_VOL_SUM_DYN_STAT(cache_direntries_used_stat, vol_used_direntries);
used_direntries += vol_used_direntries;
@@ -1295,7 +1288,6 @@ vol_init_dir(Vol *d)
}
}
-
void
vol_clear_init(Vol *d)
{
@@ -1391,7 +1383,6 @@ Vol::init(char *s, off_t blocks, off_t dir_skip, bool clear)
header = (VolHeaderFooter *)raw_dir;
footer = (VolHeaderFooter *)(raw_dir + vol_dirlen(this) - ROUND_TO_STORE_BLOCK(sizeof(VolHeaderFooter)));
-
if (clear) {
Note("clearing cache directory '%s'", hash_text.get());
return clear_dir();
@@ -1481,10 +1472,8 @@ Vol::handle_dir_read(int event, void *data)
sector_size = header->sector_size;
-
return this->recover_data();
-
return EVENT_CONT;
}
@@ -1867,7 +1856,6 @@ Vol::dir_init_done(int /* event ATS_UNUSED */, void * /* data ATS_UNUSED */)
}
}
-
// explicit pair for random table in build_vol_hash_table
struct rtable_pair {
unsigned int rval; ///< relative value, used to sort.
@@ -2450,7 +2438,6 @@ Ldone:
return handleEvent(AIO_EVENT_DONE, 0);
}
-
int
CacheVC::handleRead(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
@@ -2660,7 +2647,6 @@ CacheVConnection::CacheVConnection() : VConnection(NULL)
{
}
-
void
cplist_init()
{
@@ -2699,7 +2685,6 @@ cplist_init()
}
}
-
void
cplist_update()
{
@@ -2799,7 +2784,6 @@ fillExclusiveDisks(CacheVol *cp)
return diskCount;
}
-
int
cplist_reconfigure()
{
@@ -3193,7 +3177,6 @@ register_cache_stats(RecRawStatBlock *rsb, const char *prefix)
REG_INT("sync.time", cache_directory_sync_time_stat);
}
-
void
ink_cache_init(ModuleVersion v)
{
@@ -3257,7 +3240,6 @@ ink_cache_init(ModuleVersion v)
REC_EstablishStaticConfigInt32(cache_config_compatibility_4_2_0_fixup, "proxy.config.cache.http.compatibility.4-2-0-fixup");
#endif
-
REC_EstablishStaticConfigInt32(cache_config_max_disk_errors, "proxy.config.cache.max_disk_errors");
Debug("cache_init", "proxy.config.cache.max_disk_errors = %d", cache_config_max_disk_errors);
@@ -3300,7 +3282,6 @@ CacheProcessor::open_read(Continuation *cont, const HttpCacheKey *key, bool clus
return caches[type]->open_read(cont, &key->hash, request, params, type, key->hostname, key->hostlen);
}
-
//----------------------------------------------------------------------------
Action *
CacheProcessor::open_write(Continuation *cont, int expected_size, const HttpCacheKey *key, bool cluster_cache_local,
diff --git a/iocore/cache/CacheDir.cc b/iocore/cache/CacheDir.cc
index 17f4348..eb5ab9c 100644
--- a/iocore/cache/CacheDir.cc
+++ b/iocore/cache/CacheDir.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "P_Cache.h"
#include "ts/hugepages.h"
@@ -50,7 +49,6 @@
CACHE_INCREMENT_DYN_STAT(cache_directory_collision_count_stat); \
} while (0);
-
// Globals
ClassAllocator<OpenDirEntry> openDirEntryAllocator("openDirEntry");
@@ -219,7 +217,6 @@ dir_init_segment(int s, Vol *d)
}
}
-
// break the infinite loop in directory entries
// Note : abuse of the token bit in dir entries
int
@@ -378,7 +375,6 @@ dir_clean_vol(Vol *d)
CHECK_DIR(d);
}
-
void
dir_clear_range(off_t start, off_t end, Vol *vol)
{
@@ -813,8 +809,7 @@ dir_lookaside_cleanup(Vol *d)
goto Lagain;
}
b = b->link.next;
- Lagain:
- ;
+ Lagain:;
}
}
}
@@ -922,7 +917,6 @@ sync_cache_dir_on_shutdown(void)
// recompute hit_evacuate_window
d->hit_evacuate_window = (d->data_blocks * cache_config_hit_evacuate_percent) / 100;
-
// check if we have data in the agg buffer
// dont worry about the cachevc s in the agg queue
// directories have not been inserted for these writes
@@ -944,7 +938,6 @@ sync_cache_dir_on_shutdown(void)
d->header->write_serial++;
}
-
if (buflen < dirlen) {
if (buf) {
if (buf_huge)
@@ -989,7 +982,6 @@ sync_cache_dir_on_shutdown(void)
}
}
-
int
CacheSync::mainEvent(int event, Event *e)
{
@@ -1140,7 +1132,6 @@ compare_ushort(void const *a, void const *b)
}
}
-
//
// Check
//
@@ -1449,13 +1440,11 @@ EXCLUSIVE_REGRESSION_TEST(Cache_dir)(RegressionTest *t, int /* atype ATS_UNUSED
if (us)
rprintf(t, "probe rate = %d / second\n", (int)((newfree * (uint64_t)1000000) / us));
-
for (int c = 0; c < vol_direntries(d) * 0.75; c++) {
regress_rand_CacheKey(&key);
dir_insert(&key, d, &dir);
}
-
Dir dir1;
memset(&dir1, 0, sizeof(dir1));
int s1, b1;
@@ -1472,7 +1461,6 @@ EXCLUSIVE_REGRESSION_TEST(Cache_dir)(RegressionTest *t, int /* atype ATS_UNUSED
Dir *last_collision = 0;
dir_probe(&key, d, &dir, &last_collision);
-
rand_CacheKey(&key, thread->mutex);
s1 = key.slice32(0) % d->segments;
b1 = key.slice32(1) % d->buckets;
diff --git a/iocore/cache/CacheDisk.cc b/iocore/cache/CacheDisk.cc
index 9b2c594..7d76b50 100644
--- a/iocore/cache/CacheDisk.cc
+++ b/iocore/cache/CacheDisk.cc
@@ -23,7 +23,6 @@
#include "P_Cache.h"
-
int
CacheDisk::open(char *s, off_t blocks, off_t askip, int ahw_sector_size, int fildes, bool clear)
{
@@ -304,7 +303,6 @@ CacheDisk::create_volume(int number, off_t size_in_blocks, int scheme)
return p;
}
-
int
CacheDisk::delete_volume(int number)
{
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index bbd3f9d..ea56061 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -218,7 +218,6 @@ CacheHostTable::Print()
}
}
-
// void ControlMatcher<Data, Result>::Match(RequestData* rdata
// Result* result)
//
@@ -583,7 +582,6 @@ CacheHostRecord::Print()
{
}
-
void
ConfigVolumes::read_config_file()
{
@@ -806,7 +804,6 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
return;
}
-
/* Test the cache volumeing with different configurations */
#define MEGS_128 (128 * 1024 * 1024)
#define ROUND_TO_VOL_SIZE(_x) (((_x) + (MEGS_128 - 1)) & ~(MEGS_128 - 1))
@@ -1113,7 +1110,6 @@ ClearCacheVolList(Queue<CacheVol> *cpl, int len)
return 1;
}
-
void
save_state()
{
diff --git a/iocore/cache/CacheHttp.cc b/iocore/cache/CacheHttp.cc
index d0d502f..493fba9 100644
--- a/iocore/cache/CacheHttp.cc
+++ b/iocore/cache/CacheHttp.cc
@@ -25,7 +25,6 @@
#include <string.h>
#include "P_Cache.h"
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -68,7 +67,6 @@ CacheHTTPInfoVector::insert(CacheHTTPInfo *info, int index)
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-
void
CacheHTTPInfoVector::detach(int idx, CacheHTTPInfo *r)
{
@@ -223,7 +221,6 @@ CacheHTTPInfoVector::unmarshal(const char *buf, int length, RefCountObj *block_p
return ((caddr_t)buf - (caddr_t)start);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
uint32_t
@@ -278,7 +275,6 @@ CacheHTTPInfoVector::insert(CacheHTTPInfo * /* info ATS_UNUSED */, int index)
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-
void
CacheHTTPInfoVector::detach(int /* idx ATS_UNUSED */, CacheHTTPInfo * /* r ATS_UNUSED */)
{
@@ -338,7 +334,6 @@ CacheHTTPInfoVector::unmarshal(const char * /* buf ATS_UNUSED */, int /* length
return 0;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
uint32_t
diff --git a/iocore/cache/CachePages.cc b/iocore/cache/CachePages.cc
index 91d20eb..a170c6e 100644
--- a/iocore/cache/CachePages.cc
+++ b/iocore/cache/CachePages.cc
@@ -157,7 +157,6 @@ struct ShowCache : public ShowCont {
#define STREQ_PREFIX(_x, _s) (!strncasecmp(_x, _s, sizeof(_s) - 1))
#define STREQ_LEN_PREFIX(_x, _l, _s) (path_len < sizeof(_s) && !strncasecmp(_x, _s, sizeof(_s) - 1))
-
Action *
register_ShowCache(Continuation *c, HTTPHdr *h)
{
@@ -288,7 +287,6 @@ ShowCache::invalidate_regex_form(int event, Event *e)
return complete(event, e);
}
-
int
ShowCache::handleCacheEvent(int event, Event *e)
{
@@ -458,7 +456,6 @@ ShowCache::lookup_url(int event, Event *e)
return EVENT_CONT; // callback pending, will be a cluster read.
}
-
int
ShowCache::delete_url(int event, Event *e)
{
@@ -468,7 +465,6 @@ ShowCache::delete_url(int event, Event *e)
CHECK_SHOW(show("<B><TABLE border=1>\n"));
}
-
if (strcmp(show_cache_urlstrs[urlstrs_index], "") == 0) {
// close the page when you reach the end of the
// url list
@@ -503,7 +499,6 @@ ShowCache::handleCacheDeleteComplete(int event, Event *e)
return delete_url(event, e);
}
-
int
ShowCache::lookup_regex(int event, Event *e)
{
@@ -562,7 +557,6 @@ ShowCache::delete_regex(int event, Event *e)
return EVENT_DONE;
}
-
int
ShowCache::invalidate_regex(int event, Event *e)
{
@@ -574,7 +568,6 @@ ShowCache::invalidate_regex(int event, Event *e)
return EVENT_DONE;
}
-
int
ShowCache::handleCacheScanCallback(int event, Event *e)
{
diff --git a/iocore/cache/CachePagesInternal.cc b/iocore/cache/CachePagesInternal.cc
index 12ea3db..fc840da 100644
--- a/iocore/cache/CachePagesInternal.cc
+++ b/iocore/cache/CachePagesInternal.cc
@@ -32,7 +32,6 @@ struct ShowCacheInternal : public ShowCont {
CacheKey show_cache_key;
CacheVC *cache_vc;
-
int showMain(int event, Event *e);
int showEvacuations(int event, Event *e);
int showVolEvacuations(int event, Event *e);
@@ -55,19 +54,15 @@ struct ShowCacheInternal : public ShowCont {
extern ShowCacheInternal *theshowcacheInternal;
Action *register_ShowCacheInternal(Continuation *c, HTTPHdr *h);
-
extern Vol **gvol;
extern volatile int gnvol;
-
// Stat Pages
ShowCacheInternal *theshowcacheInternal = NULL;
-
#define STREQ_PREFIX(_x, _s) (!strncasecmp(_x, _s, sizeof(_s) - 1))
#define STREQ_LEN_PREFIX(_x, _l, _s) (path_len < sizeof(_s) && !strncasecmp(_x, _s, sizeof(_s) - 1))
-
Action *
register_ShowCacheInternal(Continuation *c, HTTPHdr *h)
{
@@ -97,7 +92,6 @@ register_ShowCacheInternal(Continuation *c, HTTPHdr *h)
return &theshowcacheInternal->action;
}
-
int
ShowCacheInternal::showMain(int event, Event *e)
{
@@ -132,7 +126,6 @@ ShowCacheInternal::showConnections(int event, Event *e)
CONT_SCHED_LOCK_RETRY_RET(this);
}
-
int
ShowCacheInternal::showVolConnections(int event, Event *e)
{
@@ -185,7 +178,6 @@ ShowCacheInternal::showVolConnections(int event, Event *e)
#endif
-
int
ShowCacheInternal::showEvacuations(int event, Event *e)
{
@@ -202,7 +194,6 @@ ShowCacheInternal::showEvacuations(int event, Event *e)
CONT_SCHED_LOCK_RETRY_RET(this);
}
-
int
ShowCacheInternal::showVolEvacuations(int event, Event *e)
{
@@ -259,7 +250,6 @@ ShowCacheInternal::showVolumes(int event, Event *e)
CONT_SCHED_LOCK_RETRY_RET(this);
}
-
int
ShowCacheInternal::showVolVolumes(int event, Event *e)
{
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index 8304a9a..3e98ba9 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -1046,9 +1046,10 @@ CacheVC::openReadStartHead(int event, Event *e)
"- vector n=%d size=%d"
"first alt=%d[%s]",
key.slice32(0), uml, doc->hlen, doc->len, sizeofDoc, doc->v_major, doc->v_minor, vector.count(), alt_length,
- alt->m_magic, (CACHE_ALT_MAGIC_ALIVE == alt->m_magic ? "alive" : CACHE_ALT_MAGIC_MARSHALED == alt->m_magic ?
- "serial" :
- CACHE_ALT_MAGIC_DEAD == alt->m_magic ? "dead" : "bogus"));
+ alt->m_magic,
+ (CACHE_ALT_MAGIC_ALIVE == alt->m_magic ?
+ "alive" :
+ CACHE_ALT_MAGIC_MARSHALED == alt->m_magic ? "serial" : CACHE_ALT_MAGIC_DEAD == alt->m_magic ? "dead" : "bogus"));
dir_delete(&key, vol, &dir);
}
err = ECACHE_BAD_META_DATA;
diff --git a/iocore/cache/CacheTest.cc b/iocore/cache/CacheTest.cc
index c435a9c..c376baf 100644
--- a/iocore/cache/CacheTest.cc
+++ b/iocore/cache/CacheTest.cc
@@ -515,7 +515,7 @@ test_RamCache(RegressionTest *t, RamCache *cache, const char *name, int64_t cach
bool pass = true;
CacheKey key;
Vol *vol = theCache->key_to_vol(&key, "example.com", sizeof("example.com") - 1);
- vector<Ptr<IOBufferData> > data;
+ vector<Ptr<IOBufferData>> data;
cache->init(cache_size, vol);
diff --git a/iocore/cache/CacheVol.cc b/iocore/cache/CacheVol.cc
index f9047f3..b308bfe 100644
--- a/iocore/cache/CacheVol.cc
+++ b/iocore/cache/CacheVol.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "P_Cache.h"
#define SCAN_BUF_SIZE RECOVERY_SIZE
@@ -321,8 +320,7 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
}
}
continue;
- Lskip:
- ;
+ Lskip:;
#endif
}
#ifdef HTTP_CACHE
diff --git a/iocore/cache/CacheWrite.cc b/iocore/cache/CacheWrite.cc
index bb3676a..dfb927c 100644
--- a/iocore/cache/CacheWrite.cc
+++ b/iocore/cache/CacheWrite.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "P_Cache.h"
#define IS_POWER_2(_x) (!((_x) & ((_x)-1)))
@@ -710,7 +709,6 @@ Vol::evac_range(off_t low, off_t high, int evac_phase)
return 0;
}
-
static int
agg_copy(char *p, CacheVC *vc)
{
diff --git a/iocore/cache/I_CacheDefs.h b/iocore/cache/I_CacheDefs.h
index af12ec9..38ad84f 100644
--- a/iocore/cache/I_CacheDefs.h
+++ b/iocore/cache/I_CacheDefs.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _I_CACHE_DEFS_H__
#define _I_CACHE_DEFS_H__
diff --git a/iocore/cache/I_Store.h b/iocore/cache/I_Store.h
index 3a11bf3..ee45ffc 100644
--- a/iocore/cache/I_Store.h
+++ b/iocore/cache/I_Store.h
@@ -50,9 +50,17 @@ enum span_error_t {
struct span_diskid_t {
int64_t id[2];
- bool operator<(const span_diskid_t &rhs) const { return id[0] < rhs.id[0] && id[1] < rhs.id[1]; }
+ bool
+ operator<(const span_diskid_t &rhs) const
+ {
+ return id[0] < rhs.id[0] && id[1] < rhs.id[1];
+ }
- bool operator==(const span_diskid_t &rhs) const { return id[0] == rhs.id[0] && id[1] == rhs.id[1]; }
+ bool
+ operator==(const span_diskid_t &rhs) const
+ {
+ return id[0] == rhs.id[0] && id[1] == rhs.id[1];
+ }
int64_t &operator[](unsigned i) { return id[i]; }
};
diff --git a/iocore/cache/P_CacheArray.h b/iocore/cache/P_CacheArray.h
index 69a1feb..869906e 100644
--- a/iocore/cache/P_CacheArray.h
+++ b/iocore/cache/P_CacheArray.h
@@ -26,7 +26,6 @@
#define FAST_DATA_SIZE 4
-
template <class T> struct CacheArray {
CacheArray(const T *val, int initial_size = 0);
~CacheArray();
@@ -53,7 +52,6 @@ template <class T> struct CacheArray {
int pos;
};
-
template <class T>
TS_INLINE
CacheArray<T>::CacheArray(const T *val, int initial_size)
@@ -93,7 +91,9 @@ template <class T> TS_INLINE T &CacheArray<T>::operator[](int idx)
return data[idx];
}
-template <class T> TS_INLINE T &CacheArray<T>::operator()(int idx)
+template <class T>
+TS_INLINE T &
+CacheArray<T>::operator()(int idx)
{
if (idx >= size) {
int new_size;
@@ -184,5 +184,4 @@ CacheArray<T>::resize(int new_size)
}
}
-
#endif /* __CACHE_ARRAY_H__ */
diff --git a/iocore/cache/P_CacheBC.h b/iocore/cache/P_CacheBC.h
index 2164692..5a19ce3 100644
--- a/iocore/cache/P_CacheBC.h
+++ b/iocore/cache/P_CacheBC.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _P_CACHE_BC_H__
#define _P_CACHE_BC_H__
@@ -137,7 +136,6 @@ Doc_v23::hdr()
return reinterpret_cast<char *>(this) + sizeofDoc_v23;
}
-
} // namespace cache_bc
#endif /* _P_CACHE_BC_H__ */
diff --git a/iocore/cache/P_CacheDir.h b/iocore/cache/P_CacheDir.h
index c128537..57b6ad7 100644
--- a/iocore/cache/P_CacheDir.h
+++ b/iocore/cache/P_CacheDir.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _P_CACHE_DIR_H__
#define _P_CACHE_DIR_H__
diff --git a/iocore/cache/P_CacheDisk.h b/iocore/cache/P_CacheDisk.h
index 7b470a7..63a6edb 100644
--- a/iocore/cache/P_CacheDisk.h
+++ b/iocore/cache/P_CacheDisk.h
@@ -126,5 +126,4 @@ struct CacheDisk : public Continuation {
DiskVol *get_diskvol(int vol_number);
};
-
#endif
diff --git a/iocore/cache/P_CacheHosting.h b/iocore/cache/P_CacheHosting.h
index 21d2b1a..5cb025b 100644
--- a/iocore/cache/P_CacheHosting.h
+++ b/iocore/cache/P_CacheHosting.h
@@ -69,7 +69,6 @@ struct CacheHostResult {
CacheHostResult() : record(NULL) {}
};
-
class CacheHostMatcher
{
public:
@@ -169,7 +168,6 @@ struct CacheHostTableConfig : public Continuation {
}
};
-
/* list of volumes in the volume.config file */
struct ConfigVol {
int number;
diff --git a/iocore/cache/P_CacheHttp.h b/iocore/cache/P_CacheHttp.h
index c5bf87e..c9484dd 100644
--- a/iocore/cache/P_CacheHttp.h
+++ b/iocore/cache/P_CacheHttp.h
@@ -29,12 +29,10 @@
#include "HTTP.h"
#include "URL.h"
-
typedef URL CacheURL;
typedef HTTPHdr CacheHTTPHdr;
typedef HTTPInfo CacheHTTPInfo;
-
#define OFFSET_BITS 24
enum {
OWNER_NONE = 0,
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index 922190e..22f6b0c 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _P_CACHE_INTERNAL_H__
#define _P_CACHE_INTERNAL_H__
@@ -70,7 +69,6 @@ struct EvacuationBlock;
CACHE_MUTEX_RELEASE(_l)
#endif
-
#define VC_LOCK_RETRY_EVENT() \
do { \
trigger = mutex->thread_holding->schedule_in_local(this, HRTIME_MSECONDS(cache_config_mutex_retry_delay), event); \
@@ -102,7 +100,6 @@ struct EvacuationBlock;
return EVENT_CONT; \
} while (0)
-
// cache stats definitions
enum {
cache_bytes_used_stat,
@@ -156,7 +153,6 @@ enum {
cache_stat_count
};
-
extern RecRawStatBlock *cache_rsb;
#define GLOBAL_CACHE_SET_DYN_STAT(x, y) RecSetGlobalRawStatSum(cache_rsb, (x), (y))
@@ -525,7 +521,6 @@ struct CacheRemoveCont : public Continuation {
CacheRemoveCont() : Continuation(NULL) {}
};
-
// Global Data
extern ClassAllocator<CacheVC> cacheVConnectionAllocator;
extern CacheKey zero_key;
diff --git a/iocore/cache/P_CacheVol.h b/iocore/cache/P_CacheVol.h
index 10eddc6..9009d80 100644
--- a/iocore/cache/P_CacheVol.h
+++ b/iocore/cache/P_CacheVol.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _P_CACHE_VOL_H__
#define _P_CACHE_VOL_H__
@@ -56,7 +55,6 @@
#define AUTO_SIZE_RAM_CACHE -1 // 1-1 with directory size
#define DEFAULT_TARGET_FRAGMENT_SIZE (1048576 - sizeofDoc) // 1MB
-
#define dir_offset_evac_bucket(_o) (_o / (EVACUATION_BUCKET_SIZE / CACHE_BLOCK_SIZE))
#define dir_evac_bucket(_e) dir_offset_evac_bucket(dir_offset(_e))
#define offset_evac_bucket(_d, _o) \
@@ -70,7 +68,6 @@
#define sizeofDoc (((uint32_t)(uintptr_t) & ((Doc *)0)->checksum) + (uint32_t)sizeof(uint32_t))
-
struct Cache;
struct Vol;
struct CacheDisk;
@@ -123,7 +120,6 @@ struct EvacuationBlock {
LINK(EvacuationBlock, link);
};
-
struct Vol : public Continuation {
char *path;
ats_scoped_str hash_text;
@@ -179,7 +175,6 @@ struct Vol : public Continuation {
int64_t first_fragment_offset;
Ptr<IOBufferData> first_fragment_data;
-
void cancel_trigger();
int recover_data();
@@ -207,7 +202,6 @@ struct Vol : public Continuation {
int handle_recover_write_dir(int event, void *data);
int handle_header_read(int event, void *data);
-
int dir_init_done(int event, void *data);
int dir_check(bool fix);
diff --git a/iocore/cache/RamCacheCLFUS.cc b/iocore/cache/RamCacheCLFUS.cc
index 1d9fa11..f78d7f2 100644
--- a/iocore/cache/RamCacheCLFUS.cc
+++ b/iocore/cache/RamCacheCLFUS.cc
@@ -520,8 +520,7 @@ RamCacheCLFUS::compress_entries(EThread *thread, int do_at_most)
Lfailed:
ats_free(b);
e->flag_bits.incompressible = 1;
- Lcontinue:
- ;
+ Lcontinue:;
DDebug("ram_cache", "compress %X %d %d %d %d %d %d %d", e->key.slice32(3), e->auxkey1, e->auxkey2, e->flag_bits.incompressible,
e->flag_bits.compressed, e->len, e->compressed_len, ncompressed);
if (!e->lru_link.next)
diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc
index 1fd7aea..9164a7a 100644
--- a/iocore/cache/Store.cc
+++ b/iocore/cache/Store.cc
@@ -93,7 +93,6 @@ Store::add(Store &s)
s.delete_all();
}
-
// should be changed to handle offset in more general
// case (where this is not a free of a "just" allocated
// store
@@ -111,8 +110,7 @@ Store::free(Store &s)
goto Lfound;
}
ink_release_assert(!"Store::free failed");
- Lfound:
- ;
+ Lfound:;
}
}
}
@@ -141,8 +139,7 @@ Store::sort()
}
}
disk[n++] = sd;
- Ldone:
- ;
+ Ldone:;
}
}
n_disks = n;
@@ -434,7 +431,6 @@ Lfail:
return err;
}
-
int
Store::write_config_data(int fd) const
{
@@ -587,7 +583,6 @@ fail:
return Span::errorstr(serr);
}
-
void
Store::normalize()
{
@@ -706,8 +701,7 @@ Store::try_realloc(Store &s, Store &diff)
sd = prev ? prev->link.next : s.disk[i];
continue;
}
- Lfound:
- ;
+ Lfound:;
prev = sd;
sd = sd->link.next;
}
diff --git a/iocore/cluster/ClusterAPI.cc b/iocore/cluster/ClusterAPI.cc
index 7c08330..599bd9f 100644
--- a/iocore/cluster/ClusterAPI.cc
+++ b/iocore/cluster/ClusterAPI.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterAPI.cc
diff --git a/iocore/cluster/ClusterCache.cc b/iocore/cluster/ClusterCache.cc
index 3ff9e53..bf3b659 100644
--- a/iocore/cluster/ClusterCache.cc
+++ b/iocore/cluster/ClusterCache.cc
@@ -1561,7 +1561,6 @@ CacheContinuation::replyOpEvent(int event, VConnection *cvc)
ink_release_assert(expect_cache_callback);
expect_cache_callback = false; // make sure we are called back exactly once
-
result = event;
bool open = event_is_open(event);
bool read_op = op_is_read(request_opcode);
@@ -2379,7 +2378,6 @@ CacheContinuation::lookupEvent(int /* event ATS_UNUSED */, void * /* d ATS_UNUSE
return EVENT_DONE;
}
-
//////////////////////////////////////////////////////////////////////////
// do_remote_lookup()
// If the object is supposed to be on a remote machine, probe there.
@@ -2396,7 +2394,6 @@ CacheContinuation::do_remote_lookup(Continuation *cont, const CacheKey *key, Cac
CacheLookupMsg *msg = (CacheLookupMsg *)ALLOCA_DOUBLE(mlen);
msg->init();
-
if (key) {
msg->url_md5 = *key;
} else {
@@ -2496,7 +2493,6 @@ CacheContinuation::do_remote_lookup(Continuation *cont, const CacheKey *key, Cac
return &c->action;
}
-
////////////////////////////////////////////////////////////////////////////
// cache_lookup_ClusterFunction()
// This function is invoked on a remote machine to do a remote lookup.
@@ -2725,7 +2721,6 @@ CacheContinuation::cacheContAllocator_alloc()
return cacheContAllocator.alloc();
}
-
///////////////////////////////////////////////////////////////////////
// cacheContAllocator_free()
///////////////////////////////////////////////////////////////////////
@@ -2830,7 +2825,6 @@ new_cache_sequence_number()
res = (unsigned int)ink_atomic_increment(&cluster_sequence_number, 1);
} while (!res);
-
return res;
}
diff --git a/iocore/cluster/ClusterConfig.cc b/iocore/cluster/ClusterConfig.cc
index 16e5278..8819546 100644
--- a/iocore/cluster/ClusterConfig.cc
+++ b/iocore/cluster/ClusterConfig.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterConfig.cc
diff --git a/iocore/cluster/ClusterHandler.cc b/iocore/cluster/ClusterHandler.cc
index 6e28916..b33229e 100644
--- a/iocore/cluster/ClusterHandler.cc
+++ b/iocore/cluster/ClusterHandler.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterHandler.cc
@@ -2317,7 +2316,6 @@ ClusterHandler::build_poll(bool next)
extern int CacheClusterMonitorEnabled;
extern int CacheClusterMonitorIntervalSecs;
-
//
// The main event for machine-machine link
//
diff --git a/iocore/cluster/ClusterHandlerBase.cc b/iocore/cluster/ClusterHandlerBase.cc
index d116af0..723b155 100644
--- a/iocore/cluster/ClusterHandlerBase.cc
+++ b/iocore/cluster/ClusterHandlerBase.cc
@@ -35,7 +35,6 @@ extern uint32_t cluster_packet_mark;
extern uint32_t cluster_packet_tos;
extern int num_of_cluster_threads;
-
///////////////////////////////////////////////////////////////
// Incoming message continuation for periodic callout threads
///////////////////////////////////////////////////////////////
diff --git a/iocore/cluster/ClusterHash.cc b/iocore/cluster/ClusterHash.cc
index b171f98..ea2d583 100644
--- a/iocore/cluster/ClusterHash.cc
+++ b/iocore/cluster/ClusterHash.cc
@@ -52,14 +52,12 @@ bool randClusterHash = false;
// bool boundClusterHash = true;
// bool randClusterHash = true;
-
//
// Cluster Hash Table
//
// see Memo.ClusterHash for details
//
-
//
// Linear Congruence Random number generator
diff --git a/iocore/cluster/ClusterLib.cc b/iocore/cluster/ClusterLib.cc
index 37360fc..cd24208 100644
--- a/iocore/cluster/ClusterLib.cc
+++ b/iocore/cluster/ClusterLib.cc
@@ -196,7 +196,6 @@ bytes_IOBufferBlockList(IOBufferBlock *b, int64_t read_avail_bytes)
return n;
}
-
//////////////////////////////////////////////////////
// Miscellaneous test code
//////////////////////////////////////////////////////
diff --git a/iocore/cluster/ClusterLoadMonitor.cc b/iocore/cluster/ClusterLoadMonitor.cc
index 19ab500..4c0020d 100644
--- a/iocore/cluster/ClusterLoadMonitor.cc
+++ b/iocore/cluster/ClusterLoadMonitor.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterLoadMonitor.cc
diff --git a/iocore/cluster/ClusterProcessor.cc b/iocore/cluster/ClusterProcessor.cc
index 65007a0..e8655b6 100644
--- a/iocore/cluster/ClusterProcessor.cc
+++ b/iocore/cluster/ClusterProcessor.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterProcessor.cc
diff --git a/iocore/cluster/ClusterRPC.cc b/iocore/cluster/ClusterRPC.cc
index 40632c5..8ae28c8 100644
--- a/iocore/cluster/ClusterRPC.cc
+++ b/iocore/cluster/ClusterRPC.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterRPC.cc
@@ -87,8 +86,7 @@ machine_list_ClusterFunction(ClusterHandler *from, void *data, int len)
clusterProcessor.connect(m->ip[i], k);
}
}
- Lfound:
- ;
+ Lfound:;
}
}
diff --git a/iocore/cluster/ClusterVConnection.cc b/iocore/cluster/ClusterVConnection.cc
index 7a3185e..8e8b09a 100644
--- a/iocore/cluster/ClusterVConnection.cc
+++ b/iocore/cluster/ClusterVConnection.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterVConnection.cc
diff --git a/iocore/cluster/P_Cluster.h b/iocore/cluster/P_Cluster.h
index 555064a..4bd0b72 100644
--- a/iocore/cluster/P_Cluster.h
+++ b/iocore/cluster/P_Cluster.h
@@ -46,7 +46,6 @@
#include "P_ClusterLoadMonitor.h"
#include "P_TimeTrace.h"
-
#define ECLUSTER_NO_VC (CLUSTER_ERRNO + 0)
#define ECLUSTER_NO_MACHINE (CLUSTER_ERRNO + 1)
#define ECLUSTER_OP_TIMEOUT (CLUSTER_ERRNO + 2)
@@ -133,5 +132,4 @@ extern RecRawStatBlock *cluster_rsb;
RecSetRawStatCount(cluster_rsb, x, 0); \
} while (0);
-
#endif
diff --git a/iocore/cluster/P_ClusterCache.h b/iocore/cluster/P_ClusterCache.h
index 37f49e1..06b6afa 100644
--- a/iocore/cluster/P_ClusterCache.h
+++ b/iocore/cluster/P_ClusterCache.h
@@ -69,7 +69,6 @@
#define MIN_CLUSTER_MAJOR_VERSION CLUSTER_MAJOR_VERSION
#define MIN_CLUSTER_MINOR_VERSION CLUSTER_MINOR_VERSION
-
#define DEFAULT_CLUSTER_PORT_NUMBER 0
#define DEFAULT_NUMBER_OF_CLUSTER_THREADS 1
#define DEFAULT_CLUSTER_HOST ""
@@ -85,14 +84,12 @@
// after zombie the configuration is deleted
#define CLUSTER_CONFIGURATION_ZOMBIE (HRTIME_DAY * 2)
-
// the number of configurations into the past we probe for data
// one allows a new machine to come into or fall out of the
// cluster without loss of data. If the data is redistributed within
// one day, no data will be lost.
#define CONFIGURATION_HISTORY_PROBE_DEPTH 1
-
// move these to a central event definition file (Event.h)
#define CLUSTER_EVENT_CHANGE (CLUSTER_EVENT_EVENTS_START)
#define CLUSTER_EVENT_CONFIGURATION (CLUSTER_EVENT_EVENTS_START + 1)
@@ -1175,5 +1172,4 @@ ClusterVC_remove_write(ClusterVConnectionBase *vc)
cs->queue = NULL;
}
-
#endif /* _Cluster_h */
diff --git a/iocore/cluster/P_ClusterCacheInternal.h b/iocore/cluster/P_ClusterCacheInternal.h
index bba6f17..62b665a 100644
--- a/iocore/cluster/P_ClusterCacheInternal.h
+++ b/iocore/cluster/P_ClusterCacheInternal.h
@@ -52,7 +52,6 @@
#define ALIGN_DOUBLE(_p) ((((uintptr_t)(_p)) + 7) & ~7)
#define ALLOCA_DOUBLE(_sz) ALIGN_DOUBLE(alloca((_sz) + 8))
-
//
// Testing
//
@@ -193,7 +192,6 @@ struct CacheContinuation : public Continuation {
int tunnelClosedEvent(int event, void *);
int remove_and_delete(int, Event *);
-
inline void
setMsgBufferLen(int l, IOBufferData *b = 0)
{
diff --git a/iocore/cluster/P_ClusterHandler.h b/iocore/cluster/P_ClusterHandler.h
index c6461ed..c713124 100644
--- a/iocore/cluster/P_ClusterHandler.h
+++ b/iocore/cluster/P_ClusterHandler.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterHandler.h
@@ -30,7 +29,6 @@
#ifndef _P_ClusterHandler_h
#define _P_ClusterHandler_h
-
class ClusterLoadMonitor;
struct ClusterCalloutContinuation;
@@ -361,7 +359,6 @@ struct ClusterState : public Continuation {
class MIOBuffer *mbuf;
int state; // See enum defs below
-
enum {
READ_START = 1,
READ_HEADER,
diff --git a/iocore/cluster/P_ClusterInternal.h b/iocore/cluster/P_ClusterInternal.h
index b672972..844934f 100644
--- a/iocore/cluster/P_ClusterInternal.h
+++ b/iocore/cluster/P_ClusterInternal.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterInternal.h
@@ -38,7 +37,6 @@
#define CLUSTER_TOMCAT 1
#define CLUSTER_STATS 1
-
#define ALIGN_DOUBLE(_p) ((((uintptr_t)(_p)) + 7) & ~7)
#define ALLOCA_DOUBLE(_sz) ALIGN_DOUBLE(alloca((_sz) + 8))
diff --git a/iocore/cluster/P_ClusterLoadMonitor.h b/iocore/cluster/P_ClusterLoadMonitor.h
index 60452bc..c499c07 100644
--- a/iocore/cluster/P_ClusterLoadMonitor.h
+++ b/iocore/cluster/P_ClusterLoadMonitor.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ClusterLoadMonitor.h
diff --git a/iocore/cluster/P_ClusterMachine.h b/iocore/cluster/P_ClusterMachine.h
index c98c794..2696b9b 100644
--- a/iocore/cluster/P_ClusterMachine.h
+++ b/iocore/cluster/P_ClusterMachine.h
@@ -26,7 +26,6 @@
Machine.h
****************************************************************************/
-
//
// The Machine is the set of processes which share part of an
// address space.
@@ -41,7 +40,6 @@
//
#define MACHINE_TIMEOUT (HRTIME_DAY * 2)
-
//
// This is the time processors should delay before freeing up resouces
// which are shared with other threads in non-long running operations.
@@ -130,5 +128,4 @@ extern ProxyMutex *the_cluster_config_mutex;
extern MachineList *machines_config;
extern MachineList *cluster_config;
-
#endif /* _Machine_h */
diff --git a/iocore/cluster/P_TimeTrace.h b/iocore/cluster/P_TimeTrace.h
index e92a7f8..a4412e8 100644
--- a/iocore/cluster/P_TimeTrace.h
+++ b/iocore/cluster/P_TimeTrace.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
TimeTrace.h
diff --git a/iocore/dns/DNS.cc b/iocore/dns/DNS.cc
index 1cb5698..f024801 100644
--- a/iocore/dns/DNS.cc
+++ b/iocore/dns/DNS.cc
@@ -77,7 +77,6 @@ ClassAllocator<DNSEntry> dnsEntryAllocator("dnsEntryAllocator");
// We could page align this buffer to enable page flipping for recv...
ClassAllocator<HostEnt> dnsBufAllocator("dnsBufAllocator", 2);
-
//
// Function Prototypes
//
@@ -603,7 +602,6 @@ DNSHandler::try_primary_named(bool reopen)
}
}
-
void
DNSHandler::switch_named(int ndx)
{
@@ -722,7 +720,6 @@ good_rcode(char *buff)
return NOERROR == r || NXDOMAIN == r;
}
-
void
DNSHandler::recv_dns(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
@@ -852,8 +849,7 @@ get_dns(DNSHandler *h, uint16_t id)
}
}
}
- Lnext:
- ;
+ Lnext:;
}
return NULL;
}
@@ -1016,7 +1012,6 @@ write_dns_event(DNSHandler *h, DNSEntry *e)
return true;
}
-
int
DNSEntry::delayEvent(int event, Event *e)
{
@@ -1593,14 +1588,12 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
return server_ok;
}
}
-Lerror:
- ;
+Lerror:;
DNS_INCREMENT_DYN_STAT(dns_lookup_fail_stat);
dns_result(handler, e, NULL, retry);
return server_ok;
}
-
RecRawStatBlock *dns_rsb;
void
@@ -1650,7 +1643,6 @@ ink_dns_init(ModuleVersion v)
RecRawStatSyncSum);
}
-
#ifdef TS_HAS_TESTS
struct DNSRegressionContinuation;
typedef int (DNSRegressionContinuation::*DNSRegContHandler)(int, void *);
diff --git a/iocore/dns/DNSConnection.cc b/iocore/dns/DNSConnection.cc
index bba1fe0..ef96139 100644
--- a/iocore/dns/DNSConnection.cc
+++ b/iocore/dns/DNSConnection.cc
@@ -47,7 +47,7 @@ DNSConnection::Options const DNSConnection::DEFAULT_OPTIONS;
// Functions
//
-DNSConnection::DNSConnection() : fd(NO_FD), num(0), generator((uint32_t)((uintptr_t)time(NULL) ^ (uintptr_t) this)), handler(NULL)
+DNSConnection::DNSConnection() : fd(NO_FD), num(0), generator((uint32_t)((uintptr_t)time(NULL) ^ (uintptr_t)this)), handler(NULL)
{
memset(&ip, 0, sizeof(ip));
}
@@ -147,8 +147,7 @@ DNSConnection::connect(sockaddr const *addr, Options const &opt)
goto Lok;
}
Warning("unable to bind random DNS port");
- Lok:
- ;
+ Lok:;
} else if (ats_is_ip(&bind_addr.sa)) {
ip_text_buffer b;
res = socketManager.ink_bind(fd, &bind_addr.sa, bind_size, Proto);
diff --git a/iocore/dns/I_DNS.h b/iocore/dns/I_DNS.h
index 9d7fded..db04a55 100644
--- a/iocore/dns/I_DNS.h
+++ b/iocore/dns/I_DNS.h
@@ -28,7 +28,6 @@
****************************************************************************/
-
#ifndef _I_DNS_h_
#define _I_DNS_h_
diff --git a/iocore/dns/I_DNSProcessor.h b/iocore/dns/I_DNSProcessor.h
index 510cf5c..a44d5ee 100644
--- a/iocore/dns/I_DNSProcessor.h
+++ b/iocore/dns/I_DNSProcessor.h
@@ -33,7 +33,6 @@
#define DOMAIN_SERVICE_PORT 53
#define DEFAULT_DOMAIN_NAME_SERVER 0 // use the default server
-
/**
All buffering required to handle a DNS receipt. For asynchronous DNS,
only one HostEntBuf will exist in the system. For synchronous DNS,
@@ -113,7 +112,6 @@ struct DNSProcessor : public Processor {
Action *gethostbyname(Continuation *cont, const char *name, int len, Options const &opt);
Action *gethostbyaddr(Continuation *cont, IpAddr const *ip, Options const &opt);
-
// Processor API
//
/* currently dns system uses event threads
@@ -146,7 +144,6 @@ struct DNSProcessor : public Processor {
void dns_init();
};
-
//
// Global data
//
diff --git a/iocore/dns/I_SplitDNSProcessor.h b/iocore/dns/I_SplitDNSProcessor.h
index bbb7a48..78ecd65 100644
--- a/iocore/dns/I_SplitDNSProcessor.h
+++ b/iocore/dns/I_SplitDNSProcessor.h
@@ -37,7 +37,6 @@ struct SplitDNS;
** struct SplitDNSConfig
-------------------------------------------------------------- */
-
struct SplitDNSConfig {
static void startup();
diff --git a/iocore/dns/P_DNSProcessor.h b/iocore/dns/P_DNSProcessor.h
index 1705457..a11b3cc 100644
--- a/iocore/dns/P_DNSProcessor.h
+++ b/iocore/dns/P_DNSProcessor.h
@@ -78,7 +78,6 @@ extern unsigned int dns_sequence_number;
#define QFIXEDSZ 4
#endif
-
// Events
#define DNS_EVENT_LOOKUP DNS_EVENT_EVENTS_START
@@ -87,7 +86,6 @@ extern int dns_fd;
void *dns_udp_receiver(void *arg);
-
// Stats
enum DNS_Stats {
dns_total_lookups_stat,
@@ -177,7 +175,6 @@ struct DNSEntry : public Continuation {
}
};
-
typedef int (DNSEntry::*DNSEntryHandler)(int, void *);
struct DNSEntry;
@@ -314,11 +311,10 @@ struct DNSServer {
}
};
-
TS_INLINE
DNSHandler::DNSHandler()
: Continuation(NULL), n_con(0), in_flight(0), name_server(0), in_write_dns(0), hostent_cache(0), last_primary_retry(0),
- last_primary_reopen(0), m_res(0), txn_lookup_timeout(0), generator((uint32_t)((uintptr_t)time(NULL) ^ (uintptr_t) this))
+ last_primary_reopen(0), m_res(0), txn_lookup_timeout(0), generator((uint32_t)((uintptr_t)time(NULL) ^ (uintptr_t)this))
{
ats_ip_invalidate(&ip);
for (int i = 0; i < MAX_NAMED; i++) {
diff --git a/iocore/dns/P_SplitDNS.h b/iocore/dns/P_SplitDNS.h
index 64f78cc..23059c6 100644
--- a/iocore/dns/P_SplitDNS.h
+++ b/iocore/dns/P_SplitDNS.h
@@ -42,5 +42,4 @@
#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 7d63a99..9486eb4 100644
--- a/iocore/dns/P_SplitDNSProcessor.h
+++ b/iocore/dns/P_SplitDNSProcessor.h
@@ -62,7 +62,6 @@ enum DNSResultType {
typedef ControlMatcher<SplitDNSRecord, SplitDNSResult> DNS_table;
-
/* --------------------------------------------------------------
** struct SplitDNSResult
-------------------------------------------------------------- */
@@ -86,7 +85,6 @@ struct SplitDNSResult {
bool m_wrap_around;
};
-
/* --------------------------------------------------------------
** struct SplitDNS
-------------------------------------------------------------- */
@@ -97,7 +95,6 @@ struct SplitDNS : public ConfigInfo {
void *getDNSRecord(const char *hostname);
void findServer(RequestData *rdata, SplitDNSResult *result);
-
DNS_table *m_DNSSrvrTable;
int32_t m_SplitDNSlEnable;
@@ -111,7 +108,6 @@ struct SplitDNS : public ConfigInfo {
int m_numEle;
};
-
/* --------------------------------------------------------------
SplitDNSConfig::isSplitDNSEnabled()
-------------------------------------------------------------- */
@@ -121,12 +117,10 @@ SplitDNSConfig::isSplitDNSEnabled()
return (gsplit_dns_enabled ? true : false);
}
-
//
// End API to outside world
//
-
/* --------------------------------------------------------------
** class DNSRequestData
@@ -147,7 +141,6 @@ public:
const char *m_pHost;
};
-
/* --------------------------------------------------------------
DNSRequestData::get_string()
-------------------------------------------------------------- */
@@ -156,7 +149,6 @@ DNSRequestData::DNSRequestData() : m_pHost(0)
{
}
-
/* --------------------------------------------------------------
DNSRequestData::get_string()
-------------------------------------------------------------- */
@@ -166,7 +158,6 @@ DNSRequestData::get_string()
return ats_strdup((char *)m_pHost);
}
-
/* --------------------------------------------------------------
DNSRequestData::get_host()
-------------------------------------------------------------- */
@@ -176,7 +167,6 @@ DNSRequestData::get_host()
return m_pHost;
}
-
/* --------------------------------------------------------------
DNSRequestData::get_ip()
-------------------------------------------------------------- */
@@ -186,7 +176,6 @@ DNSRequestData::get_ip()
return NULL;
}
-
/* --------------------------------------------------------------
DNSRequestData::get_client_ip()
-------------------------------------------------------------- */
@@ -221,7 +210,6 @@ public:
int m_domain_srch_list;
};
-
/* --------------------------------------------------------------
SplitDNSRecord::SplitDNSRecord()
-------------------------------------------------------------- */
@@ -230,7 +218,6 @@ SplitDNSRecord::SplitDNSRecord() : m_dnsSrvr_cnt(0), m_domain_srch_list(0)
{
}
-
/* --------------------------------------------------------------
SplitDNSRecord::~SplitDNSRecord()
-------------------------------------------------------------- */
@@ -238,7 +225,6 @@ TS_INLINE SplitDNSRecord::~SplitDNSRecord()
{
}
-
/* ------------------
Helper Functions
------------------ */
diff --git a/iocore/dns/SRV.h b/iocore/dns/SRV.h
index 1c71965..0bd441d 100644
--- a/iocore/dns/SRV.h
+++ b/iocore/dns/SRV.h
@@ -44,20 +44,19 @@ struct SRV {
SRV() : weight(0), port(0), priority(0), ttl(0), host_len(0), key(0) { host[0] = '\0'; }
};
-inline bool operator<(const SRV &left, const SRV &right)
+inline bool
+operator<(const SRV &left, const SRV &right)
{
// lower priorities first, then the key
return (left.priority == right.priority) ? (left.key < right.key) : (left.priority < right.priority);
}
-
struct SRVHosts {
unsigned srv_host_count;
unsigned srv_hosts_length;
SRV hosts[HOST_DB_MAX_ROUND_ROBIN_INFO];
~SRVHosts() {}
-
SRVHosts() : srv_host_count(0), srv_hosts_length(0) {}
};
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index a3c92b4..40befb6 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -37,7 +37,6 @@
#include "ts/MatcherUtils.h"
#include "ts/HostLookup.h"
-
/* --------------------------------------------------------------
this file is built using "ParentSelection.cc as a template.
------------- ------------------------------------------------- */
@@ -57,7 +56,6 @@ static ClassAllocator<DNSRequestData> DNSReqAllocator("DNSRequestDataAllocator")
-------------------------------------------------------------- */
const matcher_tags sdns_dest_tags = {"dest_host", "dest_domain", NULL, "url_regex", "url", NULL, true};
-
/* --------------------------------------------------------------
config Callback Prototypes
-------------------------------------------------------------- */
@@ -66,16 +64,13 @@ enum SplitDNSCB_t {
SDNS_ENABLE_CB,
};
-
static const char *SDNSResultStr[] = {"DNSServer_Undefined", "DNSServer_Specified", "DNSServer_Failed"};
-
int SplitDNSConfig::m_id = 0;
int SplitDNSConfig::gsplit_dns_enabled = 0;
int splitDNSFile_CB(const char *name, RecDataT data_type, RecData data, void *cookie);
Ptr<ProxyMutex> SplitDNSConfig::dnsHandler_mutex;
-
/* --------------------------------------------------------------
SplitDNSResult::SplitDNSResult()
-------------------------------------------------------------- */
@@ -83,7 +78,6 @@ inline SplitDNSResult::SplitDNSResult() : r(DNS_SRVR_UNDEFINED), m_line_number(0
{
}
-
/* --------------------------------------------------------------
SplitDNS::SplitDNS()
-------------------------------------------------------------- */
@@ -91,7 +85,6 @@ SplitDNS::SplitDNS() : m_DNSSrvrTable(NULL), m_SplitDNSlEnable(0), m_bEnableFast
{
}
-
SplitDNS::~SplitDNS()
{
if (m_DNSSrvrTable) {
@@ -99,7 +92,6 @@ SplitDNS::~SplitDNS()
}
}
-
/* --------------------------------------------------------------
SplitDNSConfig::acquire()
-------------------------------------------------------------- */
@@ -109,7 +101,6 @@ SplitDNSConfig::acquire()
return (SplitDNS *)configProcessor.get(SplitDNSConfig::m_id);
}
-
/* --------------------------------------------------------------
SplitDNSConfig::release()
-------------------------------------------------------------- */
@@ -119,7 +110,6 @@ SplitDNSConfig::release(SplitDNS *params)
configProcessor.release(SplitDNSConfig::m_id, params);
}
-
/* --------------------------------------------------------------
SplitDNSConfig::startup()
-------------------------------------------------------------- */
@@ -134,7 +124,6 @@ SplitDNSConfig::startup()
SplitDNSConfig::splitDNSUpdate->attach("proxy.config.cache.splitdns.filename");
}
-
/* --------------------------------------------------------------
SplitDNSConfig::reconfigure()
-------------------------------------------------------------- */
@@ -171,7 +160,6 @@ SplitDNSConfig::reconfigure()
}
}
-
/* --------------------------------------------------------------
SplitDNSConfig::print()
-------------------------------------------------------------- */
@@ -187,7 +175,6 @@ SplitDNSConfig::print()
SplitDNSConfig::release(params);
}
-
/* --------------------------------------------------------------
SplitDNS::getDNSRecord()
-------------------------------------------------------------- */
@@ -212,7 +199,6 @@ SplitDNS::getDNSRecord(const char *hostname)
return NULL;
}
-
/* --------------------------------------------------------------
SplitDNS::findServer()
-------------------------------------------------------------- */
@@ -299,7 +285,6 @@ SplitDNS::findServer(RequestData *rdata, SplitDNSResult *result)
}
}
-
/* --------------------------------------------------------------
SplitDNSRecord::ProcessDNSHosts()
-------------------------------------------------------------- */
@@ -374,7 +359,6 @@ SplitDNSRecord::ProcessDNSHosts(char *val)
return NULL;
}
-
/* --------------------------------------------------------------
SplitDNSRecord::ProcessDefDomain()
-------------------------------------------------------------- */
@@ -403,7 +387,6 @@ SplitDNSRecord::ProcessDefDomain(char *val)
return NULL;
}
-
/* --------------------------------------------------------------
SplitDNSRecord::ProcessDomainSrchList()
-------------------------------------------------------------- */
@@ -439,7 +422,6 @@ SplitDNSRecord::ProcessDomainSrchList(char *val)
return NULL;
}
-
/* --------------------------------------------------------------
SplitDNSRecord::Init()
@@ -528,7 +510,6 @@ SplitDNSRecord::Init(matcher_line *line_info)
return config_parse_error::ok();
}
-
/* --------------------------------------------------------------
SplitDNSRecord::UpdateMatch()
-------------------------------------------------------------- */
@@ -545,7 +526,6 @@ SplitDNSRecord::UpdateMatch(SplitDNSResult *result, RequestData * /* rdata ATS_U
}
}
-
/* --------------------------------------------------------------
SplitDNSRecord::Print()
-------------------------------------------------------------- */
@@ -558,7 +538,6 @@ SplitDNSRecord::Print()
}
}
-
void
ink_split_dns_init(ModuleVersion v)
{
diff --git a/iocore/dns/test_P_DNS.cc b/iocore/dns/test_P_DNS.cc
index 1db0c41..02677e0 100644
--- a/iocore/dns/test_P_DNS.cc
+++ b/iocore/dns/test_P_DNS.cc
@@ -41,7 +41,6 @@ struct NetTesterSM : public Continuation {
read_vio = vc->do_io_read(this, INT64_MAX, buf);
}
-
int
handle_read(int event, void *data)
{
diff --git a/iocore/eventsystem/IOBuffer.cc b/iocore/eventsystem/IOBuffer.cc
index 44535eb..b73d81e 100644
--- a/iocore/eventsystem/IOBuffer.cc
+++ b/iocore/eventsystem/IOBuffer.cc
@@ -111,7 +111,6 @@ MIOBuffer::write(const void *abuf, int64_t alen)
return alen;
}
-
#ifdef WRITE_AND_TRANSFER
/*
* Same functionality as write but for the one small difference.
@@ -137,7 +136,6 @@ MIOBuffer::write_and_transfer_left_over_space(IOBufferReader *r, int64_t alen, i
#endif
-
int64_t
MIOBuffer::write(IOBufferReader *r, int64_t alen, int64_t offset)
{
diff --git a/iocore/eventsystem/I_Action.h b/iocore/eventsystem/I_Action.h
index ca3c5af..4f534d0 100644
--- a/iocore/eventsystem/I_Action.h
+++ b/iocore/eventsystem/I_Action.h
@@ -99,7 +99,6 @@ public:
*/
Continuation *continuation;
-
/**
Reference to the Continuation's lock.
@@ -171,7 +170,8 @@ public:
#endif
}
- Continuation *operator=(Continuation *acont)
+ Continuation *
+ operator=(Continuation *acont)
{
continuation = acont;
if (acont)
@@ -188,7 +188,6 @@ public:
*/
Action() : continuation(NULL), cancelled(false) {}
-
#if defined(__GNUC__)
virtual ~Action() {}
#endif
diff --git a/iocore/eventsystem/I_EThread.h b/iocore/eventsystem/I_EThread.h
index 4618360..cf0999d 100644
--- a/iocore/eventsystem/I_EThread.h
+++ b/iocore/eventsystem/I_EThread.h
@@ -58,7 +58,6 @@ enum ThreadType {
extern bool shutdown_event_system;
-
/**
Event System specific type of thread.
@@ -333,7 +332,8 @@ class ink_dummy_for_new
{
};
-inline void *operator new(size_t, ink_dummy_for_new *p)
+inline void *
+operator new(size_t, ink_dummy_for_new *p)
{
return (void *)p;
}
diff --git a/iocore/eventsystem/I_Event.h b/iocore/eventsystem/I_Event.h
index a61c49c..af73195 100644
--- a/iocore/eventsystem/I_Event.h
+++ b/iocore/eventsystem/I_Event.h
@@ -229,7 +229,6 @@ public:
Event();
-
Event *init(Continuation *c, ink_hrtime atimeout_at = 0, ink_hrtime aperiod = 0);
#ifdef ENABLE_TIME_TRACE
diff --git a/iocore/eventsystem/I_EventProcessor.h b/iocore/eventsystem/I_EventProcessor.h
index 70fe8c2..03364d6 100644
--- a/iocore/eventsystem/I_EventProcessor.h
+++ b/iocore/eventsystem/I_EventProcessor.h
@@ -123,7 +123,6 @@ public:
*/
EventType spawn_event_threads(int n_threads, const char *et_name, size_t stacksize);
-
/**
Schedules the continuation on a specific EThread to receive an event
at the given timeout. Requests the EventProcessor to schedule
@@ -215,7 +214,6 @@ public:
Event *schedule_every(Continuation *c, ink_hrtime aperiod, EventType event_type = ET_CALL, int callback_event = EVENT_INTERVAL,
void *cookie = NULL);
-
////////////////////////////////////////////
// reschedule an already scheduled event. //
// may be called directly or called by //
diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h
index a0e43d8..2970759 100644
--- a/iocore/eventsystem/I_IOBuffer.h
+++ b/iocore/eventsystem/I_IOBuffer.h
@@ -110,7 +110,6 @@ enum AllocType {
#define MIN_IOBUFFER_SIZE BUFFER_SIZE_INDEX_128
#define MAX_IOBUFFER_SIZE (DEFAULT_BUFFER_SIZES - 1)
-
#define BUFFER_SIZE_ALLOCATED(_i) (BUFFER_SIZE_INDEX_IS_FAST_ALLOCATED(_i) || BUFFER_SIZE_INDEX_IS_XMALLOCED(_i))
#define BUFFER_SIZE_NOT_ALLOCATED DEFAULT_BUFFER_SIZES
@@ -223,7 +222,6 @@ public:
*/
operator char *() { return _data; }
-
/**
Frees the IOBufferData object and its underlying memory. Deallocates
the memory managed by this IOBufferData and then frees itself. You
@@ -578,7 +576,6 @@ public:
*/
bool is_read_avail_more_than(int64_t size);
-
/**
Number of IOBufferBlocks with data in the block list. Returns the
number of IOBufferBlocks on the block list with data remaining for
@@ -932,7 +929,6 @@ public:
return NULL;
}
-
char *
buf()
{
@@ -1250,7 +1246,11 @@ class MIOBuffer_tracker
public:
MIOBuffer_tracker(const char *_loc) : loc(_loc) {}
- MIOBuffer *operator()(int64_t size_index = default_large_iobuffer_size) { return new_MIOBuffer_internal(loc, size_index); }
+ MIOBuffer *
+ operator()(int64_t size_index = default_large_iobuffer_size)
+ {
+ return new_MIOBuffer_internal(loc, size_index);
+ }
};
#endif
@@ -1267,7 +1267,11 @@ class Empty_MIOBuffer_tracker
public:
Empty_MIOBuffer_tracker(const char *_loc) : loc(_loc) {}
- MIOBuffer *operator()(int64_t size_index = default_large_iobuffer_size) { return new_empty_MIOBuffer_internal(loc, size_index); }
+ MIOBuffer *
+ operator()(int64_t size_index = default_large_iobuffer_size)
+ {
+ return new_empty_MIOBuffer_internal(loc, size_index);
+ }
};
#endif
@@ -1301,8 +1305,13 @@ class IOBufferBlock_tracker
public:
IOBufferBlock_tracker(const char *_loc) : loc(_loc) {}
- IOBufferBlock *operator()() { return new_IOBufferBlock_internal(loc); }
- IOBufferBlock *operator()(IOBufferData *d, int64_t len = 0, int64_t offset = 0)
+ IOBufferBlock *
+ operator()()
+ {
+ return new_IOBufferBlock_internal(loc);
+ }
+ IOBufferBlock *
+ operator()(IOBufferData *d, int64_t len = 0, int64_t offset = 0)
{
return new_IOBufferBlock_internal(loc, d, len, offset);
}
@@ -1342,7 +1351,8 @@ class IOBufferData_tracker
public:
IOBufferData_tracker(const char *_loc) : loc(_loc) {}
- IOBufferData *operator()(int64_t size_index = default_large_iobuffer_size, AllocType type = DEFAULT_ALLOC)
+ IOBufferData *
+ operator()(int64_t size_index = default_large_iobuffer_size, AllocType type = DEFAULT_ALLOC)
{
return new_IOBufferData_internal(loc, size_index, type);
}
diff --git a/iocore/eventsystem/I_PriorityEventQueue.h b/iocore/eventsystem/I_PriorityEventQueue.h
index 90dc449..a1b11f9 100644
--- a/iocore/eventsystem/I_PriorityEventQueue.h
+++ b/iocore/eventsystem/I_PriorityEventQueue.h
@@ -27,7 +27,6 @@
#include "ts/ink_platform.h"
#include "I_Event.h"
-
// <5ms, 10, 20, 40, 80, 160, 320, 640, 1280, 2560, 5120
#define N_PQ_LIST 10
#define PQ_BUCKET_TIME(_i) (HRTIME_MSECONDS(5) << (_i))
diff --git a/iocore/eventsystem/I_Thread.h b/iocore/eventsystem/I_Thread.h
index 74b4826..2d4fcb7 100644
--- a/iocore/eventsystem/I_Thread.h
+++ b/iocore/eventsystem/I_Thread.h
@@ -79,7 +79,6 @@ extern ProxyMutex *global_mutex;
static const int MAX_THREAD_NAME_LENGTH = 16;
static const int DEFAULT_STACKSIZE = 1048576; // 1MB
-
/**
Base class for the threads in the Event System. Thread is the base
class for all the thread classes in the Event System. Objects of the
diff --git a/iocore/eventsystem/I_VIO.h b/iocore/eventsystem/I_VIO.h
index 38b82d7..94792f1 100644
--- a/iocore/eventsystem/I_VIO.h
+++ b/iocore/eventsystem/I_VIO.h
@@ -75,7 +75,6 @@ class VIO
{
public:
~VIO() {}
-
/** Interface for the VConnection that owns this handle. */
Continuation *get_continuation();
void set_continuation(Continuation *cont);
diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index 1b1cd76..3ef5a13 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -21,14 +21,12 @@
limitations under the License.
*/
-
#if !defined(_P_IOBuffer_h)
#define _P_IOBuffer_h
#include "ts/ink_platform.h"
#include "ts/ink_resource.h"
-
// TODO: I think we're overly aggressive here on making MIOBuffer 64-bit
// but not sure it's worthwhile changing anything to 32-bit honestly.
@@ -290,7 +288,6 @@ IOBufferData::alloc(int64_t size_index, AllocType type)
// ****** IF YOU CHANGE THIS FUNCTION change that one as well.
-
TS_INLINE void
IOBufferData::dealloc()
{
diff --git a/iocore/eventsystem/P_ProtectedQueue.h b/iocore/eventsystem/P_ProtectedQueue.h
index 93eca04..a0b5fbc 100644
--- a/iocore/eventsystem/P_ProtectedQueue.h
+++ b/iocore/eventsystem/P_ProtectedQueue.h
@@ -32,7 +32,6 @@
#include "I_EventSystem.h"
-
TS_INLINE
ProtectedQueue::ProtectedQueue()
{
diff --git a/iocore/eventsystem/P_UnixEventProcessor.h b/iocore/eventsystem/P_UnixEventProcessor.h
index 21be1bc..911024e 100644
--- a/iocore/eventsystem/P_UnixEventProcessor.h
+++ b/iocore/eventsystem/P_UnixEventProcessor.h
@@ -29,7 +29,6 @@
const int LOAD_BALANCE_INTERVAL = 1;
-
TS_INLINE
EventProcessor::EventProcessor() : n_ethreads(0), n_thread_groups(0), n_dthreads(0), thread_data_used(0)
{
@@ -82,7 +81,6 @@ EventProcessor::schedule(Event *e, EventType etype, bool fast_signal)
return e;
}
-
TS_INLINE Event *
EventProcessor::schedule_imm_signal(Continuation *cont, EventType et, int callback_event, void *cookie)
{
@@ -149,5 +147,4 @@ EventProcessor::schedule_every(Continuation *cont, ink_hrtime t, EventType et, i
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 2582c5a..f372caa 100644
--- a/iocore/eventsystem/P_UnixSocketManager.h
+++ b/iocore/eventsystem/P_UnixSocketManager.h
@@ -36,7 +36,6 @@
#include "ts/ink_sock.h"
#include "I_SocketManager.h"
-
//
// These limits are currently disabled
//
@@ -56,7 +55,6 @@ transient_error()
return transient;
}
-
//
// Timing done in the connectionManager
//
@@ -237,7 +235,6 @@ SocketManager::write_vector(int fd, struct iovec *vector, size_t count, void *pO
return vector_io(fd, vector, count, 0, pOLP);
}
-
TS_INLINE int
SocketManager::send(int fd, void *buf, int size, int flags)
{
@@ -457,7 +454,6 @@ SocketManager::port_getn(int port, port_event_t *list, uint_t max, uint_t *nget,
}
#endif /* TS_USE_PORT */
-
TS_INLINE int
SocketManager::get_sndbuf_size(int s)
{
diff --git a/iocore/eventsystem/P_VConnection.h b/iocore/eventsystem/P_VConnection.h
index ec7b773..4c75c42 100644
--- a/iocore/eventsystem/P_VConnection.h
+++ b/iocore/eventsystem/P_VConnection.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#if !defined(P_VConnection_h)
#define P_VConnection_h
#include "I_EventSystem.h"
@@ -55,7 +54,6 @@ get_vc_event_name(int event)
}
}
-
TS_INLINE
VConnection::VConnection(ProxyMutex *aMutex) : Continuation(aMutex), lerrno(0)
{
diff --git a/iocore/eventsystem/P_VIO.h b/iocore/eventsystem/P_VIO.h
index eb622c1..19d3983 100644
--- a/iocore/eventsystem/P_VIO.h
+++ b/iocore/eventsystem/P_VIO.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#if !defined(P_VIO_h)
#define P_VIO_h
#include "I_VIO.h"
diff --git a/iocore/eventsystem/Processor.cc b/iocore/eventsystem/Processor.cc
index 1615dd1..5eb843d 100644
--- a/iocore/eventsystem/Processor.cc
+++ b/iocore/eventsystem/Processor.cc
@@ -53,7 +53,6 @@ Processor::Processor()
{
} /* End Processor::Processor() */
-
//////////////////////////////////////////////////////////////////////////////
//
// Processor::~Processor()
diff --git a/iocore/eventsystem/ProtectedQueue.cc b/iocore/eventsystem/ProtectedQueue.cc
index f8e8cf6..8afd620 100644
--- a/iocore/eventsystem/ProtectedQueue.cc
+++ b/iocore/eventsystem/ProtectedQueue.cc
@@ -32,7 +32,6 @@
#include "P_EventSystem.h"
-
// The protected queue is designed to delay signaling of threads
// until some amount of work has been completed on the current thread
// in order to prevent excess context switches.
diff --git a/iocore/eventsystem/Tasks.cc b/iocore/eventsystem/Tasks.cc
index 989d057..58dc1ef 100644
--- a/iocore/eventsystem/Tasks.cc
+++ b/iocore/eventsystem/Tasks.cc
@@ -27,7 +27,6 @@
EventType ET_TASK = ET_CALL;
TasksProcessor tasksProcessor;
-
// Note that if the number of task_threads is 0, all continuations scheduled for
// ET_TASK ends up running on ET_CALL (which is the net-threads).
int
diff --git a/iocore/eventsystem/UnixEThread.cc b/iocore/eventsystem/UnixEThread.cc
index 8af5c98..4973b51 100644
--- a/iocore/eventsystem/UnixEThread.cc
+++ b/iocore/eventsystem/UnixEThread.cc
@@ -42,14 +42,14 @@ struct AIOCallback;
bool shutdown_event_system = false;
EThread::EThread()
- : generator((uint64_t)Thread::get_hrtime_updated() ^ (uint64_t)(uintptr_t) this), ethreads_to_be_signalled(NULL),
+ : generator((uint64_t)Thread::get_hrtime_updated() ^ (uint64_t)(uintptr_t)this), ethreads_to_be_signalled(NULL),
n_ethreads_to_be_signalled(0), main_accept_index(-1), id(NO_ETHREAD_ID), event_types(0), signal_hook(0), tt(REGULAR)
{
memset(thread_private, 0, PER_THREAD_DATA);
}
EThread::EThread(ThreadType att, int anid)
- : generator((uint64_t)Thread::get_hrtime_updated() ^ (uint64_t)(uintptr_t) this), ethreads_to_be_signalled(NULL),
+ : generator((uint64_t)Thread::get_hrtime_updated() ^ (uint64_t)(uintptr_t)this), ethreads_to_be_signalled(NULL),
n_ethreads_to_be_signalled(0), main_accept_index(-1), id(anid), event_types(0), signal_hook(0), tt(att),
server_session_pool(NULL)
{
@@ -82,14 +82,13 @@ EThread::EThread(ThreadType att, int anid)
}
EThread::EThread(ThreadType att, Event *e)
- : generator((uint32_t)((uintptr_t)time(NULL) ^ (uintptr_t) this)), ethreads_to_be_signalled(NULL), n_ethreads_to_be_signalled(0),
+ : generator((uint32_t)((uintptr_t)time(NULL) ^ (uintptr_t)this)), ethreads_to_be_signalled(NULL), n_ethreads_to_be_signalled(0),
main_accept_index(-1), id(NO_ETHREAD_ID), event_types(0), signal_hook(0), tt(att), oneevent(e)
{
ink_assert(att == DEDICATED);
memset(thread_private, 0, PER_THREAD_DATA);
}
-
// Provide a destructor so that SDK functions which create and destroy
// threads won't have to deal with EThread memory deallocation.
EThread::~EThread()
diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc
index 70e5934..0c4e410 100644
--- a/iocore/eventsystem/UnixEventProcessor.cc
+++ b/iocore/eventsystem/UnixEventProcessor.cc
@@ -64,7 +64,6 @@ EventProcessor::spawn_event_threads(int n_threads, const char *et_name, size_t s
return new_thread_group_id;
}
-
class EventProcessor eventProcessor;
int
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index 611cacb..8360a9d 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -242,7 +242,6 @@ HostDBCache::HostDBCache()
hosts_file_ptr = new RefCountedHostsFileMap();
}
-
int
HostDBCache::rebuild_callout(HostDBInfo *e, RebuildMC &r)
{
@@ -292,14 +291,12 @@ HostDBCache::rebuild_callout(HostDBInfo *e, RebuildMC &r)
return 1;
}
-
HostDBCache *
HostDBProcessor::cache()
{
return &hostDB;
}
-
struct HostDBTestRR : public Continuation {
int fd;
char b[512];
@@ -347,7 +344,6 @@ struct HostDBTestRR : public Continuation {
return EVENT_CONT;
}
-
void
read_some()
{
@@ -355,7 +351,6 @@ struct HostDBTestRR : public Continuation {
ink_release_assert(nb >= 0);
}
-
HostDBTestRR() : Continuation(new_ProxyMutex()), nb(0), outstanding(0), success(0), failure(0), in(0)
{
printf("starting HostDBTestRR....\n");
@@ -368,7 +363,6 @@ struct HostDBTestRR : public Continuation {
~HostDBTestRR() { close(fd); }
};
-
struct HostDBSyncer : public Continuation {
int frequency;
ink_hrtime start_time;
@@ -379,13 +373,11 @@ struct HostDBSyncer : public Continuation {
HostDBSyncer();
};
-
HostDBSyncer::HostDBSyncer() : Continuation(new_ProxyMutex()), frequency(0), start_time(0)
{
SET_HANDLER(&HostDBSyncer::sync_event);
}
-
int
HostDBSyncer::sync_event(int, void *)
{
@@ -395,7 +387,6 @@ HostDBSyncer::sync_event(int, void *)
return EVENT_DONE;
}
-
int
HostDBSyncer::wait_event(int, void *)
{
@@ -409,7 +400,6 @@ HostDBSyncer::wait_event(int, void *)
return EVENT_DONE;
}
-
int
HostDBCache::start(int flags)
{
@@ -483,7 +473,6 @@ HostDBCache::start(int flags)
return 0;
}
-
// Start up the Host Database processor.
// Load configuration, register configuration and statistics and
// open the cache. This doesn't create any threads, so those
@@ -541,7 +530,6 @@ HostDBProcessor::start(int, size_t)
return 0;
}
-
void
HostDBContinuation::init(HostDBMD5 const &the_md5, Options const &opt)
{
@@ -730,7 +718,6 @@ probe(ProxyMutex *mutex, HostDBMD5 const &md5, bool ignore_timeout)
return NULL;
}
-
//
// Insert a HostDBInfo into the database
// A null value indicates that the block is empty.
@@ -757,7 +744,6 @@ HostDBContinuation::insert(unsigned int attl)
return r;
}
-
//
// Get an entry by either name or IP
//
@@ -846,7 +832,6 @@ Lretry:
return &c->action;
}
-
// Wrapper from getbyname to getby
//
Action *
@@ -885,7 +870,6 @@ HostDBProcessor::getbynameport_re(Continuation *cont, const char *ahostname, int
return getby(cont, ahostname, len, &sa, force_dns, opt.host_res_style, opt.timeout);
}
-
/* Support SRV records */
Action *
HostDBProcessor::getSRVbyname_imm(Continuation *cont, process_srv_info_pfn process_srv_info, const char *hostname, int len,
@@ -958,7 +942,6 @@ HostDBProcessor::getSRVbyname_imm(Continuation *cont, process_srv_info_pfn proce
return &c->action;
}
-
// Wrapper from getbyname to getby
//
Action *
@@ -1042,7 +1025,6 @@ HostDBProcessor::iterate(Continuation *cont)
HOSTDB_INCREMENT_DYN_STAT(hostdb_total_lookups_stat);
-
HostDBContinuation *c = hostDBContAllocator.alloc();
HostDBContinuation::Options copt;
copt.cont = cont;
@@ -1168,7 +1150,6 @@ HostDBContinuation::setbyEvent(int /* event ATS_UNUSED */, Event * /* e ATS_UNUS
return EVENT_DONE;
}
-
static int
remove_round_robin(HostDBInfo *r, const char *hostname, IpAddr const &ip)
{
@@ -1271,7 +1252,6 @@ HostDBContinuation::removeEvent(int /* event ATS_UNUSED */, Event *e)
return EVENT_DONE;
}
-
// Lookup done, insert into the local table, return data to the
// calling continuation or to the calling cluster node.
//
@@ -1383,7 +1363,6 @@ HostDBContinuation::lookup_done(IpAddr const &ip, char const *aname, bool around
return i;
}
-
int
HostDBContinuation::dnsPendingEvent(int event, Event *e)
{
@@ -1427,7 +1406,6 @@ restore_info(HostDBInfo *r, HostDBInfo *old_r, HostDBInfo &old_info, HostDBRound
return false;
}
-
// DNS lookup result state
//
int
@@ -1693,7 +1671,6 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
}
}
-
//
// HostDB Get Message
// Used to lookup host information on a remote node in the cluster
@@ -1706,7 +1683,6 @@ struct HostDB_get_message {
char name[MAXDNAME];
};
-
//
// Make a get message
//
@@ -1729,7 +1705,6 @@ HostDBContinuation::make_get_message(char *buf, int size)
return len;
}
-
//
// Make and send a get message
//
@@ -1775,7 +1750,6 @@ HostDBContinuation::do_get_response(Event * /* e ATS_UNUSED */)
return true;
}
-
//
// HostDB Put Message
// This message is used in a response to a cluster node for
@@ -1794,7 +1768,6 @@ struct HostDB_put_message {
char name[MAXDNAME];
};
-
//
// Build the put message
//
@@ -1964,7 +1937,6 @@ HostDBContinuation::probeEvent(int /* event ATS_UNUSED */, Event *e)
return EVENT_DONE;
}
-
int
HostDBContinuation::set_check_pending_dns()
{
@@ -1981,7 +1953,6 @@ HostDBContinuation::set_check_pending_dns()
return true;
}
-
void
HostDBContinuation::remove_trigger_pending_dns()
{
@@ -2002,7 +1973,6 @@ HostDBContinuation::remove_trigger_pending_dns()
c->handleEvent(EVENT_IMMEDIATE, NULL);
}
-
//
// Query the DNS processor
//
@@ -2050,7 +2020,6 @@ HostDBContinuation::do_dns()
}
}
-
//
// Handle the response (put message)
//
@@ -2087,7 +2056,6 @@ HostDBContinuation::clusterResponseEvent(int /* event ATS_UNUSED */, Event *e)
return EVENT_DONE;
}
-
//
// Wait for the response (put message)
//
@@ -2149,7 +2117,6 @@ HostDBContinuation::clusterEvent(int event, Event *e)
}
}
-
int
HostDBContinuation::failed_cluster_request(Event *e)
{
@@ -2168,7 +2135,6 @@ HostDBContinuation::failed_cluster_request(Event *e)
return EVENT_DONE;
}
-
void
get_hostinfo_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUSED */)
{
@@ -2214,7 +2180,6 @@ get_hostinfo_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUS
dnsProcessor.thread->schedule_imm(c);
}
-
void
put_hostinfo_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUSED */)
{
@@ -2241,7 +2206,6 @@ put_hostinfo_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUS
dnsProcessor.thread->schedule_imm(c);
}
-
//
// Background event
// Just increment the current_interval. Might do other stuff
@@ -2317,7 +2281,6 @@ HostDBInfo::match(INK_MD5 &md5, int /* bucket ATS_UNUSED */, int buckets)
return tmp.md5_low_low == md5_low_low && tmp.md5_low == md5_low;
}
-
char *
HostDBInfo::hostname()
{
@@ -2355,7 +2318,6 @@ HostDBInfo::rr()
return r;
}
-
int
HostDBInfo::heap_size()
{
@@ -2373,7 +2335,6 @@ HostDBInfo::heap_size()
return 0;
}
-
int *
HostDBInfo::heap_offset_ptr()
{
@@ -2386,7 +2347,6 @@ HostDBInfo::heap_offset_ptr()
return NULL;
}
-
ClusterMachine *
HostDBContinuation::master_machine(ClusterConfiguration *cc)
{
@@ -2423,7 +2383,6 @@ struct ShowHostDB : public ShowCont {
return complete(event, e);
}
-
int
showLookup(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
@@ -2511,7 +2470,6 @@ struct ShowHostDB : public ShowCont {
return EVENT_CONT;
}
-
int
showOne(HostDBInfo *r, bool rr, int event, Event *e, HostDBRoundRobin *hostdb_rr = NULL)
{
@@ -2583,7 +2541,6 @@ struct ShowHostDB : public ShowCont {
return EVENT_CONT;
}
-
int
showLookupDone(int event, Event *e)
{
@@ -2621,7 +2578,6 @@ struct ShowHostDB : public ShowCont {
return complete(event, e);
}
-
ShowHostDB(Continuation *c, HTTPHdr *h) : ShowCont(c, h), name(0), port(0), force(0), output_json(false), records_seen(0)
{
ats_ip_invalidate(&ip);
@@ -2631,7 +2587,6 @@ struct ShowHostDB : public ShowCont {
#define STR_LEN_EQ_PREFIX(_x, _l, _s) (!ptr_len_ncasecmp(_x, _l, _s, sizeof(_s) - 1))
-
static Action *
register_ShowHostDB(Continuation *c, HTTPHdr *h)
{
@@ -2684,7 +2639,6 @@ register_ShowHostDB(Continuation *c, HTTPHdr *h)
return &s->action;
}
-
#define HOSTDB_TEST_MAX_OUTSTANDING 100
#define HOSTDB_TEST_LENGTH 100000
@@ -2738,7 +2692,6 @@ struct HostDBTestReverse : public Continuation {
}
};
-
#if TS_HAS_TESTS
void
run_HostDBTest()
@@ -2751,7 +2704,6 @@ run_HostDBTest()
}
#endif
-
RecRawStatBlock *hostdb_rsb;
void
@@ -2796,7 +2748,6 @@ ink_hostdb_init(ModuleVersion v)
ts_host_res_global_init();
}
-
/// Pair of IP address and host name from a host file.
struct HostFilePair {
typedef HostFilePair self;
@@ -2815,7 +2766,6 @@ struct HostDBFileContinuation : public Continuation {
ats_scoped_str path; ///< Used to keep the host file name around.
HostDBFileContinuation() : Continuation(0) {}
-
/// Finish update
static void finish(Keys *keys ///< Valid keys from update.
);
@@ -2846,7 +2796,6 @@ CmpMD5(INK_MD5 const &lhs, INK_MD5 const &rhs)
return lhs[0] < rhs[0] || (lhs[0] == rhs[0] && lhs[1] < rhs[1]);
}
-
void
ParseHostLine(RefCountedHostsFileMap *map, char *l)
{
@@ -2872,7 +2821,6 @@ ParseHostLine(RefCountedHostsFileMap *map, char *l)
}
}
-
void
ParseHostFile(char const *path)
{
diff --git a/iocore/hostdb/I_HostDB.h b/iocore/hostdb/I_HostDB.h
index e09e625..a143467 100644
--- a/iocore/hostdb/I_HostDB.h
+++ b/iocore/hostdb/I_HostDB.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
I_HostDB.h
diff --git a/iocore/hostdb/I_HostDBProcessor.h b/iocore/hostdb/I_HostDBProcessor.h
index 8d83387..852794c 100644
--- a/iocore/hostdb/I_HostDBProcessor.h
+++ b/iocore/hostdb/I_HostDBProcessor.h
@@ -64,7 +64,6 @@ extern unsigned int hostdb_ip_timeout_interval;
extern unsigned int hostdb_ip_fail_timeout_interval;
extern unsigned int hostdb_serve_stale_but_revalidate;
-
static inline unsigned int
makeHostHash(const char *string)
{
@@ -239,7 +238,6 @@ struct HostDBInfo {
return false;
}
-
//
// Private
//
@@ -377,7 +375,6 @@ struct HostDBInfo {
int *heap_offset_ptr();
};
-
struct HostDBRoundRobin {
/** Total number (to compute space used). */
short rrcount;
@@ -456,7 +453,6 @@ struct HostDBProcessor : public Processor {
HostResStyle host_res_style; ///< How to query host (default HOST_RES_IPV4)
Options() : port(0), flags(HOSTDB_DO_NOT_FORCE_DNS), timeout(0), host_res_style(HOST_RES_IPV4) {}
-
/// Set the flags.
self &
setFlags(int f)
@@ -470,7 +466,6 @@ struct HostDBProcessor : public Processor {
static Options const DEFAULT_OPTIONS;
HostDBProcessor() {}
-
inkcoreapi Action *getbyname_re(Continuation *cont, const char *hostname, int len, Options const &opt = DEFAULT_OPTIONS);
Action *getbynameport_re(Continuation *cont, const char *hostname, int len, Options const &opt = DEFAULT_OPTIONS);
diff --git a/iocore/hostdb/MultiCache.cc b/iocore/hostdb/MultiCache.cc
index a0e9c15..e2ae6ee 100644
--- a/iocore/hostdb/MultiCache.cc
+++ b/iocore/hostdb/MultiCache.cc
@@ -350,7 +350,6 @@ MultiCacheBase::mmap_data(bool private_flag, bool zero_fill)
data = 0;
-
// mmap levels
//
{
@@ -441,7 +440,6 @@ MultiCacheBase::mmap_data(bool private_flag, bool zero_fill)
store = saved;
}
-
for (int i = 0; i < n_fds; i++) {
if (fds[i] >= 0)
ink_assert(!socketManager.close(fds[i]));
@@ -765,7 +763,6 @@ MultiCacheBase::print_info(FILE *fp)
fprintf(fp, " Size (bytes): %-10u\n", totalsize);
}
-
//
// We need to preserve the buckets
// while moving the existing data into the new locations.
@@ -1363,7 +1360,6 @@ MultiCacheBase::ptr_to_partition(char *ptr)
return -1;
}
-
void
stealStore(Store &s, int blocks)
{
diff --git a/iocore/hostdb/P_HostDB.h b/iocore/hostdb/P_HostDB.h
index 248f4f7..9d616a4 100644
--- a/iocore/hostdb/P_HostDB.h
+++ b/iocore/hostdb/P_HostDB.h
@@ -47,7 +47,6 @@
#include "P_MultiCache.h"
#include "P_HostDBProcessor.h"
-
#undef HOSTDB_MODULE_VERSION
#define HOSTDB_MODULE_VERSION makeModuleVersion(HOSTDB_MODULE_MAJOR_VERSION, HOSTDB_MODULE_MINOR_VERSION, PRIVATE_MODULE_HEADER)
HostDBInfo *probe(ProxyMutex *mutex, HostDBMD5 const &md5, bool ignore_timeout);
diff --git a/iocore/hostdb/P_HostDBProcessor.h b/iocore/hostdb/P_HostDBProcessor.h
index d4f3ba0..f682fee 100644
--- a/iocore/hostdb/P_HostDBProcessor.h
+++ b/iocore/hostdb/P_HostDBProcessor.h
@@ -143,7 +143,6 @@ HOSTDB_CLIENT_IP_HASH(sockaddr const *lhs, sockaddr const *rhs)
//#define TEST(_x) _x
#define TEST(_x)
-
#ifdef _HOSTDB_CC_
template struct MultiCache<HostDBInfo>;
#endif /* _HOSTDB_CC_ */
@@ -164,7 +163,6 @@ enum HostDB_Stats {
HostDB_Stat_Count
};
-
struct RecRawStatBlock;
extern RecRawStatBlock *hostdb_rsb;
@@ -190,9 +188,12 @@ extern RecRawStatBlock *hostdb_rsb;
#define HOSTDB_DECREMENT_THREAD_DYN_STAT(_s, _t) RecIncrRawStatSum(hostdb_rsb, _t, (int)_s, -1);
-
struct CmpConstBuffferCaseInsensitive {
- bool operator()(ts::ConstBuffer a, ts::ConstBuffer b) const { return ptr_len_casecmp(a._ptr, a._size, b._ptr, b._size) < 0; }
+ bool
+ operator()(ts::ConstBuffer a, ts::ConstBuffer b) const
+ {
+ return ptr_len_casecmp(a._ptr, a._size, b._ptr, b._size) < 0;
+ }
};
// Our own typedef for the host file mapping
diff --git a/iocore/hostdb/P_MultiCache.h b/iocore/hostdb/P_MultiCache.h
index 01a9f02..adc1ad3 100644
--- a/iocore/hostdb/P_MultiCache.h
+++ b/iocore/hostdb/P_MultiCache.h
@@ -28,7 +28,6 @@
****************************************************************************/
-
#ifndef _MultiCache_h_
#define _MultiCache_h_
@@ -46,7 +45,6 @@
#define MULTI_CACHE_EVENT_SYNC MULTI_CACHE_EVENT_EVENTS_START
-
// for heap_offset() and heap_size(), indicates no data
#define MULTI_CACHE_HEAP_NONE -1
@@ -79,7 +77,6 @@ class Continuation;
// This is an abstract class which simply documents the operations
// required by the templated cache operations.
-
struct MultiCacheBlock {
uint64_t tag();
bool is_deleted();
@@ -353,7 +350,6 @@ struct MultiCacheBase : public MultiCacheHeader {
MultiCacheBase();
virtual ~MultiCacheBase() { reset(); }
-
virtual int
get_elementsize()
{
diff --git a/iocore/hostdb/include/Machine.h b/iocore/hostdb/include/Machine.h
index 50b24fa..14c55e7 100644
--- a/iocore/hostdb/include/Machine.h
+++ b/iocore/hostdb/include/Machine.h
@@ -28,7 +28,6 @@
****************************************************************************/
-
//
// The Machine is the set of processes which share part of an
// address space.
@@ -43,7 +42,6 @@
//
#define MACHINE_TIMEOUT (HRTIME_DAY * 2)
-
//
// This is the time processors should delay before freeing up resouces
// which are shared with other threads in non-long running operations.
@@ -114,5 +112,4 @@ extern ProxyMutex *the_cluster_config_mutex;
extern MachineList *machines_config;
extern MachineList *cluster_config;
-
#endif /* _Machine_h */
diff --git a/iocore/hostdb/test_I_HostDB.cc b/iocore/hostdb/test_I_HostDB.cc
index 1559c89..81e27af 100644
--- a/iocore/hostdb/test_I_HostDB.cc
+++ b/iocore/hostdb/test_I_HostDB.cc
@@ -45,6 +45,5 @@ main()
hostDBProcessor.start();
-
this_ethread()->execute();
}
diff --git a/iocore/hostdb/test_P_HostDB.cc b/iocore/hostdb/test_P_HostDB.cc
index 2e34176..fc35658 100644
--- a/iocore/hostdb/test_P_HostDB.cc
+++ b/iocore/hostdb/test_P_HostDB.cc
@@ -41,7 +41,6 @@ struct NetTesterSM : public Continuation {
read_vio = vc->do_io_read(this, INT64_MAX, buf);
}
-
int
handle_read(int event, void *data)
{
diff --git a/iocore/net/Connection.cc b/iocore/net/Connection.cc
index ebdafd5..487f2c0 100644
--- a/iocore/net/Connection.cc
+++ b/iocore/net/Connection.cc
@@ -52,7 +52,6 @@ get_listen_backlog(void)
return listen_backlog >= 0 ? listen_backlog : ats_tcp_somaxconn();
}
-
//
// Functions
//
@@ -67,13 +66,11 @@ Connection::Connection() : fd(NO_FD), is_bound(false), is_connected(false), sock
memset(&addr, 0, sizeof(addr));
}
-
Connection::~Connection()
{
close();
}
-
int
Server::accept(Connection *c)
{
@@ -107,7 +104,6 @@ Lerror:
return res;
}
-
int
Connection::close()
{
@@ -296,7 +292,6 @@ Lerror:
return res;
}
-
int
Server::listen(bool non_blocking, int recv_bufsize, int send_bufsize, bool transparent)
{
diff --git a/iocore/net/I_NetProcessor.h b/iocore/net/I_NetProcessor.h
index 92de427..a6dffad 100644
--- a/iocore/net/I_NetProcessor.h
+++ b/iocore/net/I_NetProcessor.h
@@ -248,7 +248,6 @@ private:
NetProcessor &operator=(const NetProcessor &);
};
-
/**
Global NetProcessor singleton object for making net calls. All
net processor calls like connect, accept, etc are made using this
diff --git a/iocore/net/I_NetVConnection.h b/iocore/net/I_NetVConnection.h
index 2bbed80..4143357 100644
--- a/iocore/net/I_NetVConnection.h
+++ b/iocore/net/I_NetVConnection.h
@@ -175,9 +175,7 @@ struct NetVCOptions {
unsigned long _packet_tos = 0);
NetVCOptions() { reset(); }
-
~NetVCOptions() {}
-
/** Set the SNI server name.
A local copy is made of @a name.
*/
@@ -195,7 +193,8 @@ struct NetVCOptions {
return *this;
}
- self &operator=(self const &that)
+ self &
+ operator=(self const &that)
{
if (&that != this) {
sni_servername = NULL; // release any current name.
@@ -327,7 +326,6 @@ public:
*/
virtual void do_io_shutdown(ShutdownHowTo_t howto) = 0;
-
/**
Sends out of band messages over the connection. This function
is used to send out of band messages (is this still useful?).
@@ -518,7 +516,6 @@ public:
/// PRIVATE
virtual ~NetVConnection() {}
-
/**
PRIVATE: instances of NetVConnection cannot be created directly
by the state machines. The objects are created by NetProcessor
diff --git a/iocore/net/I_SessionAccept.h b/iocore/net/I_SessionAccept.h
index c6586ef..3d25b3d 100644
--- a/iocore/net/I_SessionAccept.h
+++ b/iocore/net/I_SessionAccept.h
@@ -31,9 +31,7 @@ class SessionAccept : public Continuation
{
public:
SessionAccept(ProxyMutex *amutex) : Continuation(amutex) { SET_HANDLER(&SessionAccept::mainEvent); }
-
~SessionAccept() {}
-
virtual void accept(NetVConnection *, MIOBuffer *, IOBufferReader *) = 0;
private:
diff --git a/iocore/net/I_Socks.h b/iocore/net/I_Socks.h
index 05535be..84c03b6 100644
--- a/iocore/net/I_Socks.h
+++ b/iocore/net/I_Socks.h
@@ -30,7 +30,6 @@
*/
#define SOCKS_WITH_TS
-
#define SOCKS_DEFAULT_VERSION 0 // defined the configuration variable
#define SOCKS4_VERSION 4
#define SOCKS5_VERSION 5
diff --git a/iocore/net/I_UDPPacket.h b/iocore/net/I_UDPPacket.h
index 2ececc1..15850f2 100644
--- a/iocore/net/I_UDPPacket.h
+++ b/iocore/net/I_UDPPacket.h
@@ -44,7 +44,6 @@ class UDPPacket
{
public:
virtual ~UDPPacket() {}
-
virtual void free(); // fast deallocate
void setContinuation(Continuation *c);
void setConnection(UDPConnection *c);
diff --git a/iocore/net/Net.cc b/iocore/net/Net.cc
index fbdf03d..b8af833 100644
--- a/iocore/net/Net.cc
+++ b/iocore/net/Net.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/************************************************************************
Net.cc
@@ -54,7 +53,6 @@ configure_net(void)
REC_ReadConfigInteger(net_accept_period, "proxy.config.net.accept_period");
}
-
static inline void
register_net_stats()
{
diff --git a/iocore/net/NetTest-http-server.c b/iocore/net/NetTest-http-server.c
index 5e17420..062d5e6 100644
--- a/iocore/net/NetTest-http-server.c
+++ b/iocore/net/NetTest-http-server.c
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
IOBufferBlock *resp_blk;
int doc_len;
@@ -33,7 +32,6 @@ struct NetTesterSM : public Continuation {
char request[2000];
int req_len;
-
NetTesterSM(ProxyMutex *_mutex, NetVConnection *_vc) : Continuation(_mutex)
{
MUTEX_TRY_LOCK(lock, mutex, _vc->thread);
@@ -51,7 +49,6 @@ struct NetTesterSM : public Continuation {
resp_reader = resp_buf->alloc_reader();
}
-
~NetTesterSM()
{
req_buf->dealloc_all_readers();
@@ -111,7 +108,6 @@ struct NetTesterSM : public Continuation {
return EVENT_CONT;
}
-
int
handle_write(int event, Event *e)
{
@@ -134,10 +130,8 @@ struct NetTesterSM : public Continuation {
}
};
-
struct NetTesterAccept : public Continuation {
NetTesterAccept(ProxyMutex *_mutex) : Continuation(_mutex) { SET_HANDLER(&NetTesterAccept::handle_accept); }
-
int
handle_accept(int event, void *data)
{
@@ -149,11 +143,9 @@ struct NetTesterAccept : public Continuation {
}
};
-
struct Stop : public Continuation {
Action *a;
Stop(ProxyMutex *m) : Continuation(m) { SET_HANDLER(&Stop::stop); }
-
int
stop(int event, Event *e)
{
@@ -162,7 +154,6 @@ struct Stop : public Continuation {
}
};
-
int
test_main()
{
diff --git a/iocore/net/NetVCTest.cc b/iocore/net/NetVCTest.cc
index 4d68eba..76bb196 100644
--- a/iocore/net/NetVCTest.cc
+++ b/iocore/net/NetVCTest.cc
@@ -80,7 +80,6 @@ NVC_test_def netvc_tests_def[] = {
};
const unsigned num_netvc_tests = countof(netvc_tests_def);
-
NetVCTest::NetVCTest()
: Continuation(NULL), test_cont_type(NET_VC_TEST_ACTIVE), test_vc(NULL), regress(NULL), driver(NULL), read_vio(NULL),
write_vio(NULL), read_buffer(NULL), write_buffer(NULL), reader_for_rbuf(NULL), reader_for_wbuf(NULL), write_bytes_to_add_per(0),
@@ -165,7 +164,6 @@ NetVCTest::start_test()
}
}
-
int
NetVCTest::fill_buffer(MIOBuffer *buf, uint8_t *seed, int bytes)
{
@@ -374,7 +372,6 @@ NetVCTest::main_handler(int event, void *data)
return 0;
}
-
NetTestDriver::NetTestDriver() : Continuation(NULL), errors(0), r(NULL), pstatus(NULL)
{
}
diff --git a/iocore/net/P_Connection.h b/iocore/net/P_Connection.h
index 34ff091..fdbd25f 100644
--- a/iocore/net/P_Connection.h
+++ b/iocore/net/P_Connection.h
@@ -113,7 +113,6 @@ struct Connection {
NetVCOptions const &opt = DEFAULT_OPTIONS ///< Socket options
);
-
/// Set the internal socket address struct.
/// @internal Used only by ICP.
void
diff --git a/iocore/net/P_InkBulkIO.h b/iocore/net/P_InkBulkIO.h
index 94b0809..5c30620 100644
--- a/iocore/net/P_InkBulkIO.h
+++ b/iocore/net/P_InkBulkIO.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _INK_BULK_IO_H
#define _INK_BULK_IO_H
@@ -74,7 +73,6 @@ typedef struct {
uint32_t freeBlockId[INKBIO_MAX_BLOCKS];
} InkBulkIOFreeBlockInfo_t;
-
/*
* Describes a packet to be sent. Found after a request header in a request block
*/
@@ -168,5 +166,4 @@ struct InkBulkIORequest {
(sizeof(struct InkBulkIORequest) + sizeof(struct InkBulkIOPkt) + sizeof(struct InkBulkIOAddrInfo))) / \
(sizeof(struct InkBulkIOPkt) + sizeof(struct InkBulkIOAddrInfo)))
-
#endif
diff --git a/iocore/net/P_LibBulkIO.h b/iocore/net/P_LibBulkIO.h
index 6ac0270..eb3c779 100644
--- a/iocore/net/P_LibBulkIO.h
+++ b/iocore/net/P_LibBulkIO.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _LIB_BULK_IO_H
#define _LIB_BULK_IO_H
diff --git a/iocore/net/P_NetAccept.h b/iocore/net/P_NetAccept.h
index 5cafbee..7f8fbbd 100644
--- a/iocore/net/P_NetAccept.h
+++ b/iocore/net/P_NetAccept.h
@@ -42,7 +42,6 @@
#include "ts/ink_platform.h"
#include "P_Connection.h"
-
struct NetAccept;
class Event;
//
@@ -67,12 +66,15 @@ struct NetAcceptAction : public Action, public RefCountObj {
server->close();
}
- Continuation *operator=(Continuation *acont) { return Action::operator=(acont); }
+ Continuation *
+ operator=(Continuation *acont)
+ {
+ return Action::operator=(acont);
+ }
~NetAcceptAction() { Debug("net_accept", "NetAcceptAction dying\n"); }
};
-
//
// NetAccept
// Handles accepting connections.
@@ -114,5 +116,4 @@ struct NetAccept : public Continuation {
virtual ~NetAccept() { action_ = NULL; };
};
-
#endif
diff --git a/iocore/net/P_NetVCTest.h b/iocore/net/P_NetVCTest.h
index 4677b3b..09d8068 100644
--- a/iocore/net/P_NetVCTest.h
+++ b/iocore/net/P_NetVCTest.h
@@ -43,7 +43,6 @@ class VIO;
class MIOBuffer;
class IOBufferReader;
-
enum NetVcTestType_t {
NET_VC_TEST_ACTIVE,
NET_VC_TEST_PASSIVE,
@@ -81,7 +80,6 @@ protected:
int *pstatus;
};
-
class NetVCTest : public Continuation
{
public:
@@ -144,5 +142,4 @@ public:
const char *debug_tag;
};
-
#endif
diff --git a/iocore/net/P_NetVConnection.h b/iocore/net/P_NetVConnection.h
index 6c9191c..e527545 100644
--- a/iocore/net/P_NetVConnection.h
+++ b/iocore/net/P_NetVConnection.h
@@ -40,7 +40,6 @@ NetVConnection::get_remote_ip()
return ats_is_ip4(addr) ? ats_ip4_addr_cast(addr) : 0;
}
-
/// @return The remote port in host order.
TS_INLINE uint16_t
NetVConnection::get_remote_port()
diff --git a/iocore/net/P_SSLCertLookup.h b/iocore/net/P_SSLCertLookup.h
index b3591ec..b408626 100644
--- a/iocore/net/P_SSLCertLookup.h
+++ b/iocore/net/P_SSLCertLookup.h
@@ -94,7 +94,6 @@ struct SSLCertLookup : public ConfigInfo {
*/
SSLCertContext *find(char const *name) const;
-
// Return the last-resort default TLS context if there is no name or address match.
SSL_CTX *
defaultContext() const
diff --git a/iocore/net/P_SSLConfig.h b/iocore/net/P_SSLConfig.h
index cef3ea3..a74c417 100644
--- a/iocore/net/P_SSLConfig.h
+++ b/iocore/net/P_SSLConfig.h
@@ -45,7 +45,6 @@ struct SSLCertLookup;
// configuration file.
/////////////////////////////////////////////////////////////
-
typedef void (*init_ssl_ctx_func)(void *, bool);
typedef void (*load_ssl_file_func)(const char *, unsigned int);
diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index b7882b0..543700d 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -132,7 +132,6 @@ public:
////////////////////////////////////////////////////////////
SSLNetVConnection();
virtual ~SSLNetVConnection() {}
-
SSL *ssl;
ink_hrtime sslHandshakeBeginTime;
ink_hrtime sslLastWriteTime;
@@ -228,7 +227,6 @@ public:
// Returns true if we have already called at
// least some of the hooks
bool calledHooks(TSHttpHookID /* eventId */) { return (this->sslHandshakeHookState != HANDSHAKE_HOOKS_PRE); }
-
bool
isEosRcvd()
{
diff --git a/iocore/net/P_UDPConnection.h b/iocore/net/P_UDPConnection.h
index bac1a83..4ee94f7 100644
--- a/iocore/net/P_UDPConnection.h
+++ b/iocore/net/P_UDPConnection.h
@@ -33,7 +33,6 @@
#include "I_UDPNet.h"
-
class UDPConnectionInternal : public UDPConnection
{
public:
@@ -79,7 +78,6 @@ UDPConnectionInternal::~UDPConnectionInternal()
mutex = NULL;
}
-
TS_INLINE SOCKET
UDPConnection::getFd()
{
diff --git a/iocore/net/P_UDPNet.h b/iocore/net/P_UDPNet.h
index fab6b71..9d45172 100644
--- a/iocore/net/P_UDPNet.h
+++ b/iocore/net/P_UDPNet.h
@@ -55,7 +55,6 @@ struct UDPNetProcessorInternal : public UDPNetProcessor {
extern UDPNetProcessorInternal udpNetInternal;
-
// 20 ms slots; 2048 slots => 40 sec. into the future
#define SLOT_TIME_MSEC 20
#define SLOT_TIME HRTIME_MSECONDS(SLOT_TIME_MSEC)
@@ -71,7 +70,6 @@ public:
}
virtual ~PacketQueue() {}
-
int nPackets;
ink_hrtime lastPullLongTermQ;
Queue<UDPPacketInternal> longTermQ;
@@ -281,7 +279,6 @@ private:
}
};
-
class UDPQueue
{
PacketQueue pipeInfo;
@@ -290,7 +287,6 @@ class UDPQueue
int packets;
int added;
-
public:
InkAtomicList atomicQueue;
@@ -306,7 +302,6 @@ public:
~UDPQueue();
};
-
void initialize_thread_for_udp_net(EThread *thread);
struct UDPNetHandler : public Continuation {
diff --git a/iocore/net/P_UDPPacket.h b/iocore/net/P_UDPPacket.h
index d926eef..8c6bd6a 100644
--- a/iocore/net/P_UDPPacket.h
+++ b/iocore/net/P_UDPPacket.h
@@ -28,7 +28,6 @@
****************************************************************************/
-
#ifndef __P_UDPPPACKET_H_
#define __P_UDPPPACKET_H_
diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h
index 5299c67..637577c 100644
--- a/iocore/net/P_UnixNet.h
+++ b/iocore/net/P_UnixNet.h
@@ -30,7 +30,6 @@
#define USE_EDGE_TRIGGER_KQUEUE 1
#define USE_EDGE_TRIGGER_PORT 1
-
#define EVENTIO_NETACCEPT 1
#define EVENTIO_READWRITE_VC 2
#define EVENTIO_DNS_CONNECTION 3
@@ -130,7 +129,6 @@ extern int fds_limit;
extern ink_hrtime last_transient_accept_error;
extern int http_accept_port_number;
-
//#define INACTIVITY_TIMEOUT
//
// Configuration Parameter had to move here to share
@@ -168,7 +166,6 @@ struct PollCont : public Continuation {
int pollEvent(int event, Event *e);
};
-
//
// NetHandler
//
@@ -238,7 +235,6 @@ get_PollDescriptor(EThread *t)
return p->pollDescriptor;
}
-
enum ThrottleType {
ACCEPT,
CONNECT,
@@ -326,7 +322,6 @@ check_emergency_throttle(Connection &con)
return false;
}
-
TS_INLINE int
change_net_connections_throttle(const char *token, RecDataT data_type, RecData value, void *data)
{
@@ -345,7 +340,6 @@ change_net_connections_throttle(const char *token, RecDataT data_type, RecData v
return 0;
}
-
// 1 - transient
// 0 - report as warning
// -1 - fatal
@@ -644,7 +638,6 @@ EventIO::refresh(int e)
#endif
}
-
TS_INLINE int
EventIO::stop()
{
diff --git a/iocore/net/P_UnixNetProcessor.h b/iocore/net/P_UnixNetProcessor.h
index d28bc76..092a7b5 100644
--- a/iocore/net/P_UnixNetProcessor.h
+++ b/iocore/net/P_UnixNetProcessor.h
@@ -61,7 +61,6 @@ public:
EThread **netthreads;
};
-
TS_INLINE Action *
NetProcessor::connect_re(Continuation *cont, sockaddr const *addr, NetVCOptions *opts)
{
diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h
index 722434d..9b10cbf 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -320,7 +320,6 @@ extern ClassAllocator<UnixNetVConnection> netVCAllocator;
typedef int (UnixNetVConnection::*NetVConnHandler)(int, void *);
-
TS_INLINE void
UnixNetVConnection::set_remote_addr()
{
diff --git a/iocore/net/P_UnixPollDescriptor.h b/iocore/net/P_UnixPollDescriptor.h
index ddd5147..05e5f0b 100644
--- a/iocore/net/P_UnixPollDescriptor.h
+++ b/iocore/net/P_UnixPollDescriptor.h
@@ -61,7 +61,6 @@ struct PollDescriptor {
#endif
PollDescriptor() { init(); }
-
#if TS_USE_EPOLL
#define get_ev_port(a) ((a)->epoll_fd)
#define get_ev_events(a, x) ((a)->ePoll_Triggered_Events[(x)].events)
diff --git a/iocore/net/P_UnixUDPConnection.h b/iocore/net/P_UnixUDPConnection.h
index 9f6a079..c482020 100644
--- a/iocore/net/P_UnixUDPConnection.h
+++ b/iocore/net/P_UnixUDPConnection.h
@@ -107,7 +107,6 @@ UDPConnection::recv(Continuation *c)
return ACTION_RESULT_NONE;
}
-
TS_INLINE UDPConnection *
new_UDPConnection(int fd)
{
diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc
index c7f3a8f..5a865ae 100644
--- a/iocore/net/SSLCertLookup.cc
+++ b/iocore/net/SSLCertLookup.cc
@@ -241,7 +241,6 @@ struct ats_wildcard_matcher {
}
~ats_wildcard_matcher() {}
-
bool
match(const char *hostname) const
{
@@ -253,7 +252,7 @@ private:
};
static char *
-reverse_dns_name(const char *hostname, char(&reversed)[TS_MAX_HOST_NAME_LEN + 1])
+reverse_dns_name(const char *hostname, char (&reversed)[TS_MAX_HOST_NAME_LEN + 1])
{
char *ptr = reversed + sizeof(reversed);
const char *part = hostname;
diff --git a/iocore/net/SSLNetProcessor.cc b/iocore/net/SSLNetProcessor.cc
index a79f374..7203dc7 100644
--- a/iocore/net/SSLNetProcessor.cc
+++ b/iocore/net/SSLNetProcessor.cc
@@ -94,7 +94,6 @@ SSLNetProcessor::start(int number_of_ssl_threads, size_t stacksize)
}
#endif /* HAVE_OPENSSL_OCSP_STAPLING */
-
if (number_of_ssl_threads == -1) {
// We've disabled ET_SSL threads, so we will mark all ET_NET threads as having
// ET_SSL thread capabilities and just keep on chugging.
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 46a27c2..df241a2 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -41,7 +41,7 @@ void SSL_set_rbio(SSL *ssl, BIO *rbio);
// This is missing from BoringSSL
#ifndef BIO_eof
-#define BIO_eof(b) (int) BIO_ctrl(b, BIO_CTRL_EOF, 0, NULL)
+#define BIO_eof(b) (int)BIO_ctrl(b, BIO_CTRL_EOF, 0, NULL)
#endif
#define SSL_READ_ERROR_NONE 0
@@ -230,7 +230,6 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
origin_trace_ip, sslvc->origin_trace_port, (int)nread, (int)nread, b->end() + offset);
}
-
switch (sslErr) {
case SSL_ERROR_NONE:
@@ -406,7 +405,6 @@ SSLNetVConnection::read_raw_data()
return r;
}
-
// changed by YTS Team, yamsat
void
SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
@@ -656,7 +654,6 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
}
}
-
int64_t
SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted, int64_t &total_written, MIOBufferAccessor &buf,
int &needs)
@@ -975,7 +972,6 @@ SSLNetVConnection::sslStartHandShake(int event, int &err)
return EVENT_DONE;
}
-
// Attach the default SSL_CTX to this SSL session. The default context is never going to be able
// to negotiate a SSL session, but it's enough to trampoline us into the SNI callback where we
// can select the right server certificate.
@@ -1234,7 +1230,6 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
}
}
-
int
SSLNetVConnection::sslClientHandShakeEvent(int &err)
{
@@ -1318,7 +1313,6 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
return EVENT_ERROR;
break;
-
case SSL_ERROR_SSL:
default: {
err = errno;
@@ -1419,7 +1413,6 @@ SSLNetVConnection::reenable(NetHandler *nh)
}
}
-
bool
SSLNetVConnection::sslContextSet(void *ctx)
{
diff --git a/iocore/net/SSLSessionCache.h b/iocore/net/SSLSessionCache.h
index 313d002..db80bc9 100644
--- a/iocore/net/SSLSessionCache.h
+++ b/iocore/net/SSLSessionCache.h
@@ -53,7 +53,8 @@ struct SSLSessionID {
len = other.len;
}
- bool operator<(const SSLSessionID &other) const
+ bool
+ operator<(const SSLSessionID &other) const
{
if (len != other.len)
return len < other.len;
@@ -61,7 +62,8 @@ struct SSLSessionID {
return (memcmp(bytes, other.bytes, len) < 0);
}
- SSLSessionID &operator=(const SSLSessionID &other)
+ SSLSessionID &
+ operator=(const SSLSessionID &other)
{
if (other.len)
memcpy(bytes, other.bytes, other.len);
@@ -70,7 +72,8 @@ struct SSLSessionID {
return *this;
}
- bool operator==(const SSLSessionID &other) const
+ bool
+ operator==(const SSLSessionID &other) const
{
if (len != other.len)
return false;
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index da7f176..0c419b9 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -93,7 +93,6 @@ typedef SSL_METHOD *ink_ssl_method_t;
// gather user provided settings from ssl_multicert.config in to a single struct
struct ssl_user_config {
ssl_user_config() : session_ticket_enabled(1), opt(SSLCertContext::OPT_NONE) {}
-
int session_ticket_enabled; // ssl_ticket_enabled - session ticket enabled
ats_scoped_str addr; // dest_ip - IPv[64] address to match
ats_scoped_str cert; // ssl_cert_name - certificate
@@ -121,7 +120,6 @@ static int ssl_callback_session_ticket(SSL *, unsigned char *, unsigned char *,
static int ssl_session_ticket_index = -1;
#endif
-
static ink_mutex *mutex_buf = NULL;
static bool open_ssl_initialized = false;
@@ -162,7 +160,6 @@ SSL_locking_callback(int mode, int type, const char *file, int line)
}
}
-
static bool
SSL_CTX_add_extra_chain_cert_file(SSL_CTX *ctx, const char *chainfile)
{
@@ -1171,9 +1168,9 @@ SSLDiagnostic(const SrcLoc &loc, bool debug, SSLNetVConnection *vc, const char *
const char *
SSLErrorName(int ssl_error)
{
- static const char *names[] = {"SSL_ERROR_NONE", "SSL_ERROR_SSL", "SSL_ERROR_WANT_READ", "SSL_ERROR_WANT_WRITE",
- "SSL_ERROR_WANT_X509_LOOKUP", "SSL_ERROR_SYSCALL", "SSL_ERROR_ZERO_RETURN",
- "SSL_ERROR_WANT_CONNECT", "SSL_ERROR_WANT_ACCEPT"};
+ static const char *names[] = {
+ "SSL_ERROR_NONE", "SSL_ERROR_SSL", "SSL_ERROR_WANT_READ", "SSL_ERROR_WANT_WRITE", "SSL_ERROR_WANT_X509_LOOKUP",
+ "SSL_ERROR_SYSCALL", "SSL_ERROR_ZERO_RETURN", "SSL_ERROR_WANT_CONNECT", "SSL_ERROR_WANT_ACCEPT"};
if (ssl_error < 0 || ssl_error >= (int)countof(names)) {
return "unknown SSL error";
@@ -1284,7 +1281,6 @@ SSLCheckServerCertNow(X509 *cert, const char *certname)
} /* CheckServerCertNow() */
-
SSL_CTX *
SSLInitServerContext(const SSLConfigParams *params, const ssl_user_config &sslMultCertSettings, Vec<X509 *> &certList)
{
@@ -1733,7 +1729,6 @@ ssl_store_ssl_context(const SSLConfigParams *params, SSLCertLookup *lookup, cons
keyblock = ssl_context_enable_tickets(ctx, NULL);
}
-
// Index this certificate by the specified IP(v6) address. If the address is "*", make it the default context.
if (sslMultCertSettings.addr) {
if (strcmp(sslMultCertSettings.addr, "*") == 0) {
@@ -1764,7 +1759,6 @@ ssl_store_ssl_context(const SSLConfigParams *params, SSLCertLookup *lookup, cons
#endif
}
-
#if defined(SSL_OP_NO_TICKET)
// Session tickets are enabled by default. Disable if explicitly requested.
if (sslMultCertSettings.session_ticket_enabled == 0) {
diff --git a/iocore/net/UnixConnection.cc b/iocore/net/UnixConnection.cc
index e0aaef3..57aecd1 100644
--- a/iocore/net/UnixConnection.cc
+++ b/iocore/net/UnixConnection.cc
@@ -102,7 +102,6 @@ Lerror:
return res;
}
-
int
Connection::setup_mc_receive(sockaddr const *mc_addr, sockaddr const *my_addr, bool non_blocking, Connection *sendChan,
Continuation *c)
diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
index 28185f7..d749844 100644
--- a/iocore/net/UnixNet.cc
+++ b/iocore/net/UnixNet.cc
@@ -33,7 +33,6 @@ ink_hrtime last_transient_accept_error;
extern "C" void fd_reify(struct ev_loop *);
-
#ifndef INACTIVITY_TIMEOUT
int update_cop_config(const char *name, RecDataT data_type, RecData data, void *cookie);
@@ -293,7 +292,6 @@ NetHandler::NetHandler() : Continuation(NULL), trigger_event(0), keep_alive_queu
SET_HANDLER((NetContHandler)&NetHandler::startNetEvent);
}
-
int
update_nethandler_config(const char *name, RecDataT data_type ATS_UNUSED, RecData data, void *cookie)
{
@@ -333,7 +331,6 @@ update_nethandler_config(const char *name, RecDataT data_type ATS_UNUSED, RecDat
return REC_ERR_OKAY;
}
-
//
// Initialization here, in the thread in which we will be executing
// from now on.
@@ -396,7 +393,6 @@ NetHandler::process_enabled_list(NetHandler *nh)
}
}
-
//
// The main event for NetHandler
// This is called every proxy.config.net.event_period, and handles all IO operations scheduled
diff --git a/iocore/net/UnixNetAccept.cc b/iocore/net/UnixNetAccept.cc
index 835d17f..798822f 100644
--- a/iocore/net/UnixNetAccept.cc
+++ b/iocore/net/UnixNetAccept.cc
@@ -38,7 +38,6 @@ safe_delay(int msec)
socketManager.poll(0, 0, msec);
}
-
//
// Send the throttling message to up to THROTTLE_AT_ONCE connections,
// delaying to let some of the current connections complete
@@ -72,7 +71,6 @@ send_throttle_message(NetAccept *na)
return 0;
}
-
//
// General case network connection accept code
//
@@ -149,7 +147,6 @@ NetAccept::init_accept_loop(const char *thr_name)
eventProcessor.spawn_thread(this, thr_name, stacksize);
}
-
//
// Initialize the NetAccept for execution in a etype thread.
// This should be done for low connection rate sockets.
@@ -174,7 +171,6 @@ NetAccept::init_accept(EThread *t, bool isTransparent)
t->schedule_every(this, period, etype);
}
-
void
NetAccept::init_accept_per_thread(bool isTransparent)
{
@@ -300,7 +296,6 @@ NetAccept::do_blocking_accept(EThread *t)
return 1;
}
-
int
NetAccept::acceptEvent(int event, void *ep)
{
@@ -342,7 +337,6 @@ NetAccept::acceptEvent(int event, void *ep)
return EVENT_CONT;
}
-
int
NetAccept::acceptFastEvent(int event, void *ep)
{
@@ -482,7 +476,6 @@ Lerror:
return EVENT_DONE;
}
-
int
NetAccept::acceptLoopEvent(int event, Event *e)
{
@@ -499,7 +492,6 @@ NetAccept::acceptLoopEvent(int event, Event *e)
return EVENT_DONE;
}
-
//
// Accept Event handler
//
@@ -511,7 +503,6 @@ NetAccept::NetAccept()
{
}
-
//
// Stop listening. When the next poll takes place, an error will result.
// THIS ONLY WORKS WITH POLLING STYLE ACCEPTS!
diff --git a/iocore/net/UnixNetProcessor.cc b/iocore/net/UnixNetProcessor.cc
index 37e210e..e2c6268 100644
--- a/iocore/net/UnixNetProcessor.cc
+++ b/iocore/net/UnixNetProcessor.cc
@@ -51,7 +51,6 @@ NetProcessor::AcceptOptions::reset()
return *this;
}
-
int net_connection_number = 1;
unsigned int
@@ -324,7 +323,6 @@ struct CheckConnect : public Continuation {
vc->write.vio.op = VIO::NONE;
vc->write.vio.buffer.clear();
-
action_.continuation->handleEvent(NET_EVENT_OPEN, vc);
delete this;
return EVENT_DONE;
@@ -389,7 +387,6 @@ NetProcessor::connect_s(Continuation *cont, sockaddr const *target, int timeout,
return c->connect_s(cont, target, timeout, opt);
}
-
struct PollCont;
// This is a little odd, in that the actual threads are created before calling the processor.
@@ -439,7 +436,6 @@ UnixNetProcessor::start(int, size_t)
if (!accept_thread_event) delete na;
} */
-
/*
* Stat pages
*/
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 3da42ab..8d12823 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -405,7 +405,6 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
read_reschedule(nh, vc);
}
-
//
// Write the data for a UnixNetVConnection.
// Rescheduling the UnixNetVConnection when necessary.
@@ -418,11 +417,9 @@ write_to_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
NET_INCREMENT_DYN_STAT(net_calls_to_writetonet_stat);
NET_INCREMENT_DYN_STAT(net_calls_to_writetonet_afterpoll_stat);
-
write_to_net_io(nh, vc, thread);
}
-
void
write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
{
@@ -884,7 +881,6 @@ UnixNetVConnection::reenable_re(VIO *vio)
reenable(vio);
}
-
UnixNetVConnection::UnixNetVConnection()
: closed(0), inactivity_timeout_in(0), active_timeout_in(0),
#ifdef INACTIVITY_TIMEOUT
@@ -1019,7 +1015,6 @@ UnixNetVConnection::readSignalDone(int event, NetHandler *nh)
return (read_signal_done(event, nh, this));
}
-
int
UnixNetVConnection::readSignalAndUpdate(int event)
{
@@ -1313,7 +1308,6 @@ fail:
return CONNECT_FAILURE;
}
-
void
UnixNetVConnection::free(EThread *t)
{
diff --git a/iocore/net/UnixUDPNet.cc b/iocore/net/UnixUDPNet.cc
index 3c460b2..856c514 100644
--- a/iocore/net/UnixUDPNet.cc
+++ b/iocore/net/UnixUDPNet.cc
@@ -146,7 +146,6 @@ UDPNetProcessorInternal::udp_read_from_net(UDPNetHandler *nh, UDPConnection *xuc
}
}
-
int
UDPNetProcessorInternal::udp_callback(UDPNetHandler *nh, UDPConnection *xuc, EThread *thread)
{
@@ -504,7 +503,6 @@ UDPNetProcessor::sendto_re(Continuation *cont, void *token, int fd, struct socka
}
}
-
bool
UDPNetProcessor::CreateUDPSocket(int *resfd, sockaddr const *remote_addr, sockaddr *local_addr, int *local_addr_len,
Action **status, int send_bufsize, int recv_bufsize)
@@ -558,7 +556,6 @@ HardError:
return false;
}
-
Action *
UDPNetProcessor::UDPBind(Continuation *cont, sockaddr const *addr, int send_bufsize, int recv_bufsize)
{
@@ -613,7 +610,6 @@ Lerror:
return ACTION_IO_ERROR;
}
-
// send out all packets that need to be sent out as of time=now
UDPQueue::UDPQueue() : last_report(0), last_service(0), packets(0), added(0)
{
@@ -782,7 +778,6 @@ UDPQueue::SendUDPPacket(UDPPacketInternal *p, int32_t /* pktLen ATS_UNUSED */)
}
}
-
void
UDPQueue::send(UDPPacket *p)
{
diff --git a/iocore/net/test_I_Net.cc b/iocore/net/test_I_Net.cc
index 75ef7bf..08b3fb0 100644
--- a/iocore/net/test_I_Net.cc
+++ b/iocore/net/test_I_Net.cc
@@ -32,7 +32,6 @@
//#include "NetTest-http-server.c"
#include "NetTest-simple-proxy.c"
-
int
main()
{
@@ -42,13 +41,11 @@ main()
RecModeT mode_type = RECM_STAND_ALONE;
-
init_diags("net_test", NULL);
RecProcessInit(mode_type);
ink_event_system_init(EVENT_SYSTEM_MODULE_VERSION);
ink_net_init(NET_SYSTEM_MODULE_VERSION);
-
/*
* ignore broken pipe
*/
diff --git a/iocore/net/test_P_Net.cc b/iocore/net/test_P_Net.cc
index 87b7736..e338842 100644
--- a/iocore/net/test_P_Net.cc
+++ b/iocore/net/test_P_Net.cc
@@ -41,7 +41,6 @@ struct NetTesterSM : public Continuation {
read_vio = vc->do_io_read(this, INT64_MAX, buf);
}
-
int
handle_read(int event, void *data)
{
@@ -73,10 +72,8 @@ struct NetTesterSM : public Continuation {
}
};
-
struct NetTesterAccept : public Continuation {
NetTesterAccept(ProxyMutex *_mutex) : Continuation(_mutex) { SET_HANDLER(&NetTesterAccept::handle_accept); }
-
int
handle_accept(int event, void *data)
{
@@ -88,7 +85,6 @@ struct NetTesterAccept : public Continuation {
}
};
-
int
main()
{
diff --git a/iocore/utils/I_Machine.h b/iocore/utils/I_Machine.h
index 8414f3d..e74a43b 100644
--- a/iocore/utils/I_Machine.h
+++ b/iocore/utils/I_Machine.h
@@ -33,7 +33,6 @@
#include "ts/ink_inet.h"
-
/**
The Machine is a simple place holder for the hostname and the ip
address of an internet host.
diff --git a/iocore/utils/OneWayTunnel.cc b/iocore/utils/OneWayTunnel.cc
index cf2704f..cd642bb 100644
--- a/iocore/utils/OneWayTunnel.cc
+++ b/iocore/utils/OneWayTunnel.cc
@@ -199,7 +199,6 @@ OneWayTunnel::init(Continuation *aCont, VIO *SourceVio, VIO *TargetVio, bool acl
vioTarget = TargetVio;
}
-
void
OneWayTunnel::transform(MIOBufferAccessor &in_buf, MIOBufferAccessor &out_buf)
{
diff --git a/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc b/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
index ea4ede7..968bb3a 100644
--- a/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
+++ b/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/TransactionPlugin.h>
#include <atscppapi/Logger.h>
@@ -70,7 +69,6 @@ public:
return getDispatchController()->isEnabled();
}
~DelayedAsyncHttpFetch() { delete timer_; }
-
private:
shared_ptr<Mutex> mutex_;
AsyncTimer *timer_;
diff --git a/lib/atscppapi/examples/async_http_fetch_streaming/AsyncHttpFetchStreaming.cc b/lib/atscppapi/examples/async_http_fetch_streaming/AsyncHttpFetchStreaming.cc
index a1a9d19..6d29f1d 100644
--- a/lib/atscppapi/examples/async_http_fetch_streaming/AsyncHttpFetchStreaming.cc
+++ b/lib/atscppapi/examples/async_http_fetch_streaming/AsyncHttpFetchStreaming.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/InterceptPlugin.h>
#include <atscppapi/Logger.h>
diff --git a/lib/atscppapi/examples/async_timer/AsyncTimer.cc b/lib/atscppapi/examples/async_timer/AsyncTimer.cc
index e79d538..1da4642 100644
--- a/lib/atscppapi/examples/async_timer/AsyncTimer.cc
+++ b/lib/atscppapi/examples/async_timer/AsyncTimer.cc
@@ -48,7 +48,6 @@ public:
}
~TimerEventReceiver() { delete timer_; }
-
private:
int max_instances_;
int instance_count_;
diff --git a/lib/atscppapi/examples/boom/boom.cc b/lib/atscppapi/examples/boom/boom.cc
index 45954a3..6c0f76e 100644
--- a/lib/atscppapi/examples/boom/boom.cc
+++ b/lib/atscppapi/examples/boom/boom.cc
@@ -110,7 +110,8 @@ public:
current_code_string_ = oss.str();
}
- bool operator()(const std::string &code) const
+ bool
+ operator()(const std::string &code) const
{
TS_DEBUG(TAG, "Checking if %s matches code %s", current_code_string_.c_str(), code.c_str());
if (code == current_code_string_)
@@ -178,7 +179,6 @@ public:
void register_error_codes(const std::vector<std::string> &error_codes);
};
-
void
BoomResponseRegistry::register_error_codes(const std::vector<std::string> &error_codes)
{
diff --git a/lib/atscppapi/examples/clientredirect/ClientRedirect.cc b/lib/atscppapi/examples/clientredirect/ClientRedirect.cc
index 2fa21c6..c59011f 100644
--- a/lib/atscppapi/examples/clientredirect/ClientRedirect.cc
+++ b/lib/atscppapi/examples/clientredirect/ClientRedirect.cc
@@ -28,7 +28,6 @@ using std::endl;
using std::list;
using std::string;
-
class ClientRedirectTransactionPlugin : public atscppapi::TransactionPlugin
{
public:
@@ -53,17 +52,14 @@ public:
}
virtual ~ClientRedirectTransactionPlugin() {}
-
private:
string location_;
};
-
class ClientRedirectGlobalPlugin : public GlobalPlugin
{
public:
ClientRedirectGlobalPlugin() { registerHook(HOOK_SEND_REQUEST_HEADERS); }
-
void
handleSendRequestHeaders(Transaction &transaction)
{
diff --git a/lib/atscppapi/examples/clientrequest/ClientRequest.cc b/lib/atscppapi/examples/clientrequest/ClientRequest.cc
index 5829d3d..449df73 100644
--- a/lib/atscppapi/examples/clientrequest/ClientRequest.cc
+++ b/lib/atscppapi/examples/clientrequest/ClientRequest.cc
@@ -38,7 +38,6 @@ public:
registerHook(HOOK_SEND_REQUEST_HEADERS);
}
-
void
handleReadRequestHeadersPreRemap(Transaction &transaction)
{
@@ -64,7 +63,6 @@ public:
transaction.resume();
}
-
void
handleReadRequestHeadersPostRemap(Transaction &transaction)
{
diff --git a/lib/atscppapi/examples/custom_error_remap_plugin/CustomErrorRemapPlugin.cc b/lib/atscppapi/examples/custom_error_remap_plugin/CustomErrorRemapPlugin.cc
index 7d29b60..b56cb64 100644
--- a/lib/atscppapi/examples/custom_error_remap_plugin/CustomErrorRemapPlugin.cc
+++ b/lib/atscppapi/examples/custom_error_remap_plugin/CustomErrorRemapPlugin.cc
@@ -27,7 +27,6 @@ class MyRemapPlugin : public RemapPlugin
{
public:
MyRemapPlugin(void **instance_handle) : RemapPlugin(instance_handle) {}
-
Result
doRemap(const Url &map_from_url, const Url &map_to_url, Transaction &transaction, bool &redirect)
{
diff --git a/lib/atscppapi/examples/customresponse/CustomResponse.cc b/lib/atscppapi/examples/customresponse/CustomResponse.cc
index 10014ed..d839a39 100644
--- a/lib/atscppapi/examples/customresponse/CustomResponse.cc
+++ b/lib/atscppapi/examples/customresponse/CustomResponse.cc
@@ -56,19 +56,16 @@ public:
}
virtual ~CustomResponseTransactionPlugin() {}
-
private:
HttpStatus status_;
string reason_;
string body_;
};
-
class ClientRedirectGlobalPlugin : public GlobalPlugin
{
public:
ClientRedirectGlobalPlugin() { registerHook(HOOK_SEND_REQUEST_HEADERS); }
-
void
handleSendRequestHeaders(Transaction &transaction)
{
diff --git a/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc b/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc
index f9bfc67..044e422 100644
--- a/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc
+++ b/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc
@@ -28,7 +28,6 @@ class GlobalHookPlugin : public GlobalPlugin
{
public:
GlobalHookPlugin() { registerHook(HOOK_READ_REQUEST_HEADERS_PRE_REMAP); }
-
virtual void
handleReadRequestHeadersPreRemap(Transaction &transaction)
{
diff --git a/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc b/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc
index 5e621e2..b9f80b2 100644
--- a/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc
+++ b/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc
@@ -120,7 +120,6 @@ public:
}
virtual ~SomeTransformationPlugin() {}
-
private:
Transaction &transaction_;
};
diff --git a/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc b/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc
index ba412d7..83efec0 100644
--- a/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc
+++ b/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <iostream>
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/PluginInit.h>
diff --git a/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc b/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc
index 3e4e308..9a53e0a 100644
--- a/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc
+++ b/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/Logger.h>
#include <atscppapi/PluginInit.h>
diff --git a/lib/atscppapi/examples/logger_example/LoggerExample.cc b/lib/atscppapi/examples/logger_example/LoggerExample.cc
index 1e53f7b..52c610c 100644
--- a/lib/atscppapi/examples/logger_example/LoggerExample.cc
+++ b/lib/atscppapi/examples/logger_example/LoggerExample.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
/**
* @warning log rolling doesn't work correctly in 3.2.x, see:
* https://issues.apache.org/jira/browse/TS-1813, Apply the patch in
diff --git a/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc b/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc
index d32d22c..c513946 100644
--- a/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc
+++ b/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <iostream>
#include <vector>
#include <atscppapi/GlobalPlugin.h>
@@ -35,7 +34,6 @@ public:
}
virtual ~MultipleTransactionHookPluginsOne() { std::cout << "Destroyed MultipleTransactionHookPluginsOne!" << std::endl; }
-
void
handleSendResponseHeaders(Transaction &transaction)
{
@@ -55,7 +53,6 @@ public:
}
virtual ~MultipleTransactionHookPluginsTwo() { std::cout << "Destroyed MultipleTransactionHookPluginsTwo!" << std::endl; }
-
void
handleSendRequestHeaders(Transaction &transaction)
{
@@ -85,7 +82,6 @@ class GlobalHookPlugin : public atscppapi::GlobalPlugin
{
public:
GlobalHookPlugin() { GlobalPlugin::registerHook(HOOK_READ_REQUEST_HEADERS_PRE_REMAP); }
-
virtual void
handleReadRequestHeadersPreRemap(Transaction &transaction)
{
diff --git a/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc b/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc
index 5867863..cf5cb14 100644
--- a/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc
+++ b/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc
@@ -68,7 +68,6 @@ public:
}
virtual ~NullTransformationPlugin() {}
-
private:
};
diff --git a/lib/atscppapi/examples/post_buffer/PostBuffer.cc b/lib/atscppapi/examples/post_buffer/PostBuffer.cc
index 53e2bf7..23c0198 100644
--- a/lib/atscppapi/examples/post_buffer/PostBuffer.cc
+++ b/lib/atscppapi/examples/post_buffer/PostBuffer.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <iostream>
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/TransactionPlugin.h>
@@ -52,7 +51,6 @@ public:
}
virtual ~PostBufferTransformationPlugin() {}
-
private:
Transaction &transaction_;
string buffer_;
@@ -62,7 +60,6 @@ class GlobalHookPlugin : public GlobalPlugin
{
public:
GlobalHookPlugin() { registerHook(HOOK_READ_REQUEST_HEADERS_POST_REMAP); }
-
virtual void
handleReadRequestHeadersPostRemap(Transaction &transaction)
{
diff --git a/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc b/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
index b04c4fe..08c6947 100644
--- a/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
+++ b/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <atscppapi/RemapPlugin.h>
#include <atscppapi/PluginInit.h>
#include <atscppapi/Logger.h>
@@ -33,7 +32,6 @@ class MyRemapPlugin : public RemapPlugin
{
public:
MyRemapPlugin(void **instance_handle) : RemapPlugin(instance_handle) {}
-
Result
doRemap(const Url &map_from_url, const Url &map_to_url, Transaction &transaction, bool &redirect)
{
diff --git a/lib/atscppapi/examples/stat_example/StatExample.cc b/lib/atscppapi/examples/stat_example/StatExample.cc
index 4878c47..fcf4d5b 100644
--- a/lib/atscppapi/examples/stat_example/StatExample.cc
+++ b/lib/atscppapi/examples/stat_example/StatExample.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/Logger.h>
#include <atscppapi/Stat.h>
diff --git a/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc b/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc
index 2ee158e..d28c604 100644
--- a/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc
+++ b/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <iostream>
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/Logger.h>
diff --git a/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc b/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc
index dd96b99..6fdc54f 100644
--- a/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc
+++ b/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <iostream>
#include <atscppapi/GlobalPlugin.h>
#include <atscppapi/TransactionPlugin.h>
diff --git a/lib/atscppapi/src/CaseInsensitiveStringComparator.cc b/lib/atscppapi/src/CaseInsensitiveStringComparator.cc
index 67eaaed..3c8b804 100644
--- a/lib/atscppapi/src/CaseInsensitiveStringComparator.cc
+++ b/lib/atscppapi/src/CaseInsensitiveStringComparator.cc
@@ -30,7 +30,8 @@ using std::string;
* This class should eventually be removed, but because it's in a public API we cannot remove
* it until the next major release.
*/
-bool CaseInsensitiveStringComparator::operator()(const string &lhs, const string &rhs) const
+bool
+CaseInsensitiveStringComparator::operator()(const string &lhs, const string &rhs) const
{
return (compare(lhs, rhs) < 0);
}
diff --git a/lib/atscppapi/src/GzipDeflateTransformation.cc b/lib/atscppapi/src/GzipDeflateTransformation.cc
index 3bc8a11..6200bf6 100644
--- a/lib/atscppapi/src/GzipDeflateTransformation.cc
+++ b/lib/atscppapi/src/GzipDeflateTransformation.cc
@@ -69,7 +69,6 @@ struct atscppapi::transformations::GzipDeflateTransformationState : noncopyable
};
};
-
GzipDeflateTransformation::GzipDeflateTransformation(Transaction &transaction, TransformationPlugin::Type type)
: TransformationPlugin(transaction, type)
{
diff --git a/lib/atscppapi/src/GzipInflateTransformation.cc b/lib/atscppapi/src/GzipInflateTransformation.cc
index 31b6473..64531b3 100644
--- a/lib/atscppapi/src/GzipInflateTransformation.cc
+++ b/lib/atscppapi/src/GzipInflateTransformation.cc
@@ -72,7 +72,6 @@ struct atscppapi::transformations::GzipInflateTransformationState : noncopyable
};
};
-
GzipInflateTransformation::GzipInflateTransformation(Transaction &transaction, TransformationPlugin::Type type)
: TransformationPlugin(transaction, type)
{
diff --git a/lib/atscppapi/src/Headers.cc b/lib/atscppapi/src/Headers.cc
index ee7fba3..41f8a89 100644
--- a/lib/atscppapi/src/Headers.cc
+++ b/lib/atscppapi/src/Headers.cc
@@ -72,22 +72,26 @@ HeaderFieldName::c_str()
return name_.c_str();
}
-bool HeaderFieldName::operator==(const char *field_name)
+bool
+HeaderFieldName::operator==(const char *field_name)
{
return (::strcasecmp(c_str(), field_name) == 0);
}
-bool HeaderFieldName::operator==(const std::string &field_name)
+bool
+HeaderFieldName::operator==(const std::string &field_name)
{
return operator==(field_name.c_str());
}
-bool HeaderFieldName::operator!=(const char *field_name)
+bool
+HeaderFieldName::operator!=(const char *field_name)
{
return !operator==(field_name);
}
-bool HeaderFieldName::operator!=(const std::string &field_name)
+bool
+HeaderFieldName::operator!=(const std::string &field_name)
{
return !operator==(field_name.c_str());
}
@@ -153,13 +157,15 @@ header_field_value_iterator header_field_value_iterator::operator++(int)
return tmp;
}
-bool header_field_value_iterator::operator==(const header_field_value_iterator &rhs) const
+bool
+header_field_value_iterator::operator==(const header_field_value_iterator &rhs) const
{
return (state_->hdr_buf_ == rhs.state_->hdr_buf_) && (state_->hdr_loc_ == rhs.state_->hdr_loc_) &&
(state_->field_loc_ == rhs.state_->field_loc_) && (state_->index_ == rhs.state_->index_);
}
-bool header_field_value_iterator::operator!=(const header_field_value_iterator &rhs) const
+bool
+header_field_value_iterator::operator!=(const header_field_value_iterator &rhs) const
{
return !operator==(rhs);
}
@@ -312,27 +318,32 @@ HeaderField::setName(const std::string &str)
iter_.state_->mloc_container_->field_loc_, str.c_str(), str.length()) == TS_SUCCESS);
}
-bool HeaderField::operator==(const char *field_name) const
+bool
+HeaderField::operator==(const char *field_name) const
{
return (::strcasecmp(name(), field_name) == 0);
}
-bool HeaderField::operator==(const std::string &field_name) const
+bool
+HeaderField::operator==(const std::string &field_name) const
{
return operator==(field_name.c_str());
}
-bool HeaderField::operator!=(const char *field_name) const
+bool
+HeaderField::operator!=(const char *field_name) const
{
return !operator==(field_name);
}
-bool HeaderField::operator!=(const std::string &field_name) const
+bool
+HeaderField::operator!=(const std::string &field_name) const
{
return !operator==(field_name.c_str());
}
-bool HeaderField::operator=(const std::string &field_value)
+bool
+HeaderField::operator=(const std::string &field_value)
{
if (!clear())
return false;
@@ -340,7 +351,8 @@ bool HeaderField::operator=(const std::string &field_value)
return append(field_value);
}
-bool HeaderField::operator=(const char *field_value)
+bool
+HeaderField::operator=(const char *field_value)
{
if (!clear())
return false;
@@ -362,7 +374,8 @@ HeaderField::str()
return oss.str();
}
-std::ostream &operator<<(std::ostream &os, HeaderField &obj)
+std::ostream &
+operator<<(std::ostream &os, HeaderField &obj)
{
os << obj.name() << ": ";
int count = obj.size();
@@ -384,7 +397,8 @@ header_field_iterator::header_field_iterator(const header_field_iterator &it) :
{
}
-header_field_iterator &header_field_iterator::operator=(const header_field_iterator &rhs)
+header_field_iterator &
+header_field_iterator::operator=(const header_field_iterator &rhs)
{
if (this != &rhs) {
delete state_;
@@ -432,14 +446,16 @@ header_field_iterator::nextDup()
return *this;
}
-bool header_field_iterator::operator==(const header_field_iterator &rhs) const
+bool
+header_field_iterator::operator==(const header_field_iterator &rhs) const
{
return (state_->mloc_container_->hdr_buf_ == rhs.state_->mloc_container_->hdr_buf_) &&
(state_->mloc_container_->hdr_loc_ == rhs.state_->mloc_container_->hdr_loc_) &&
(state_->mloc_container_->field_loc_ == rhs.state_->mloc_container_->field_loc_);
}
-bool header_field_iterator::operator!=(const header_field_iterator &rhs) const
+bool
+header_field_iterator::operator!=(const header_field_iterator &rhs) const
{
return !operator==(rhs);
}
@@ -681,7 +697,8 @@ Headers::wireStr()
return retval;
}
-std::ostream &operator<<(std::ostream &os, atscppapi::Headers &obj)
+std::ostream &
+operator<<(std::ostream &os, atscppapi::Headers &obj)
{
for (header_field_iterator it = obj.begin(); it != obj.end(); ++it) {
HeaderField hf = *it;
diff --git a/lib/atscppapi/src/Logger.cc b/lib/atscppapi/src/Logger.cc
index 6802e5b..18c75c8 100644
--- a/lib/atscppapi/src/Logger.cc
+++ b/lib/atscppapi/src/Logger.cc
@@ -63,7 +63,6 @@ namespace
const int ROLL_ON_TIME = 1; // See RollingEnabledValues in LogConfig.h
}
-
/*
* These have default values specified for add_timestamp and rename_file in Logger.h
*/
diff --git a/lib/atscppapi/src/Plugin.cc b/lib/atscppapi/src/Plugin.cc
index 176a030..63ee55b 100644
--- a/lib/atscppapi/src/Plugin.cc
+++ b/lib/atscppapi/src/Plugin.cc
@@ -23,9 +23,10 @@
#include <ts/ts.h>
const std::string atscppapi::HOOK_TYPE_STRINGS[] = {
std::string("HOOK_READ_REQUEST_HEADERS_PRE_REMAP"), std::string("HOOK_READ_REQUEST_HEADERS_POST_REMAP"),
- std::string("HOOK_SEND_REQUEST_HEADERS"), std::string("HOOK_READ_RESPONSE_HEADERS"), std::string("HOOK_SEND_RESPONSE_HEADERS"),
- std::string("HOOK_OS_DNS"), std::string("HOOK_READ_REQUEST_HEADERS"), std::string("HOOK_READ_CACHE_HEADERS"),
- std::string("HOOK_CACHE_LOOKUP_COMPLETE"), std::string("HOOK_SELECT_ALT")};
+ std::string("HOOK_SEND_REQUEST_HEADERS"), std::string("HOOK_READ_RESPONSE_HEADERS"),
+ std::string("HOOK_SEND_RESPONSE_HEADERS"), std::string("HOOK_OS_DNS"),
+ std::string("HOOK_READ_REQUEST_HEADERS"), std::string("HOOK_READ_CACHE_HEADERS"),
+ std::string("HOOK_CACHE_LOOKUP_COMPLETE"), std::string("HOOK_SELECT_ALT")};
void
atscppapi::RegisterGlobalPlugin(std::string name, std::string vendor, std::string email)
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index a1694d5..0e02d6c 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -58,7 +58,7 @@ struct atscppapi::TransactionState : noncopyable {
TSMBuffer cached_request_hdr_buf_;
TSMLoc cached_request_hdr_loc_;
Request cached_request_;
- map<string, shared_ptr<Transaction::ContextValue> > context_values_;
+ map<string, shared_ptr<Transaction::ContextValue>> context_values_;
TransactionState(TSHttpTxn txn, TSMBuffer client_request_hdr_buf, TSMLoc client_request_hdr_loc)
: txn_(txn), client_request_hdr_buf_(client_request_hdr_buf), client_request_hdr_loc_(client_request_hdr_loc),
@@ -211,7 +211,7 @@ shared_ptr<Transaction::ContextValue>
Transaction::getContextValue(const std::string &key)
{
shared_ptr<Transaction::ContextValue> return_context_value;
- map<string, shared_ptr<Transaction::ContextValue> >::iterator iter = state_->context_values_.find(key);
+ map<string, shared_ptr<Transaction::ContextValue>>::iterator iter = state_->context_values_.find(key);
if (iter != state_->context_values_.end()) {
return_context_value = iter->second;
}
@@ -378,7 +378,6 @@ Transaction::setTimeout(Transaction::TimeoutType type, int time_ms)
}
}
-
Transaction::CacheStatus
Transaction::getCacheStatus()
{
@@ -427,7 +426,8 @@ class initializeHandles
public:
typedef TSReturnCode (*GetterFunction)(TSHttpTxn, TSMBuffer *, TSMLoc *);
initializeHandles(GetterFunction getter) : getter_(getter) {}
- bool operator()(TSHttpTxn txn, TSMBuffer &hdr_buf, TSMLoc &hdr_loc, const char *handles_name)
+ bool
+ operator()(TSHttpTxn txn, TSMBuffer &hdr_buf, TSMLoc &hdr_loc, const char *handles_name)
{
hdr_buf = NULL;
hdr_loc = NULL;
diff --git a/lib/atscppapi/src/include/atscppapi/Async.h b/lib/atscppapi/src/include/atscppapi/Async.h
index 56aaa2a..22d2417 100644
--- a/lib/atscppapi/src/include/atscppapi/Async.h
+++ b/lib/atscppapi/src/include/atscppapi/Async.h
@@ -85,7 +85,6 @@ public:
}
virtual ~AsyncProvider() {}
-
protected:
shared_ptr<AsyncDispatchControllerBase>
getDispatchController()
@@ -152,7 +151,6 @@ public:
}
virtual ~AsyncDispatchController() {}
-
public:
AsyncEventReceiverType *event_receiver_;
shared_ptr<Mutex> dispatch_mutex_;
@@ -171,7 +169,7 @@ private:
template <typename AsyncEventReceiverType, typename AsyncProviderType> class AsyncReceiverPromise : noncopyable
{
public:
- AsyncReceiverPromise(shared_ptr<AsyncDispatchController<AsyncEventReceiverType, AsyncProviderType> > dispatch_controller)
+ AsyncReceiverPromise(shared_ptr<AsyncDispatchController<AsyncEventReceiverType, AsyncProviderType>> dispatch_controller)
: dispatch_controller_(dispatch_controller)
{
}
@@ -183,7 +181,7 @@ public:
}
protected:
- shared_ptr<AsyncDispatchController<AsyncEventReceiverType, AsyncProviderType> > dispatch_controller_;
+ shared_ptr<AsyncDispatchController<AsyncEventReceiverType, AsyncProviderType>> dispatch_controller_;
};
/**
@@ -202,13 +200,12 @@ public:
*/
virtual void handleAsyncComplete(AsyncProviderType &provider) = 0;
virtual ~AsyncReceiver() {}
-
protected:
AsyncReceiver() {}
friend class Async;
private:
- mutable std::list<shared_ptr<AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType> > > receiver_promises_;
+ mutable std::list<shared_ptr<AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType>>> receiver_promises_;
};
/**
@@ -235,9 +232,9 @@ public:
if (!mutex.get()) {
mutex.reset(new Mutex(Mutex::TYPE_RECURSIVE));
}
- shared_ptr<AsyncDispatchController<AsyncReceiver<AsyncProviderType>, AsyncProviderType> > dispatcher(
+ shared_ptr<AsyncDispatchController<AsyncReceiver<AsyncProviderType>, AsyncProviderType>> dispatcher(
new AsyncDispatchController<AsyncReceiver<AsyncProviderType>, AsyncProviderType>(event_receiver, provider, mutex));
- shared_ptr<AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType> > receiver_promise(
+ shared_ptr<AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType>> receiver_promise(
new AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType>(dispatcher));
event_receiver->receiver_promises_.push_back(receiver_promise); // now if the event receiver dies, we're safe.
provider->doRun(dispatcher);
@@ -245,5 +242,4 @@ public:
};
}
-
#endif /* ATSCPPAPI_ASYNC_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/GlobalPlugin.h b/lib/atscppapi/src/include/atscppapi/GlobalPlugin.h
index 4325a21..a31fb7d 100644
--- a/lib/atscppapi/src/include/atscppapi/GlobalPlugin.h
+++ b/lib/atscppapi/src/include/atscppapi/GlobalPlugin.h
@@ -89,5 +89,4 @@ private:
} /* atscppapi */
-
#endif /* ATSCPPAPI_GLOBALPLUGIN_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/GzipDeflateTransformation.h b/lib/atscppapi/src/include/atscppapi/GzipDeflateTransformation.h
index 4740fec..f25b009 100644
--- a/lib/atscppapi/src/include/atscppapi/GzipDeflateTransformation.h
+++ b/lib/atscppapi/src/include/atscppapi/GzipDeflateTransformation.h
@@ -87,5 +87,4 @@ namespace transformations
}
}
-
#endif /* ATSCPPAPI_GZIPDEFLATETRANSFORMATION_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/Headers.h b/lib/atscppapi/src/include/atscppapi/Headers.h
index 563be66..3120eba 100644
--- a/lib/atscppapi/src/include/atscppapi/Headers.h
+++ b/lib/atscppapi/src/include/atscppapi/Headers.h
@@ -238,7 +238,6 @@ class HeaderField
private:
header_field_iterator iter_;
HeaderField(header_field_iterator iter) : iter_(iter) {}
-
public:
typedef unsigned int size_type;
typedef header_field_value_iterator iterator;
diff --git a/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h b/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h
index 48c2de8..fa5c3a1 100644
--- a/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h
+++ b/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h
@@ -100,5 +100,4 @@ private:
} /* atscppapi */
-
#endif /* ATSCPPAPI_INTERCEPT_PLUGIN_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/Logger.h b/lib/atscppapi/src/include/atscppapi/Logger.h
index 9b1265f..e5e86ff 100644
--- a/lib/atscppapi/src/include/atscppapi/Logger.h
+++ b/lib/atscppapi/src/include/atscppapi/Logger.h
@@ -264,5 +264,4 @@ private:
} /* atscppapi */
-
#endif /* ATSCPPAPI_LOGGER_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/Mutex.h b/lib/atscppapi/src/include/atscppapi/Mutex.h
index 094c0da..c2748fc 100644
--- a/lib/atscppapi/src/include/atscppapi/Mutex.h
+++ b/lib/atscppapi/src/include/atscppapi/Mutex.h
@@ -87,7 +87,6 @@ public:
}
~Mutex() { pthread_mutex_destroy(&mutex); }
-
/**
* Try to take the lock, this call will NOT block if the mutex cannot be taken.
* @return Returns true if the lock was taken, false if it was not. This call obviously will not block.
@@ -136,12 +135,10 @@ public:
* @param mutex a reference to a Mutex.
*/
explicit ScopedMutexLock(Mutex &mutex) : mutex_(mutex) { mutex_.lock(); }
-
/**
* Unlock the mutex.
*/
~ScopedMutexLock() { mutex_.unlock(); }
-
private:
Mutex &mutex_;
};
@@ -162,12 +159,10 @@ public:
* @param mutex a shared pointer to a Mutex.
*/
explicit ScopedSharedMutexLock(shared_ptr<Mutex> mutex) : mutex_(mutex) { mutex_->lock(); }
-
/**
* Unlock the mutex.
*/
~ScopedSharedMutexLock() { mutex_->unlock(); }
-
private:
shared_ptr<Mutex> mutex_;
};
@@ -189,7 +184,6 @@ public:
* @param mutex a shared pointer to a Mutex.
*/
explicit ScopedMutexTryLock(Mutex &mutex) : mutex_(mutex), has_lock_(false) { has_lock_ = mutex_.tryLock(); }
-
/**
* Unlock the mutex (if we hold the lock)
*/
@@ -231,7 +225,6 @@ public:
* @param mutex a shared pointer to a Mutex.
*/
explicit ScopedSharedMutexTryLock(shared_ptr<Mutex> mutex) : mutex_(mutex), has_lock_(false) { has_lock_ = mutex_->tryLock(); }
-
/**
* Unlock the mutex (if we hold the lock)
*/
@@ -282,5 +275,4 @@ private:
} /* atscppapi */
-
#endif /* ATSCPPAPI_MUTEX_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/Plugin.h b/lib/atscppapi/src/include/atscppapi/Plugin.h
index eb72625..bf35f7a 100644
--- a/lib/atscppapi/src/include/atscppapi/Plugin.h
+++ b/lib/atscppapi/src/include/atscppapi/Plugin.h
@@ -30,7 +30,6 @@
#include <atscppapi/Transaction.h>
#include <atscppapi/noncopyable.h>
-
namespace atscppapi
{
/**
diff --git a/lib/atscppapi/src/include/atscppapi/PluginInit.h b/lib/atscppapi/src/include/atscppapi/PluginInit.h
index af44715..a348dec 100644
--- a/lib/atscppapi/src/include/atscppapi/PluginInit.h
+++ b/lib/atscppapi/src/include/atscppapi/PluginInit.h
@@ -48,5 +48,4 @@ 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/atscppapi/src/include/atscppapi/Stat.h b/lib/atscppapi/src/include/atscppapi/Stat.h
index 9789173..33ba255 100644
--- a/lib/atscppapi/src/include/atscppapi/Stat.h
+++ b/lib/atscppapi/src/include/atscppapi/Stat.h
@@ -104,5 +104,4 @@ private:
} /* atscppapi */
-
#endif /* ATSCPPAPI_STAT_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/Transaction.h b/lib/atscppapi/src/include/atscppapi/Transaction.h
index b96f9ae..0deab3c 100644
--- a/lib/atscppapi/src/include/atscppapi/Transaction.h
+++ b/lib/atscppapi/src/include/atscppapi/Transaction.h
@@ -190,7 +190,6 @@ public:
*/
const sockaddr *getNextHopAddress() const;
-
/**
* Set the incoming port on the Transaction
*
@@ -258,7 +257,6 @@ public:
*/
Response &getCachedResponse();
-
/**
* Returns the Effective URL for this transaction taking into account host.
*/
@@ -323,7 +321,6 @@ public:
*/
void addPlugin(TransactionPlugin *);
-
/*
* Note: The following methods cannot be attached to a Response
* object because that would require the Response object to
diff --git a/lib/atscppapi/src/include/atscppapi/TransactionPlugin.h b/lib/atscppapi/src/include/atscppapi/TransactionPlugin.h
index e2ee048..c47a164 100644
--- a/lib/atscppapi/src/include/atscppapi/TransactionPlugin.h
+++ b/lib/atscppapi/src/include/atscppapi/TransactionPlugin.h
@@ -113,5 +113,4 @@ private:
} /* atscppapi */
-
#endif /* ATSCPPAPI_TRANSACTIONPLUGIN_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/TransformationPlugin.h b/lib/atscppapi/src/include/atscppapi/TransformationPlugin.h
index 9295053..e969832 100644
--- a/lib/atscppapi/src/include/atscppapi/TransformationPlugin.h
+++ b/lib/atscppapi/src/include/atscppapi/TransformationPlugin.h
@@ -127,5 +127,4 @@ private:
} /* atscppapi */
-
#endif /* ATSCPPAPI_TRANSFORMATIONPLUGIN_H_ */
diff --git a/lib/atscppapi/src/include/atscppapi/noncopyable.h b/lib/atscppapi/src/include/atscppapi/noncopyable.h
index 620bd25..b659510 100644
--- a/lib/atscppapi/src/include/atscppapi/noncopyable.h
+++ b/lib/atscppapi/src/include/atscppapi/noncopyable.h
@@ -53,7 +53,6 @@ class noncopyable
protected:
noncopyable() {}
~noncopyable() {}
-
private:
noncopyable(const noncopyable &);
const noncopyable &operator=(const noncopyable &);
@@ -61,5 +60,4 @@ private:
} /* atscppapi */
-
#endif /* ATSCPPAPI_NONCOPYABLE_H_ */
diff --git a/lib/atscppapi/src/utils_internal.cc b/lib/atscppapi/src/utils_internal.cc
index 82a5065..1090f01 100644
--- a/lib/atscppapi/src/utils_internal.cc
+++ b/lib/atscppapi/src/utils_internal.cc
@@ -263,7 +263,6 @@ utils::internal::consumeFromTSIOBufferReader(TSIOBufferReader reader)
return str;
}
-
HttpVersion
utils::internal::getHttpVersion(TSMBuffer hdr_buf, TSMLoc hdr_loc)
{
diff --git a/lib/raft/raft.h b/lib/raft/raft.h
index 992f399..7d557c0 100644
--- a/lib/raft/raft.h
+++ b/lib/raft/raft.h
@@ -90,7 +90,6 @@ public:
typedef typename Server::LogEntry LogEntry;
virtual ~Raft() {}
-
virtual void SetElectionTimeout(double seconds) = 0; // 1 sec.
virtual void Recover(const LogEntry &entry) = 0;
diff --git a/lib/raft/raft_impl.h b/lib/raft/raft_impl.h
index 1ed1dd6..a224481 100644
--- a/lib/raft/raft_impl.h
+++ b/lib/raft/raft_impl.h
@@ -44,7 +44,6 @@ public:
RaftImpl(Server *server, const ::std::string &node) : server_(server), node_(node) {}
~RaftImpl() {}
-
virtual void
SetElectionTimeout(double timeout)
{
@@ -417,7 +416,7 @@ private:
}
int
- MajorityIndex(const ::std::set< ::std::string> &other)
+ MajorityIndex(const ::std::set<::std::string> &other)
{
::std::vector<int64_t> indices(1, index_);
for (auto &o : other)
@@ -454,7 +453,7 @@ private:
void
Commit(bool in_recovery)
{
- ::std::vector<std::unique_ptr<LogEntry> > pending;
+ ::std::vector<std::unique_ptr<LogEntry>> pending;
while (!waiting_commits_.empty() && waiting_commits_.front()->index() <= data_committed_) {
auto &e = waiting_commits_.front();
while (!pending.empty() && e->index() <= pending.back()->index())
@@ -602,13 +601,13 @@ private:
::std::string vote_; // My vote this term.
Config config_;
Config pending_config_;
- ::std::map< ::std::string, NodeState> node_state_;
- ::std::deque<std::unique_ptr<LogEntry> > waiting_commits_;
+ ::std::map<::std::string, NodeState> node_state_;
+ ::std::deque<std::unique_ptr<LogEntry>> waiting_commits_;
bool seen_term_ = true;
// Cached values.
- ::std::set< ::std::string> other_nodes_; // Nodes required for consensus on log entries.
- ::std::set< ::std::string> other_config_nodes_; // Nodes required for config changes.
- ::std::set< ::std::string> replicas_; // All nodes receiving the replication stream.
+ ::std::set<::std::string> other_nodes_; // Nodes required for consensus on log entries.
+ ::std::set<::std::string> other_config_nodes_; // Nodes required for config changes.
+ ::std::set<::std::string> replicas_; // All nodes receiving the replication stream.
};
template <typename Server>
diff --git a/lib/raft/raft_test.cc b/lib/raft/raft_test.cc
index 71b6e6e..4512835 100644
--- a/lib/raft/raft_test.cc
+++ b/lib/raft/raft_test.cc
@@ -126,9 +126,9 @@ public:
string node_;
string leader_;
unique_ptr<RaftClass> raft_;
- vector<unique_ptr<LogEntry> > log_;
- vector<unique_ptr<LogEntry> > commits_;
- map<string, pair<int64_t, string> > state_;
+ vector<unique_ptr<LogEntry>> log_;
+ vector<unique_ptr<LogEntry>> commits_;
+ map<string, pair<int64_t, string>> state_;
};
template <typename T>
@@ -203,7 +203,7 @@ protected:
void
CrashAndRecover(int i, const LogEntry &config_log_entry)
{
- vector<unique_ptr<LogEntry> > log;
+ vector<unique_ptr<LogEntry>> log;
for (auto &p : servers_[i]->log_)
log.emplace_back(p.release());
servers_[i].reset(new RaftServer(to_string(i), this));
@@ -229,10 +229,10 @@ protected:
SnapshotCrashAndRecover(int i, const LogEntry &config_log_entry)
{
vector<LogEntry> entries;
- vector<pair<int64_t, string> > state;
+ vector<pair<int64_t, string>> state;
for (auto &p : servers_[i]->state_)
state.push_back(make_pair(p.second.first, p.first + "=" + p.second.second));
- std::sort(state.begin(), state.end(), firstless<pair<int64_t, string> >);
+ std::sort(state.begin(), state.end(), firstless<pair<int64_t, string>>);
servers_[i]->log_.clear();
for (auto &s : state) {
LogEntry *e = new LogEntry;
@@ -259,8 +259,8 @@ protected:
double now_;
set<string> down_;
- vector<unique_ptr<RaftServer> > servers_;
- deque<pair<string, Message *> > messages_;
+ vector<unique_ptr<RaftServer>> servers_;
+ deque<pair<string, Message *>> messages_;
};
bool
diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h
index f3a36f7..284c079 100644
--- a/lib/records/I_RecCore.h
+++ b/lib/records/I_RecCore.h
@@ -134,7 +134,6 @@ int RecLinkConfigBool(const char *name, RecBool *rec_byte);
int RecRegisterConfigUpdateCb(const char *name, RecConfigUpdateCb update_cb, void *cookie);
int RecRegisterRawStatUpdateFunc(const char *name, RecRawStatBlock *rsb, int id, RecStatUpdateFunc update_func, void *cookie);
-
//-------------------------------------------------------------------------
// Record Reading/Writing
//-------------------------------------------------------------------------
@@ -302,7 +301,6 @@ RecString REC_readString(const char *name, bool *found, bool lock = true);
int RecResetStatRecord(const char *name);
int RecResetStatRecord(RecT type = RECT_NULL, bool all = false);
-
//------------------------------------------------------------------------
// Set RecRecord attributes
//------------------------------------------------------------------------
diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h
index 8f9084d..ef92a53 100644
--- a/lib/records/I_RecDefs.h
+++ b/lib/records/I_RecDefs.h
@@ -30,7 +30,6 @@
#define STAT_PROCESSOR
-
//-------------------------------------------------------------------------
// Error Values
//-------------------------------------------------------------------------
@@ -39,7 +38,6 @@ enum RecErrT {
REC_ERR_OKAY = 0,
};
-
//-------------------------------------------------------------------------
// Types
//-------------------------------------------------------------------------
@@ -143,7 +141,6 @@ enum RecAccessT {
RECA_READ_ONLY,
};
-
//-------------------------------------------------------------------------
// Data Union
//-------------------------------------------------------------------------
@@ -154,7 +151,6 @@ union RecData {
RecCounter rec_counter;
};
-
//-------------------------------------------------------------------------
// RawStat Structures
//-------------------------------------------------------------------------
@@ -169,7 +165,6 @@ struct RecRawStat {
uint32_t version;
};
-
// WARNING! It's advised that developers do not modify the contents of
// the RecRawStatBlock. ^_^
struct RecRawStatBlock {
@@ -180,7 +175,6 @@ struct RecRawStatBlock {
ink_mutex mutex;
};
-
//-------------------------------------------------------------------------
// RecCore Callback Types
//-------------------------------------------------------------------------
diff --git a/lib/records/I_RecHttp.h b/lib/records/I_RecHttp.h
index 9dbd8c0..f39004d 100644
--- a/lib/records/I_RecHttp.h
+++ b/lib/records/I_RecHttp.h
@@ -53,7 +53,6 @@ public:
/// Default constructor.
/// Constructs and empty set.
SessionProtocolSet() : m_bits(0) {}
-
uint32_t
indexToMask(int idx) const
{
@@ -124,7 +123,11 @@ public:
}
/// Equality (identical sets).
- bool operator==(self const &that) const { return m_bits == that.m_bits; }
+ bool
+ operator==(self const &that) const
+ {
+ return m_bits == that.m_bits;
+ }
};
// Predefined sets of protocols, useful for configuration.
diff --git a/lib/records/I_RecProcess.h b/lib/records/I_RecProcess.h
index 3b2da3f..4c1027f 100644
--- a/lib/records/I_RecProcess.h
+++ b/lib/records/I_RecProcess.h
@@ -27,7 +27,6 @@
#include "I_RecCore.h"
#include "I_EventSystem.h"
-
//-------------------------------------------------------------------------
// Initialization/Starting
//-------------------------------------------------------------------------
@@ -62,7 +61,6 @@ int _RecRegisterRawStat(RecRawStatBlock *rsb, RecT rec_type, const char *name, R
// RecInt min,
// RecInt max);
-
//-------------------------------------------------------------------------
// Predefined RawStat Callbacks
//-------------------------------------------------------------------------
@@ -95,7 +93,6 @@ int RecSetRawStatBlock(RecRawStatBlock *rsb, RecRawStat *stat_array);
int RecGetRawStatSum(RecRawStatBlock *rsb, int id, int64_t *data);
int RecGetRawStatCount(RecRawStatBlock *rsb, int id, int64_t *data);
-
//-------------------------------------------------------------------------
// Global RawStat Items (e.g. same as above, but no thread-local behavior)
//-------------------------------------------------------------------------
@@ -113,7 +110,6 @@ RecRawStat *RecGetGlobalRawStatPtr(RecRawStatBlock *rsb, int id);
int64_t *RecGetGlobalRawStatSumPtr(RecRawStatBlock *rsb, int id);
int64_t *RecGetGlobalRawStatCountPtr(RecRawStatBlock *rsb, int id);
-
//-------------------------------------------------------------------------
// RecIncrRawStatXXX
//-------------------------------------------------------------------------
diff --git a/lib/records/P_RecCore.cc b/lib/records/P_RecCore.cc
index 035c7d6..4f78cb7 100644
--- a/lib/records/P_RecCore.cc
+++ b/lib/records/P_RecCore.cc
@@ -36,7 +36,6 @@
RecModeT g_mode_type = RECM_NULL;
-
//-------------------------------------------------------------------------
// send_reset_message
//-------------------------------------------------------------------------
@@ -56,7 +55,6 @@ send_reset_message(RecRecord *record)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// send_set_message
//-------------------------------------------------------------------------
@@ -76,7 +74,6 @@ send_set_message(RecRecord *record)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// send_register_message
//-------------------------------------------------------------------------
@@ -96,7 +93,6 @@ send_register_message(RecRecord *record)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// send_push_message
//-------------------------------------------------------------------------
@@ -131,7 +127,6 @@ send_push_message()
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// send_pull_message
//-------------------------------------------------------------------------
@@ -179,7 +174,6 @@ send_pull_message(RecMessageT msg_type)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// recv_message_cb
//-------------------------------------------------------------------------
@@ -263,7 +257,6 @@ recv_message_cb(RecMessage *msg, RecMessageT msg_type, void * /* cookie */)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecRegisterStatXXX
//-------------------------------------------------------------------------
@@ -308,7 +301,6 @@ _RecRegisterStatCounter(RecT rec_type, const char *name, RecCounter data_default
REC_REGISTER_STAT_XXX(rec_counter, RECD_COUNTER);
}
-
//-------------------------------------------------------------------------
// RecRegisterConfigXXX
//-------------------------------------------------------------------------
@@ -344,7 +336,6 @@ RecRegisterConfigFloat(RecT rec_type, const char *name, RecFloat data_default, R
REC_REGISTER_CONFIG_XXX(rec_float, RECD_FLOAT);
}
-
int
RecRegisterConfigString(RecT rec_type, const char *name, const char *data_default_tmp, RecUpdateT update_type, RecCheckT check_type,
const char *check_regex, RecSourceT source, RecAccessT access_type)
@@ -362,7 +353,6 @@ RecRegisterConfigCounter(RecT rec_type, const char *name, RecCounter data_defaul
REC_REGISTER_CONFIG_XXX(rec_counter, RECD_COUNTER);
}
-
//-------------------------------------------------------------------------
// RecSetRecordXXX
//-------------------------------------------------------------------------
@@ -517,7 +507,6 @@ RecSetRecordCounter(const char *name, RecCounter rec_counter, RecSourceT source,
return RecSetRecord(RECT_NULL, name, RECD_COUNTER, &data, NULL, source, lock, inc_version);
}
-
//-------------------------------------------------------------------------
// RecReadStatsFile
//-------------------------------------------------------------------------
@@ -574,7 +563,6 @@ RecReadStatsFile()
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecSyncStatsFile
//-------------------------------------------------------------------------
@@ -650,7 +638,6 @@ RecReadConfigFile(bool inc_version)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecSyncConfigFile
//-------------------------------------------------------------------------
@@ -788,7 +775,6 @@ RecSyncConfigToTB(textBuffer *tb, bool *inc_version)
return err;
}
-
//-------------------------------------------------------------------------
// RecExecConfigUpdateCbs
//-------------------------------------------------------------------------
@@ -834,7 +820,6 @@ RecExecConfigUpdateCbs(unsigned int update_required_type)
return update_type;
}
-
//------------------------------------------------------------------------
// RecResetStatRecord
//------------------------------------------------------------------------
@@ -870,7 +855,6 @@ RecResetStatRecord(const char *name)
return err;
}
-
//------------------------------------------------------------------------
// RecResetStatRecord
//------------------------------------------------------------------------
@@ -912,7 +896,6 @@ RecResetStatRecord(RecT type, bool all)
return err;
}
-
int
RecSetSyncRequired(char *name, bool lock)
{
diff --git a/lib/records/P_RecUtils.h b/lib/records/P_RecUtils.h
index 3a8ac5f..69ae81a 100644
--- a/lib/records/P_RecUtils.h
+++ b/lib/records/P_RecUtils.h
@@ -38,7 +38,6 @@
#define REC_TYPE_IS_CONFIG(rec_type) (((rec_type) == RECT_CONFIG) || ((rec_type) == RECT_LOCAL))
-
//-------------------------------------------------------------------------
// RecRecord Utils
//-------------------------------------------------------------------------
@@ -46,7 +45,6 @@ void RecRecordInit(RecRecord *r);
void RecRecordFree(RecRecord *r);
RecRecord *RecAlloc(RecT rec_type, const char *name, RecDataT data_type);
-
//-------------------------------------------------------------------------
// RecData Utils
//-------------------------------------------------------------------------
@@ -66,7 +64,6 @@ RecData RecDataSub(RecDataT type, RecData left, RecData right);
RecData RecDataMul(RecDataT type, RecData left, RecData right);
RecData RecDataDiv(RecDataT type, RecData left, RecData right);
-
//-------------------------------------------------------------------------
// Logging
//-------------------------------------------------------------------------
diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc
index ddb5639..a6acf20 100644
--- a/lib/records/RecCore.cc
+++ b/lib/records/RecCore.cc
@@ -103,7 +103,6 @@ register_record(RecT rec_type, const char *name, RecDataT data_type, RecData dat
return r;
}
-
//-------------------------------------------------------------------------
// link_XXX
//-------------------------------------------------------------------------
@@ -306,7 +305,6 @@ RecLinkConfigBool(const char *name, RecBool *rec_bool)
return RecRegisterConfigUpdateCb(name, link_byte, (void *)rec_bool);
}
-
//-------------------------------------------------------------------------
// RecRegisterConfigUpdateCb
//-------------------------------------------------------------------------
@@ -360,7 +358,6 @@ RecRegisterConfigUpdateCb(const char *name, RecConfigUpdateCb update_cb, void *c
return err;
}
-
//-------------------------------------------------------------------------
// RecGetRecordXXX
//-------------------------------------------------------------------------
@@ -535,7 +532,6 @@ RecGetRecordType(const char *name, RecT *rec_type, bool lock)
return err;
}
-
int
RecGetRecordDataType(const char *name, RecDataT *data_type, bool lock)
{
@@ -649,7 +645,6 @@ RecGetRecordUpdateType(const char *name, RecUpdateT *update_type, bool lock)
return err;
}
-
int
RecGetRecordCheckType(const char *name, RecCheckT *check_type, bool lock)
{
@@ -678,7 +673,6 @@ RecGetRecordCheckType(const char *name, RecCheckT *check_type, bool lock)
return err;
}
-
int
RecGetRecordCheckExpr(const char *name, char **check_expr, bool lock)
{
@@ -757,7 +751,6 @@ RecGetRecordDefaultDataString_Xmalloc(char *name, char **buf, bool lock)
return err;
}
-
int
RecGetRecordAccessType(const char *name, RecAccessT *access, bool lock)
{
@@ -782,7 +775,6 @@ RecGetRecordAccessType(const char *name, RecAccessT *access, bool lock)
return err;
}
-
int
RecSetRecordAccessType(const char *name, RecAccessT access, bool lock)
{
@@ -807,7 +799,6 @@ RecSetRecordAccessType(const char *name, RecAccessT access, bool lock)
return err;
}
-
//-------------------------------------------------------------------------
// RecRegisterStat
//-------------------------------------------------------------------------
@@ -838,7 +829,6 @@ RecRegisterStat(RecT rec_type, const char *name, RecDataT data_type, RecData dat
return r;
}
-
//-------------------------------------------------------------------------
// RecRegisterConfig
//-------------------------------------------------------------------------
@@ -868,7 +858,6 @@ RecRegisterConfig(RecT rec_type, const char *name, RecDataT data_type, RecData d
return r;
}
-
//-------------------------------------------------------------------------
// RecGetRecord_Xmalloc
//-------------------------------------------------------------------------
@@ -904,7 +893,6 @@ RecGetRecord_Xmalloc(const char *name, RecDataT data_type, RecData *data, bool l
return err;
}
-
//-------------------------------------------------------------------------
// RecForceInsert
//-------------------------------------------------------------------------
@@ -959,7 +947,6 @@ RecForceInsert(RecRecord *record)
return r;
}
-
//-------------------------------------------------------------------------
// RecDumpRecordsHt
//-------------------------------------------------------------------------
@@ -1044,7 +1031,6 @@ REC_ConfigReadCounter(const char *name)
return t;
}
-
//-------------------------------------------------------------------------
// Backwards compatibility. TODO: Should remove these.
//-------------------------------------------------------------------------
diff --git a/lib/records/RecDebug.cc b/lib/records/RecDebug.cc
index 8bae9db..838d22f 100644
--- a/lib/records/RecDebug.cc
+++ b/lib/records/RecDebug.cc
@@ -38,7 +38,6 @@ RecSetDiags(Diags *_diags)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecLog
//-------------------------------------------------------------------------
@@ -54,7 +53,6 @@ RecLog(DiagsLevel dl, const char *format_string, ...)
va_end(ap);
}
-
//-------------------------------------------------------------------------
// RecDebug
//-------------------------------------------------------------------------
@@ -70,7 +68,6 @@ RecDebug(DiagsLevel dl, const char *format_string, ...)
va_end(ap);
}
-
//-------------------------------------------------------------------------
// RecDebugOff
//-------------------------------------------------------------------------
diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc
index b317e57..61c208f 100644
--- a/lib/records/RecHttp.cc
+++ b/lib/records/RecHttp.cc
@@ -98,7 +98,6 @@ RecHttpLoadIp(char const *value_name, IpAddr &ip4, IpAddr &ip6)
}
}
-
char const *const HttpProxyPort::DEFAULT_VALUE = "8080";
char const *const HttpProxyPort::PORTS_CONFIG_NAME = "proxy.config.http.server_ports";
diff --git a/lib/records/RecLocal.cc b/lib/records/RecLocal.cc
index 8846691..489b4cc 100644
--- a/lib/records/RecLocal.cc
+++ b/lib/records/RecLocal.cc
@@ -104,7 +104,6 @@ sync_thr(void *data)
return NULL;
}
-
//-------------------------------------------------------------------------
// config_update_thr
//-------------------------------------------------------------------------
@@ -135,7 +134,6 @@ config_update_thr(void * /* data */)
return NULL;
}
-
//-------------------------------------------------------------------------
// RecMessageInit
//-------------------------------------------------------------------------
@@ -180,7 +178,6 @@ RecLocalInit(Diags *_diags)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecLocalInitMessage
//-------------------------------------------------------------------------
diff --git a/lib/records/RecProcess.cc b/lib/records/RecProcess.cc
index e92bd7d..e6944b6 100644
--- a/lib/records/RecProcess.cc
+++ b/lib/records/RecProcess.cc
@@ -137,13 +137,11 @@ recv_message_cb__process(RecMessage *msg, RecMessageT msg_type, void *cookie)
return err;
}
-
//-------------------------------------------------------------------------
// raw_stat_sync_cont
//-------------------------------------------------------------------------
struct raw_stat_sync_cont : public Continuation {
raw_stat_sync_cont(ProxyMutex *m) : Continuation(m) { SET_HANDLER(&raw_stat_sync_cont::exec_callbacks); }
-
int
exec_callbacks(int /* event */, Event * /* e */)
{
@@ -154,13 +152,11 @@ struct raw_stat_sync_cont : public Continuation {
}
};
-
//-------------------------------------------------------------------------
// config_update_cont
//-------------------------------------------------------------------------
struct config_update_cont : public Continuation {
config_update_cont(ProxyMutex *m) : Continuation(m) { SET_HANDLER(&config_update_cont::exec_callbacks); }
-
int
exec_callbacks(int /* event */, Event * /* e */)
{
@@ -171,7 +167,6 @@ struct config_update_cont : public Continuation {
}
};
-
//-------------------------------------------------------------------------
// sync_cont
//-------------------------------------------------------------------------
@@ -206,7 +201,6 @@ struct sync_cont : public Continuation {
}
};
-
//-------------------------------------------------------------------------
// RecProcessInit
//-------------------------------------------------------------------------
@@ -249,7 +243,6 @@ RecProcessInit(RecModeT mode_type, Diags *_diags)
return REC_ERR_OKAY;
}
-
void
RecMessageInit()
{
@@ -287,7 +280,6 @@ RecProcessInitMessage(RecModeT mode_type)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecProcessStart
//-------------------------------------------------------------------------
@@ -323,7 +315,6 @@ RecProcessStart(void)
return REC_ERR_OKAY;
}
-
void
RecSignalManager(int id, const char *msg, size_t msgsize)
{
diff --git a/lib/records/RecRawStats.cc b/lib/records/RecRawStats.cc
index 850b349..7737168 100644
--- a/lib/records/RecRawStats.cc
+++ b/lib/records/RecRawStats.cc
@@ -60,7 +60,6 @@ raw_stat_get_total(RecRawStatBlock *rsb, int id, RecRawStat *total)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// raw_stat_sync_to_global
//-------------------------------------------------------------------------
@@ -117,7 +116,6 @@ raw_stat_sync_to_global(RecRawStatBlock *rsb, int id)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// raw_stat_clear
//-------------------------------------------------------------------------
@@ -152,7 +150,6 @@ raw_stat_clear(RecRawStatBlock *rsb, int id)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// raw_stat_clear_sum
//-------------------------------------------------------------------------
@@ -183,7 +180,6 @@ raw_stat_clear_sum(RecRawStatBlock *rsb, int id)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// raw_stat_clear_count
//-------------------------------------------------------------------------
@@ -239,7 +235,6 @@ RecAllocateRawStatBlock(int num_stats)
return rsb;
}
-
//-------------------------------------------------------------------------
// RecRegisterRawStat
//-------------------------------------------------------------------------
@@ -283,7 +278,6 @@ Ldone:
return err;
}
-
//-------------------------------------------------------------------------
// RecRawStatSync...
//-------------------------------------------------------------------------
@@ -403,7 +397,6 @@ RecIncrRawStatBlock(RecRawStatBlock * /* rsb ATS_UNUSED */, EThread * /* ethread
return REC_ERR_FAIL;
}
-
//-------------------------------------------------------------------------
// RecSetRawStatXXX
//-------------------------------------------------------------------------
@@ -429,7 +422,6 @@ RecSetRawStatBlock(RecRawStatBlock * /* rsb ATS_UNUSED */, RecRawStat * /* stat_
return REC_ERR_FAIL;
}
-
//-------------------------------------------------------------------------
// RecGetRawStatXXX
//-------------------------------------------------------------------------
@@ -454,7 +446,6 @@ RecGetRawStatCount(RecRawStatBlock *rsb, int id, int64_t *data)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecIncrGlobalRawStatXXX
//-------------------------------------------------------------------------
@@ -480,7 +471,6 @@ RecIncrGlobalRawStatCount(RecRawStatBlock *rsb, int id, int64_t incr)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecSetGlobalRawStatXXX
//-------------------------------------------------------------------------
@@ -498,7 +488,6 @@ RecSetGlobalRawStatCount(RecRawStatBlock *rsb, int id, int64_t data)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RecGetGlobalRawStatXXX
//-------------------------------------------------------------------------
@@ -516,7 +505,6 @@ RecGetGlobalRawStatCount(RecRawStatBlock *rsb, int id, int64_t *data)
return REC_ERR_OKAY;
}
-
//-------------------------------------------------------------------------
// RegGetGlobalRawStatXXXPtr
//-------------------------------------------------------------------------
@@ -538,7 +526,6 @@ RecGetGlobalRawStatCountPtr(RecRawStatBlock *rsb, int id)
return &(rsb->global[id]->count);
}
-
//-------------------------------------------------------------------------
// RecRegisterRawStatSyncCb
//-------------------------------------------------------------------------
@@ -569,7 +556,6 @@ RecRegisterRawStatSyncCb(const char *name, RecRawStatSyncCb sync_cb, RecRawStatB
return err;
}
-
//-------------------------------------------------------------------------
// RecExecRawStatSyncCbs
//-------------------------------------------------------------------------
diff --git a/lib/records/RecUtils.cc b/lib/records/RecUtils.cc
index d701399..d58c0ab 100644
--- a/lib/records/RecUtils.cc
+++ b/lib/records/RecUtils.cc
@@ -66,7 +66,6 @@ RecAlloc(RecT rec_type, const char *name, RecDataT data_type)
return r;
}
-
//-------------------------------------------------------------------------
// RecDataZero
//-------------------------------------------------------------------------
@@ -355,7 +354,6 @@ RecDataSetFromInk64(RecDataT data_type, RecData *data_dst, int64_t data_int64)
return true;
}
-
//-------------------------------------------------------------------------
// RecDataSetFromFloat
//-------------------------------------------------------------------------
@@ -394,7 +392,6 @@ RecDataSetFromFloat(RecDataT data_type, RecData *data_dst, float data_float)
return true;
}
-
//-------------------------------------------------------------------------
// RecDataSetFromString
//-------------------------------------------------------------------------
diff --git a/lib/records/test_I_RecLocal.cc b/lib/records/test_I_RecLocal.cc
index 5616f66..66eedd2 100644
--- a/lib/records/test_I_RecLocal.cc
+++ b/lib/records/test_I_RecLocal.cc
@@ -30,7 +30,6 @@
Diags *diags = NULL;
void RecDumpRecordsHt(RecT rec_type);
-
//-------------------------------------------------------------------------
// Test01: Callback Test
//
@@ -104,7 +103,6 @@ Test01()
}
}
-
//-------------------------------------------------------------------------
// Test02: Callback (Multi-lock) Test
//
@@ -167,7 +165,6 @@ Test02()
}
}
-
//-------------------------------------------------------------------------
// main
//-------------------------------------------------------------------------
diff --git a/lib/ts/Allocator.h b/lib/ts/Allocator.h
index 518ccf6..135ddfd 100644
--- a/lib/ts/Allocator.h
+++ b/lib/ts/Allocator.h
@@ -78,7 +78,6 @@ public:
}
Allocator() { fl = NULL; }
-
/**
Creates a new allocator.
diff --git a/lib/ts/Arena.cc b/lib/ts/Arena.cc
index b5c8da6..41c4513 100644
--- a/lib/ts/Arena.cc
+++ b/lib/ts/Arena.cc
@@ -28,13 +28,11 @@
#include <assert.h>
#include <string.h>
-
#define DEFAULT_ALLOC_SIZE 1024
#define DEFAULT_BLOCK_SIZE (DEFAULT_ALLOC_SIZE - (sizeof(ArenaBlock) - 8))
static Allocator defaultSizeArenaBlock("ArenaBlock", DEFAULT_ALLOC_SIZE);
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -72,7 +70,6 @@ blk_free(ArenaBlock *blk)
}
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
diff --git a/lib/ts/Arena.h b/lib/ts/Arena.h
index cedba9a..978d234 100644
--- a/lib/ts/Arena.h
+++ b/lib/ts/Arena.h
@@ -24,12 +24,10 @@
#ifndef __ARENA_H__
#define __ARENA_H__
-
#include <sys/types.h>
#include <memory.h>
#include "ts/ink_assert.h"
-
struct ArenaBlock {
ArenaBlock *next;
char *m_heap_end;
@@ -37,13 +35,11 @@ struct ArenaBlock {
char data[8];
};
-
class Arena
{
public:
Arena() : m_blocks(NULL) {}
~Arena() { reset(); }
-
inkcoreapi void *alloc(size_t size, size_t alignment = sizeof(double));
void free(void *mem, size_t size);
size_t str_length(const char *str);
@@ -57,7 +53,6 @@ private:
ArenaBlock *m_blocks;
};
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -171,5 +166,4 @@ Arena::str_store(const char *str, size_t len)
return mem;
}
-
#endif /* __ARENA_H__ */
diff --git a/lib/ts/BaseLogFile.cc b/lib/ts/BaseLogFile.cc
index 349da82..a3ca0c7 100644
--- a/lib/ts/BaseLogFile.cc
+++ b/lib/ts/BaseLogFile.cc
@@ -242,7 +242,6 @@ BaseLogFile::roll()
return roll(start, now);
}
-
/*
* This function will return true if the given filename corresponds to a
* rolled logfile. We make this determination based on the file extension.
@@ -436,7 +435,6 @@ BaseLogFile::log_log(LogLogPriorityLevel priority, const char *format, ...)
va_end(args);
}
-
/****************************************************************************
BaseMetaInfo methods
diff --git a/lib/ts/BaseLogFile.h b/lib/ts/BaseLogFile.h
index af20227..5a10d3d 100644
--- a/lib/ts/BaseLogFile.h
+++ b/lib/ts/BaseLogFile.h
@@ -22,7 +22,6 @@
*/
-
#ifndef BASE_LOG_FILE_H
#define BASE_LOG_FILE_H
@@ -158,7 +157,6 @@ public:
}
};
-
/*
*
* BaseLogFile Class
diff --git a/lib/ts/Bitops.cc b/lib/ts/Bitops.cc
index 4a51e3e..3d223bb 100644
--- a/lib/ts/Bitops.cc
+++ b/lib/ts/Bitops.cc
@@ -23,7 +23,6 @@
#include "ts/Bitops.h"
-
unsigned char bit_table[256] = {
0, 1, 2, 1, 3, 1, 2, 1, 4, 1, 2, 1, 3, 1, 2, 1, 5, 1, 2, 1, 3, 1, 2, 1, 4, 1, 2, 1, 3, 1, 2, 1, 6, 1, 2, 1, 3, 1, 2, 1, 4, 1, 2,
1, 3, 1, 2, 1, 5, 1, 2, 1, 3, 1, 2, 1, 4, 1, 2, 1, 3, 1, 2, 1, 7, 1, 2, 1, 3, 1, 2, 1, 4, 1, 2, 1, 3, 1, 2, 1, 5, 1, 2, 1, 3, 1,
diff --git a/lib/ts/CompileParseRules.cc b/lib/ts/CompileParseRules.cc
index 1e64a51..efb39a0 100644
--- a/lib/ts/CompileParseRules.cc
+++ b/lib/ts/CompileParseRules.cc
@@ -33,7 +33,6 @@ unsigned int tparseRulesCType[256];
char tparseRulesCTypeToUpper[256];
char tparseRulesCTypeToLower[256];
-
#include <stdio.h>
#include <ctype.h>
#include "ts/ink_string.h"
diff --git a/lib/ts/ConsistentHash.cc b/lib/ts/ConsistentHash.cc
index 6a46229..d49a10c 100644
--- a/lib/ts/ConsistentHash.cc
+++ b/lib/ts/ConsistentHash.cc
@@ -27,7 +27,8 @@
#include <climits>
#include <cstdio>
-std::ostream &operator<<(std::ostream &os, ATSConsistentHashNode &thing)
+std::ostream &
+operator<<(std::ostream &os, ATSConsistentHashNode &thing)
{
return os << thing.name;
}
diff --git a/lib/ts/ContFlags.cc b/lib/ts/ContFlags.cc
index 4e37e5e..dce7cde 100644
--- a/lib/ts/ContFlags.cc
+++ b/lib/ts/ContFlags.cc
@@ -33,7 +33,6 @@ init_thread_key()
return flags_data_key;
}
-
/* Set up a cont_flags entry for this threa */
void
init_cont_flags()
diff --git a/lib/ts/ContFlags.h b/lib/ts/ContFlags.h
index 8e57cec..21dff75 100644
--- a/lib/ts/ContFlags.h
+++ b/lib/ts/ContFlags.h
@@ -49,7 +49,8 @@ public:
{
raw_flags = new_flags;
}
- ContFlags &operator=(ContFlags const &other)
+ ContFlags &
+ operator=(ContFlags const &other)
{
this->set_flags(other.get_flags());
return *this;
diff --git a/lib/ts/CryptoHash.h b/lib/ts/CryptoHash.h
index aec07bb..aae1a3d 100644
--- a/lib/ts/CryptoHash.h
+++ b/lib/ts/CryptoHash.h
@@ -44,7 +44,8 @@ union CryptoHash {
}
/// Assignment - bitwise copy.
- CryptoHash &operator=(CryptoHash const &that)
+ CryptoHash &
+ operator=(CryptoHash const &that)
{
u64[0] = that.u64[0];
u64[1] = that.u64[1];
@@ -52,10 +53,18 @@ union CryptoHash {
}
/// Equality - bitwise identical.
- bool operator==(CryptoHash const &that) const { return u64[0] == that.u64[0] && u64[1] == that.u64[1]; }
+ bool
+ operator==(CryptoHash const &that) const
+ {
+ return u64[0] == that.u64[0] && u64[1] == that.u64[1];
+ }
/// Equality - bitwise identical.
- bool operator!=(CryptoHash const &that) const { return !(*this == that); }
+ bool
+ operator!=(CryptoHash const &that) const
+ {
+ return !(*this == that);
+ }
/// Reduce to 64 bit value.
uint64_t
@@ -66,7 +75,6 @@ union CryptoHash {
/// Access 64 bit slice.
uint64_t operator[](int i) const { return u64[i]; }
-
/// Access 64 bit slice.
/// @note Identical to @ operator[] but included for symmetry.
uint64_t
@@ -102,7 +110,6 @@ class CryptoContext
public:
/// Destructor (force virtual)
virtual ~CryptoContext() {}
-
/// Update the hash with @a data of @a length bytes.
virtual bool update(void const *data, int length) = 0;
/// Finalize and extract the @a hash.
diff --git a/lib/ts/Diags.cc b/lib/ts/Diags.cc
index 36e607a..f5543bb 100644
--- a/lib/ts/Diags.cc
+++ b/lib/ts/Diags.cc
@@ -54,7 +54,7 @@ static bool setup_diagslog(BaseLogFile *blf);
template <int Size>
static void
-vprintline(FILE *fp, char(&buffer)[Size], va_list ap)
+vprintline(FILE *fp, char (&buffer)[Size], va_list ap)
{
int nbytes = strlen(buffer);
@@ -98,7 +98,6 @@ SrcLoc::str(char *buf, int buflen) const
return (buf);
}
-
//////////////////////////////////////////////////////////////////////////////
//
// Diags::Diags(char *bdt, char *bat)
@@ -202,7 +201,6 @@ Diags::~Diags()
deactivate_all(DiagsTagType_Action);
}
-
//////////////////////////////////////////////////////////////////////////////
//
// void Diags::print_va(...)
@@ -303,7 +301,6 @@ Diags::print_va(const char *debug_tag, DiagsLevel diags_level, const SrcLoc *loc
;
*end_of_format++ = NUL;
-
//////////////////////////////////////////////////////////////////
// prepend timestamp into the timestamped version of the buffer //
//////////////////////////////////////////////////////////////////
@@ -406,7 +403,6 @@ Diags::print_va(const char *debug_tag, DiagsLevel diags_level, const SrcLoc *loc
#endif
}
-
//////////////////////////////////////////////////////////////////////////////
//
// bool Diags::tag_activated(char * tag, DiagsTagType mode)
@@ -434,7 +430,6 @@ Diags::tag_activated(const char *tag, DiagsTagType mode) const
return (activated);
}
-
//////////////////////////////////////////////////////////////////////////////
//
// void Diags::activate_taglist(char * taglist, DiagsTagType mode)
@@ -460,7 +455,6 @@ Diags::activate_taglist(const char *taglist, DiagsTagType mode)
}
}
-
//////////////////////////////////////////////////////////////////////////////
//
// void Diags::deactivate_all(DiagsTagType mode)
@@ -482,7 +476,6 @@ Diags::deactivate_all(DiagsTagType mode)
unlock();
}
-
//////////////////////////////////////////////////////////////////////////////
//
// const char *Diags::level_name(DiagsLevel dl)
@@ -519,7 +512,6 @@ Diags::level_name(DiagsLevel dl) const
}
}
-
//////////////////////////////////////////////////////////////////////////////
//
// void Diags::dump(FILE *fp)
diff --git a/lib/ts/Diags.h b/lib/ts/Diags.h
index 3338444..fc01fc7 100644
--- a/lib/ts/Diags.h
+++ b/lib/ts/Diags.h
@@ -90,7 +90,6 @@ struct DiagsConfigState {
DiagsModeOutput outputs[DiagsLevel_Count]; // where each level prints
};
-
//////////////////////////////////////////////////////////////////////////////
//
// class SrcLoc
@@ -118,7 +117,8 @@ public:
SrcLoc(const SrcLoc &rhs) : file(rhs.file), func(rhs.func), line(rhs.line) {}
SrcLoc(const char *_file, const char *_func, int _line) : file(_file), func(_func), line(_line) {}
- SrcLoc &operator=(const SrcLoc &rhs)
+ SrcLoc &
+ operator=(const SrcLoc &rhs)
{
this->file = rhs.file;
this->func = rhs.func;
@@ -129,7 +129,6 @@ public:
char *str(char *buf, int buflen) const;
};
-
//////////////////////////////////////////////////////////////////////////////
//
// class Diags
@@ -165,7 +164,6 @@ public:
// conditional debugging //
///////////////////////////
-
bool
get_override() const
{
@@ -198,7 +196,6 @@ public:
inkcoreapi void print_va(const char *tag, DiagsLevel dl, const SrcLoc *loc, const char *format_string, va_list ap) const;
-
//////////////////////////////
// user printing interfaces //
//////////////////////////////
@@ -267,7 +264,6 @@ private:
mutable ink_mutex tag_table_lock; // prevents reconfig/read races
DFA *activated_tags[2]; // 1 table for debug, 1 for action
-
// log rotation variables
RollingEnabledValues outputlog_rolling_enabled;
int outputlog_rolling_size;
@@ -373,7 +369,6 @@ dummy_debug(const char *tag, const char *fmt, ...)
if (0 && tag) \
dummy_debug(tag, __VA_ARGS__);
-
#define is_debug_tag_set(_t) 0
#define is_action_tag_set(_t) 0
#define debug_tag_assert(_t, _a) /**/
diff --git a/lib/ts/DynArray.h b/lib/ts/DynArray.h
index bd18cc5..dff136f 100644
--- a/lib/ts/DynArray.h
+++ b/lib/ts/DynArray.h
@@ -52,10 +52,8 @@ private:
int pos;
};
-
template <class T>
-inline DynArray<T>::DynArray(const T *val, intptr_t initial_size)
- : data(NULL), default_val(val), size(0), pos(-1)
+inline DynArray<T>::DynArray(const T *val, intptr_t initial_size) : data(NULL), default_val(val), size(0), pos(-1)
{
if (initial_size > 0) {
int i = 1;
@@ -91,7 +89,9 @@ template <class T> inline T &DynArray<T>::operator[](intptr_t idx)
return data[idx];
}
-template <class T> inline T &DynArray<T>::operator()(intptr_t idx)
+template <class T>
+inline T &
+DynArray<T>::operator()(intptr_t idx)
{
if (idx >= size) {
intptr_t new_size;
@@ -189,5 +189,4 @@ DynArray<T>::resize(intptr_t new_size)
}
}
-
#endif /* __DYN_ARRAY_H__ */
diff --git a/lib/ts/Hash.cc b/lib/ts/Hash.cc
index e8debb4..4fbc356 100644
--- a/lib/ts/Hash.cc
+++ b/lib/ts/Hash.cc
@@ -26,7 +26,8 @@ ATSHashBase::~ATSHashBase()
{
}
-bool ATSHash::operator==(const ATSHash &other) const
+bool
+ATSHash::operator==(const ATSHash &other) const
{
if (this->size() != other.size()) {
return false;
@@ -38,12 +39,14 @@ bool ATSHash::operator==(const ATSHash &other) const
}
}
-bool ATSHash32::operator==(const ATSHash32 &other) const
+bool
+ATSHash32::operator==(const ATSHash32 &other) const
{
return this->get() == other.get();
}
-bool ATSHash64::operator==(const ATSHash64 &other) const
+bool
+ATSHash64::operator==(const ATSHash64 &other) const
{
return this->get() == other.get();
}
diff --git a/lib/ts/Hash.h b/lib/ts/Hash.h
index 19ed7bb..31d05ae 100644
--- a/lib/ts/Hash.h
+++ b/lib/ts/Hash.h
@@ -35,11 +35,19 @@ struct ATSHashBase {
struct ATSHash : ATSHashBase {
struct nullxfrm {
- uint8_t operator()(uint8_t byte) const { return byte; }
+ uint8_t
+ operator()(uint8_t byte) const
+ {
+ return byte;
+ }
};
struct nocase {
- uint8_t operator()(uint8_t byte) const { return toupper(byte); }
+ uint8_t
+ operator()(uint8_t byte) const
+ {
+ return toupper(byte);
+ }
};
virtual const void *get(void) const = 0;
diff --git a/lib/ts/HashFNV.h b/lib/ts/HashFNV.h
index d3123fe..5fed337 100644
--- a/lib/ts/HashFNV.h
+++ b/lib/ts/HashFNV.h
@@ -80,7 +80,6 @@ private:
uint64_t hval;
};
-
template <typename Transform>
void
ATSHash64FNV1a::update(const void *data, size_t len, Transform xfrm)
diff --git a/lib/ts/HostLookup.cc b/lib/ts/HostLookup.cc
index 24f1e04..ae3d22f 100644
--- a/lib/ts/HostLookup.cc
+++ b/lib/ts/HostLookup.cc
@@ -269,7 +269,6 @@ charIndexIterState::charIndexIterState() : cur_level(-1), cur_index(-1), cur_el(
{
}
-
// class charIndex - A constant time string matcher intended for
// short strings in a sparsely populated DNS paritition
//
@@ -404,7 +403,6 @@ charIndex::Insert(const char *match_data, HostBranch *toInsert)
}
}
-
// HostBranch* charIndex::Lookup(const char* match_data)
//
// Searches the charIndex on key match_data
@@ -881,7 +879,6 @@ HostLookup::TableNewLevel(HostBranch *from, const char *level_data)
return InsertBranch(from, level_data);
}
-
//
// HostBranch* HostLookup::InsertBranch(HostBranch* insert_to, const char* level_data)
//
@@ -902,7 +899,6 @@ HostLookup::InsertBranch(HostBranch *insert_in, const char *level_data)
char *key = NULL;
InkHashTable *new_ht;
-
HostBranch *new_branch = new HostBranch;
new_branch->type = HOST_TERMINAL;
new_branch->level = insert_in->level + 1;
@@ -1131,7 +1127,6 @@ HostLookup::MatchArray(HostLookupState *s, void **opaque_ptr, DynArray<int> &arr
return false;
}
-
// bool HostLookup::MatchFirst(const char* host, HostLookupState* s, void** opaque_ptr)
//
//
diff --git a/lib/ts/HostLookup.h b/lib/ts/HostLookup.h
index 5e8bd7b..df23c64 100644
--- a/lib/ts/HostLookup.h
+++ b/lib/ts/HostLookup.h
@@ -84,9 +84,7 @@ typedef void (*HostLookupPrintFunc)(void *opaque_data);
struct HostLookupState {
HostLookupState() : cur(NULL), table_level(0), array_index(0), hostname(NULL), host_copy(NULL), host_copy_next(NULL) {}
-
~HostLookupState() { ats_free(host_copy); }
-
HostBranch *cur;
int table_level;
int array_index;
@@ -128,5 +126,4 @@ private:
const char *matcher_name; // Used for Debug/Warning/Error messages
};
-
#endif
diff --git a/lib/ts/I_Version.h b/lib/ts/I_Version.h
index c51e1bd..16d1897 100644
--- a/lib/ts/I_Version.h
+++ b/lib/ts/I_Version.h
@@ -39,7 +39,8 @@ struct VersionNumber {
VersionNumber(short int major, short int minor) : ink_major(major), ink_minor(minor) {}
};
-inline bool operator<(VersionNumber const &lhs, VersionNumber const &rhs)
+inline bool
+operator<(VersionNumber const &lhs, VersionNumber const &rhs)
{
return lhs.ink_major < rhs.ink_major || (lhs.ink_major == rhs.ink_major && lhs.ink_minor < rhs.ink_minor);
}
diff --git a/lib/ts/IntrusiveDList.h b/lib/ts/IntrusiveDList.h
index 4f38feb..b9469f0 100644
--- a/lib/ts/IntrusiveDList.h
+++ b/lib/ts/IntrusiveDList.h
@@ -123,7 +123,11 @@ public:
iterator() : _list(0), _elt(0) {}
/// Equality test.
/// @return @c true if @c this and @a that refer to the same object.
- bool operator==(self const &that) const { return _list == that._list && _elt == that._elt; }
+ bool
+ operator==(self const &that) const
+ {
+ return _list == that._list && _elt == that._elt;
+ }
/// Pre-increment.
/// Move to the next element in the list.
/// @return The iterator.
@@ -164,14 +168,17 @@ public:
}
/// Inequality test.
/// @return @c true if @c this and @a do not refer to the same object.
- bool operator!=(self const &that) const { return !(*this == that); }
+ bool
+ operator!=(self const &that) const
+ {
+ return !(*this == that);
+ }
/// Dereference.
/// @return A reference to the referent.
reference operator*() { return *_elt; }
/// Dereference.
/// @return A pointer to the referent.
pointer operator->() { return _elt; }
-
protected:
IntrusiveDList *_list; ///< List for this iterator.
T *_elt; ///< Referenced element.
diff --git a/lib/ts/IntrusivePtrTest.cc b/lib/ts/IntrusivePtrTest.cc
index 212e8d0..6178433 100644
--- a/lib/ts/IntrusivePtrTest.cc
+++ b/lib/ts/IntrusivePtrTest.cc
@@ -49,7 +49,7 @@ public:
};
// Definitions to test compilation.
-typedef IntrusivePtrQueue<A, IntrusivePtrLinkFunction<A, &A::nextPtr, &A::prevPtr> > AList;
+typedef IntrusivePtrQueue<A, IntrusivePtrLinkFunction<A, &A::nextPtr, &A::prevPtr>> AList;
}
REGRESSION_TEST(IntrusivePtr_Test_Basic)(RegressionTest *t, int atype, int *pstatus)
diff --git a/lib/ts/IpMap.cc b/lib/ts/IpMap.cc
index dee651f..2afc394 100644
--- a/lib/ts/IpMap.cc
+++ b/lib/ts/IpMap.cc
@@ -58,26 +58,70 @@ namespace detail
}
/// Less than.
- inline bool operator<(sockaddr_in6 const &lhs, sockaddr_in6 const &rhs) { return ts::detail::cmp(lhs, rhs) < 0; }
- inline bool operator<(sockaddr_in6 const *lhs, sockaddr_in6 const &rhs) { return ts::detail::cmp(*lhs, rhs) < 0; }
+ inline bool
+ operator<(sockaddr_in6 const &lhs, sockaddr_in6 const &rhs)
+ {
+ return ts::detail::cmp(lhs, rhs) < 0;
+ }
+ inline bool
+ operator<(sockaddr_in6 const *lhs, sockaddr_in6 const &rhs)
+ {
+ return ts::detail::cmp(*lhs, rhs) < 0;
+ }
/// Less than.
- inline bool operator<(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs) { return ts::detail::cmp(lhs, *rhs) < 0; }
+ inline bool
+ operator<(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs)
+ {
+ return ts::detail::cmp(lhs, *rhs) < 0;
+ }
/// Equality.
- inline bool operator==(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs) { return ts::detail::cmp(lhs, *rhs) == 0; }
+ inline bool
+ operator==(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs)
+ {
+ return ts::detail::cmp(lhs, *rhs) == 0;
+ }
/// Equality.
- inline bool operator==(sockaddr_in6 const *lhs, sockaddr_in6 const &rhs) { return ts::detail::cmp(*lhs, rhs) == 0; }
+ inline bool
+ operator==(sockaddr_in6 const *lhs, sockaddr_in6 const &rhs)
+ {
+ return ts::detail::cmp(*lhs, rhs) == 0;
+ }
/// Equality.
- inline bool operator==(sockaddr_in6 const &lhs, sockaddr_in6 const &rhs) { return ts::detail::cmp(lhs, rhs) == 0; }
+ inline bool
+ operator==(sockaddr_in6 const &lhs, sockaddr_in6 const &rhs)
+ {
+ return ts::detail::cmp(lhs, rhs) == 0;
+ }
/// Less than or equal.
- inline bool operator<=(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs) { return ts::detail::cmp(lhs, *rhs) <= 0; }
+ inline bool
+ operator<=(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs)
+ {
+ return ts::detail::cmp(lhs, *rhs) <= 0;
+ }
/// Less than or equal.
- inline bool operator<=(sockaddr_in6 const &lhs, sockaddr_in6 const &rhs) { return ts::detail::cmp(lhs, rhs) <= 0; }
+ inline bool
+ operator<=(sockaddr_in6 const &lhs, sockaddr_in6 const &rhs)
+ {
+ return ts::detail::cmp(lhs, rhs) <= 0;
+ }
/// Greater than or equal.
- inline bool operator>=(sockaddr_in6 const &lhs, sockaddr_in6 const &rhs) { return ts::detail::cmp(lhs, rhs) >= 0; }
+ inline bool
+ operator>=(sockaddr_in6 const &lhs, sockaddr_in6 const &rhs)
+ {
+ return ts::detail::cmp(lhs, rhs) >= 0;
+ }
/// Greater than or equal.
- inline bool operator>=(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs) { return ts::detail::cmp(lhs, *rhs) >= 0; }
+ inline bool
+ operator>=(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs)
+ {
+ return ts::detail::cmp(lhs, *rhs) >= 0;
+ }
/// Greater than.
- inline bool operator>(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs) { return ts::detail::cmp(lhs, *rhs) > 0; }
+ inline bool
+ operator>(sockaddr_in6 const &lhs, sockaddr_in6 const *rhs)
+ {
+ return ts::detail::cmp(lhs, *rhs) > 0;
+ }
/** Base template class for IP maps.
This class is templated by the @a N type which must be a subclass
@@ -96,7 +140,6 @@ namespace detail
IpMapBase() : _root(0) {}
~IpMapBase() { this->clear(); }
-
/** Mark a range.
All addresses in the range [ @a min , @a max ] are marked with @a data.
@return This object.
@@ -1176,6 +1219,5 @@ inline IpMap::iterator &IpMap::iterator::operator--()
return *this;
}
-
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
diff --git a/lib/ts/IpMap.h b/lib/ts/IpMap.h
index 3cf7892..eb5f8e7 100644
--- a/lib/ts/IpMap.h
+++ b/lib/ts/IpMap.h
@@ -155,7 +155,6 @@ public:
typedef std::bidirectional_iterator_tag iterator_category;
/// Default constructor.
iterator() : _tree(0), _node(0) {}
-
reference operator*() const; //!< value operator
pointer operator->() const; //!< dereference operator
self &operator++(); //!< next node (prefix)
@@ -170,7 +169,11 @@ public:
/** Inequality.
@return @c true if the iterators refer to different nodes.
*/
- bool operator!=(self const &that) const { return !(*this == that); }
+ bool
+ operator!=(self const &that) const
+ {
+ return !(*this == that);
+ }
private:
/// Construct a valid iterator.
@@ -427,7 +430,8 @@ inline IpMap::iterator IpMap::iterator::operator--(int)
return tmp;
}
-inline bool IpMap::iterator::operator==(iterator const &that) const
+inline bool
+IpMap::iterator::operator==(iterator const &that) const
{
return _tree == that._tree && _node == that._node;
}
diff --git a/lib/ts/List.h b/lib/ts/List.h
index 30da14a..edab76a 100644
--- a/lib/ts/List.h
+++ b/lib/ts/List.h
@@ -154,7 +154,6 @@ template <class C> struct Link : public SLink<C> {
#define LINK_DEFINITION(_c, _f) \
inline _c *&Link##_##_c##_##_f::next_link(_c *c) { return c->_f.next; } \
inline _c *&Link##_##_c##_##_f::prev_link(_c *c) { return c->_f.prev; }
-
//
// List descriptor for singly-linked list of objects of type C.
//
@@ -598,8 +597,16 @@ template <class C, class A = DefaultAlloc> struct ConsCell {
ConsCell(C acar, ConsCell *acdr) : car(acar), cdr(acdr) {}
ConsCell(C acar) : car(acar), cdr(NULL) {}
ConsCell(ConsCell *acdr) : cdr(acdr) {}
- static void *operator new(size_t size) { return A::alloc(size); }
- static void operator delete(void *p, size_t /* size ATS_UNUSED */) { A::free(p); }
+ static void *
+ operator new(size_t size)
+ {
+ return A::alloc(size);
+ }
+ static void
+ operator delete(void *p, size_t /* size ATS_UNUSED */)
+ {
+ A::free(p);
+ }
};
template <class C, class A = DefaultAlloc> struct List {
diff --git a/lib/ts/MMH.cc b/lib/ts/MMH.cc
index a90e4d5..5c19cea 100644
--- a/lib/ts/MMH.cc
+++ b/lib/ts/MMH.cc
@@ -322,7 +322,6 @@ _memset(unsigned char *b, int c, int len)
}
#endif
-
int
ink_code_incr_MMH_final(uint8_t *presult, MMH_CTX *ctx)
{
diff --git a/lib/ts/Map.h b/lib/ts/Map.h
index bc2ee16..9ed4fb9 100644
--- a/lib/ts/Map.h
+++ b/lib/ts/Map.h
@@ -55,7 +55,11 @@ template <class K, class C> class MapElem
public:
K key;
C value;
- bool operator==(MapElem &e) { return e.key == key; }
+ bool
+ operator==(MapElem &e)
+ {
+ return e.key == key;
+ }
operator uintptr_t(void) { return (uintptr_t)(uintptr_t)key; }
MapElem(uintptr_t x)
{
@@ -123,7 +127,6 @@ public:
qq__##_p = (_c *)(((uintptr_t)qq__##_p) + 1)) \
if ((_p)->key)
-
template <class K, class AHashFns, class C, class A = DefaultAlloc> class HashSet : public Vec<C, A>
{
public:
@@ -573,8 +576,8 @@ ChainHash<C, AHashFns, A>::put(C c)
{
uintptr_t h = AHashFns::hash(c);
List<C, A> *l;
- MapElem<uintptr_t, List<C, A> > e(h, (C)0);
- MapElem<uintptr_t, List<C, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<C, A>> e(h, (C)0);
+ MapElem<uintptr_t, List<C, A>> *x = this->set_in(e);
if (x)
l = &x->value;
else {
@@ -592,8 +595,8 @@ ChainHash<C, AHashFns, A>::get(C c)
{
uintptr_t h = AHashFns::hash(c);
List<C> empty;
- MapElem<uintptr_t, List<C, A> > e(h, empty);
- MapElem<uintptr_t, List<C, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<C, A>> e(h, empty);
+ MapElem<uintptr_t, List<C, A>> *x = this->set_in(e);
if (!x)
return 0;
List<C> *l = &x->value;
@@ -607,12 +610,12 @@ ChainHash<C, AHashFns, A>::put_bag(C c)
{
uintptr_t h = AHashFns::hash(c);
List<C, A> *l;
- MapElem<uintptr_t, List<C, A> > e(h, (C)0);
- MapElem<uintptr_t, List<C, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<C, A>> e(h, (C)0);
+ MapElem<uintptr_t, List<C, A>> *x = this->set_in(e);
if (x)
l = &x->value;
else {
- l = &Map<uintptr_t, List<C, A> >::put(h, c)->value;
+ l = &Map<uintptr_t, List<C, A>>::put(h, c)->value;
return l->head->car;
}
l->push(c);
@@ -625,8 +628,8 @@ ChainHash<C, AHashFns, A>::get_bag(C c, Vec<C> &v)
{
uintptr_t h = AHashFns::hash(c);
List<C, A> empty;
- MapElem<uintptr_t, List<C, A> > e(h, empty);
- MapElem<uintptr_t, List<C, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<C, A>> e(h, empty);
+ MapElem<uintptr_t, List<C, A>> *x = this->set_in(e);
if (!x)
return 0;
List<C, A> *l = &x->value;
@@ -650,8 +653,8 @@ ChainHash<C, AHashFns, A>::del(C c)
{
uintptr_t h = AHashFns::hash(c);
List<C> *l;
- MapElem<uintptr_t, List<C, A> > e(h, (C)0);
- MapElem<uintptr_t, List<C, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<C, A>> e(h, (C)0);
+ MapElem<uintptr_t, List<C, A>> *x = this->set_in(e);
if (x)
l = &x->value;
else
@@ -680,8 +683,8 @@ ChainHashMap<K, AHashFns, C, A>::put(K akey, C avalue)
List<MapElem<K, C>, A> empty;
List<MapElem<K, C>, A> *l;
MapElem<K, C> c(akey, avalue);
- MapElem<uintptr_t, List<MapElem<K, C>, A> > e(h, empty);
- MapElem<uintptr_t, List<MapElem<K, C>, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> e(h, empty);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> *x = this->set_in(e);
if (x)
l = &x->value;
else {
@@ -703,8 +706,8 @@ ChainHashMap<K, AHashFns, C, A>::get(K akey)
{
uintptr_t h = AHashFns::hash(akey);
List<MapElem<K, C>, A> empty;
- MapElem<uintptr_t, List<MapElem<K, C>, A> > e(h, empty);
- MapElem<uintptr_t, List<MapElem<K, C>, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> e(h, empty);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> *x = this->set_in(e);
if (!x)
return 0;
List<MapElem<K, C>, A> *l = &x->value;
@@ -723,8 +726,8 @@ ChainHashMap<K, AHashFns, C, A>::put_bag(K akey, C avalue)
List<MapElem<K, C>, A> empty;
List<MapElem<K, C>, A> *l;
MapElem<K, C> c(akey, avalue);
- MapElem<uintptr_t, List<MapElem<K, C>, A> > e(h, empty);
- MapElem<uintptr_t, List<MapElem<K, C>, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> e(h, empty);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> *x = this->set_in(e);
if (x)
l = &x->value;
else {
@@ -744,8 +747,8 @@ ChainHashMap<K, AHashFns, C, A>::get_bag(K akey, Vec<C> &v)
{
uintptr_t h = AHashFns::hash(akey);
List<MapElem<K, C>, A> empty;
- MapElem<uintptr_t, List<MapElem<K, C>, A> > e(h, empty);
- MapElem<uintptr_t, List<MapElem<K, C>, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> e(h, empty);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> *x = this->set_in(e);
if (!x)
return 0;
List<MapElem<K, C>, A> *l = &x->value;
@@ -762,8 +765,8 @@ ChainHashMap<K, AHashFns, C, A>::del(K akey)
uintptr_t h = AHashFns::hash(akey);
List<MapElem<K, C>, A> empty;
List<MapElem<K, C>, A> *l;
- MapElem<uintptr_t, List<MapElem<K, C>, A> > e(h, empty);
- MapElem<uintptr_t, List<MapElem<K, C>, A> > *x = this->set_in(e);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> e(h, empty);
+ MapElem<uintptr_t, List<MapElem<K, C>, A>> *x = this->set_in(e);
if (x)
l = &x->value;
else
@@ -787,7 +790,7 @@ void
ChainHashMap<K, AHashFns, C, A>::get_keys(Vec<K> &keys)
{
for (size_t i = 0; i < n; i++) {
- List<MapElem<K, C> > *l = &v[i].value;
+ List<MapElem<K, C>> *l = &v[i].value;
if (l->head)
for (ConsCell<MapElem<K, C>, A> *p = l->head; p; p = p->cdr)
keys.add(p->car.key);
@@ -819,8 +822,8 @@ StringChainHash<F, A>::canonicalize(cchar *s, cchar *e)
else
while (*a)
h = h * 27 + (unsigned char)*a++;
- MapElem<uintptr_t, List<cchar *, A> > me(h, (char *)0);
- MapElem<uintptr_t, List<cchar *, A> > *x = this->set_in(me);
+ MapElem<uintptr_t, List<cchar *, A>> me(h, (char *)0);
+ MapElem<uintptr_t, List<cchar *, A>> *x = this->set_in(me);
if (x) {
List<cchar *, A> *l = &x->value;
typedef ConsCell<cchar *, A> TT;
@@ -1263,7 +1266,6 @@ public:
/// Default constructor - empty location.
Location() : m_value(NULL), m_bucket(NULL), m_id(0), m_distance(0) {}
-
/// Check for location being valid (referencing a value).
bool
isValid() const
@@ -1275,12 +1277,10 @@ public:
/// @note This lets you assign the return of @c find to a @c Value*.
/// @note This also permits the use of this class directly as a boolean expression.
operator Value *() const { return m_value; }
-
/// Dereference.
Value &operator*() const { return *m_value; }
/// Dereference.
Value *operator->() const { return m_value; }
-
/// Find next value with matching key (prefix).
Location &operator++()
{
@@ -1316,8 +1316,16 @@ public:
iterator &operator++();
Value &operator*() { return *m_value; }
Value *operator->() { return m_value; }
- bool operator==(iterator const &that) { return m_bucket == that.m_bucket && m_value == that.m_value; }
- bool operator!=(iterator const &that) { return !(*this == that); }
+ bool
+ operator==(iterator const &that)
+ {
+ return m_bucket == that.m_bucket && m_value == that.m_value;
+ }
+ bool
+ operator!=(iterator const &that)
+ {
+ return !(*this == that);
+ }
protected:
/// Internal iterator constructor.
@@ -1482,8 +1490,7 @@ template <typename H> typename TSHashTable<H>::iterator &TSHashTable<H>::iterato
}
template <typename H>
-TSHashTable<H>::TSHashTable(size_t nb)
- : m_count(0), m_expansion_policy(AVERAGE), m_expansion_limit(DEFAULT_EXPANSION_LIMIT)
+TSHashTable<H>::TSHashTable(size_t nb) : m_count(0), m_expansion_policy(AVERAGE), m_expansion_limit(DEFAULT_EXPANSION_LIMIT)
{
if (nb) {
int idx = 1;
diff --git a/lib/ts/MatcherUtils.cc b/lib/ts/MatcherUtils.cc
index ae86c4b..a1f6f0b 100644
--- a/lib/ts/MatcherUtils.cc
+++ b/lib/ts/MatcherUtils.cc
@@ -53,7 +53,6 @@ config_parse_error::config_parse_error(const char *fmt, ...)
va_end(ap);
}
-
// char* readIntoBuffer(const char* file_path, const char* module_name,
// int* read_size_ptr)
//
diff --git a/lib/ts/MatcherUtils.h b/lib/ts/MatcherUtils.h
index d53ca8b..9dbb0ac 100644
--- a/lib/ts/MatcherUtils.h
+++ b/lib/ts/MatcherUtils.h
@@ -130,7 +130,8 @@ struct config_parse_error {
explicit config_parse_error(const char *fmt, ...) TS_NONNULL(2) TS_PRINTFLIKE(2, 3);
- config_parse_error &operator=(const config_parse_error &rhs)
+ config_parse_error &
+ operator=(const config_parse_error &rhs)
{
if (rhs.msg.get()) {
this->msg = ats_strdup(rhs.msg.get());
@@ -149,10 +150,8 @@ struct config_parse_error {
// A config error object evaluates to true if there is an error message.
operator bool() const { return msg.get() != NULL; }
-
private:
config_parse_error() {}
-
ats_scoped_str msg;
};
diff --git a/lib/ts/ParseRules.h b/lib/ts/ParseRules.h
index ae248de..2b430cf 100644
--- a/lib/ts/ParseRules.h
+++ b/lib/ts/ParseRules.h
@@ -802,7 +802,6 @@ int64_t ink_atoi64(const char *);
uint64_t ink_atoui64(const char *);
int64_t ink_atoi64(const char *, int);
-
static inline int
ink_atoi(const char *str)
{
diff --git a/lib/ts/PriorityQueue.h b/lib/ts/PriorityQueue.h
index f7185af..66ffbf3 100644
--- a/lib/ts/PriorityQueue.h
+++ b/lib/ts/PriorityQueue.h
@@ -29,21 +29,23 @@
template <typename T> struct PriorityQueueEntry {
PriorityQueueEntry(T n) : index(0), node(n) {}
-
uint32_t index;
T node;
};
template <typename T> struct PriorityQueueLess {
- bool operator()(const T &a, const T &b) { return *a < *b; }
+ bool
+ operator()(const T &a, const T &b)
+ {
+ return *a < *b;
+ }
};
-template <typename T, class Comp = PriorityQueueLess<T> > class PriorityQueue
+template <typename T, class Comp = PriorityQueueLess<T>> class PriorityQueue
{
public:
PriorityQueue() {}
~PriorityQueue() {}
-
const bool empty();
PriorityQueueEntry<T> *top();
void pop();
@@ -155,7 +157,6 @@ PriorityQueue<T, Comp>::_swap(uint32_t i, uint32_t j)
_v[j]->index = j;
}
-
template <typename T, typename Comp>
void
PriorityQueue<T, Comp>::_bubble_up(uint32_t index)
diff --git a/lib/ts/Ptr.h b/lib/ts/Ptr.h
index d193d31..c43330a 100644
--- a/lib/ts/Ptr.h
+++ b/lib/ts/Ptr.h
@@ -53,7 +53,8 @@ public:
return;
}
virtual ~NonAtomicRefCountObj() { return; }
- NonAtomicRefCountObj &operator=(const NonAtomicRefCountObj &s)
+ NonAtomicRefCountObj &
+ operator=(const NonAtomicRefCountObj &s)
{
(void)s;
return (*this);
@@ -94,7 +95,6 @@ NonAtomicRefCountObj::refcount() const
return m_refcount;
}
-
////////////////////////////////////////////////////////////////////////
//
// class NonAtomicPtr
@@ -115,11 +115,26 @@ public:
operator T *() const { return (m_ptr); }
T *operator->() const { return (m_ptr); }
T &operator*() const { return (*m_ptr); }
-
- int operator==(const T *p) { return (m_ptr == p); }
- int operator==(const NonAtomicPtr<T> &p) { return (m_ptr == p.m_ptr); }
- int operator!=(const T *p) { return (m_ptr != p); }
- int operator!=(const NonAtomicPtr<T> &p) { return (m_ptr != p.m_ptr); }
+ int
+ operator==(const T *p)
+ {
+ return (m_ptr == p);
+ }
+ int
+ operator==(const NonAtomicPtr<T> &p)
+ {
+ return (m_ptr == p.m_ptr);
+ }
+ int
+ operator!=(const T *p)
+ {
+ return (m_ptr != p);
+ }
+ int
+ operator!=(const NonAtomicPtr<T> &p)
+ {
+ return (m_ptr != p.m_ptr);
+ }
NonAtomicRefCountObj *
_ptr()
@@ -164,7 +179,9 @@ template <class T> inline NonAtomicPtr<T>::~NonAtomicPtr()
return;
}
-template <class T> inline NonAtomicPtr<T> &NonAtomicPtr<T>::operator=(T *p)
+template <class T>
+inline NonAtomicPtr<T> &
+NonAtomicPtr<T>::operator=(T *p)
{
T *temp_ptr = m_ptr;
@@ -193,12 +210,13 @@ NonAtomicPtr<T>::clear()
m_ptr = NULL;
}
}
-template <class T> inline NonAtomicPtr<T> &NonAtomicPtr<T>::operator=(const NonAtomicPtr<T> &src)
+template <class T>
+inline NonAtomicPtr<T> &
+NonAtomicPtr<T>::operator=(const NonAtomicPtr<T> &src)
{
return (operator=(src.m_ptr));
}
-
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
////// ATOMIC VERSIONS
@@ -209,7 +227,6 @@ struct ForceVFPTToTop {
virtual ~ForceVFPTToTop() {}
};
-
////////////////////////////////////////////////////////////////////////
//
// class RefCountObj
@@ -226,7 +243,8 @@ public:
return;
}
virtual ~RefCountObj() {}
- RefCountObj &operator=(const RefCountObj &s)
+ RefCountObj &
+ operator=(const RefCountObj &s)
{
(void)s;
return (*this);
@@ -269,7 +287,6 @@ RefCountObj::refcount() const
return m_refcount;
}
-
////////////////////////////////////////////////////////////////////////
//
// class Ptr
@@ -300,11 +317,26 @@ public:
operator T *() const { return (m_ptr); }
T *operator->() const { return (m_ptr); }
T &operator*() const { return (*m_ptr); }
-
- int operator==(const T *p) { return (m_ptr == p); }
- int operator==(const Ptr<T> &p) { return (m_ptr == p.m_ptr); }
- int operator!=(const T *p) { return (m_ptr != p); }
- int operator!=(const Ptr<T> &p) { return (m_ptr != p.m_ptr); }
+ int
+ operator==(const T *p)
+ {
+ return (m_ptr == p);
+ }
+ int
+ operator==(const Ptr<T> &p)
+ {
+ return (m_ptr == p.m_ptr);
+ }
+ int
+ operator!=(const T *p)
+ {
+ return (m_ptr != p);
+ }
+ int
+ operator!=(const Ptr<T> &p)
+ {
+ return (m_ptr != p.m_ptr);
+ }
RefCountObj *
_ptr()
@@ -349,7 +381,9 @@ template <class T> inline Ptr<T>::~Ptr()
return;
}
-template <class T> inline Ptr<T> &Ptr<T>::operator=(T *p)
+template <class T>
+inline Ptr<T> &
+Ptr<T>::operator=(T *p)
{
T *temp_ptr = m_ptr;
@@ -378,7 +412,9 @@ Ptr<T>::clear()
m_ptr = NULL;
}
}
-template <class T> inline Ptr<T> &Ptr<T>::operator=(const Ptr<T> &src)
+template <class T>
+inline Ptr<T> &
+Ptr<T>::operator=(const Ptr<T> &src)
{
return (operator=(src.m_ptr));
}
diff --git a/lib/ts/RawHashTable.h b/lib/ts/RawHashTable.h
index 17b8268..2a9b88d 100644
--- a/lib/ts/RawHashTable.h
+++ b/lib/ts/RawHashTable.h
@@ -328,7 +328,6 @@ public:
RawHashTable_Value &value() const; // get current value
const char *key() const; // get current key
-
private:
RawHashTable &m_ht;
RawHashTable_Binding *m_currentBinding;
@@ -341,7 +340,8 @@ private:
//
//////////////////////////////////////////////////////////////////////////////
-inline RawHashTable_Value &RawHashTableIter::operator()() const
+inline RawHashTable_Value &
+RawHashTableIter::operator()() const
{
return (m_currentBinding->clientData);
}
diff --git a/lib/ts/RbTree.cc b/lib/ts/RbTree.cc
index 124cea6..7739e5c 100644
--- a/lib/ts/RbTree.cc
+++ b/lib/ts/RbTree.cc
@@ -28,11 +28,19 @@ namespace detail
/// Equality.
/// @note If @a n is @c NULL it is treated as having the color @c BLACK.
/// @return @c true if @a c and the color of @a n are the same.
- inline bool operator==(RBNode *n, RBNode::Color c) { return c == (n ? n->getColor() : RBNode::BLACK); }
+ inline bool
+ operator==(RBNode *n, RBNode::Color c)
+ {
+ return c == (n ? n->getColor() : RBNode::BLACK);
+ }
/// Equality.
/// @note If @a n is @c NULL it is treated as having the color @c BLACK.
/// @return @c true if @a c and the color of @a n are the same.
- inline bool operator==(RBNode::Color c, RBNode *n) { return n == c; }
+ inline bool
+ operator==(RBNode::Color c, RBNode *n)
+ {
+ return n == c;
+ }
RBNode *
RBNode::getChild(Direction d) const
@@ -154,7 +162,6 @@ namespace detail
return root;
}
-
// Returns new root node
RBNode *
RBNode::remove()
diff --git a/lib/ts/RbTree.h b/lib/ts/RbTree.h
index 03635e7..af4d1d4 100644
--- a/lib/ts/RbTree.h
+++ b/lib/ts/RbTree.h
@@ -110,10 +110,8 @@ namespace detail
/// Default constructor.
RBNode() : _color(RED), _parent(0), _left(0), _right(0), _next(0), _prev(0) {}
-
/// Destructor (force virtual).
virtual ~RBNode() {}
-
/** Rotate the subtree rooted at this node.
The node is rotated in to the position of one of its children.
Which child is determined by the direction parameter @a d. The
@@ -221,5 +219,4 @@ namespace detail
} /* namespace ts */
-
#endif /* RBTREE_H_ */
diff --git a/lib/ts/Regex.cc b/lib/ts/Regex.cc
index c3f6267..5cb5c67 100644
--- a/lib/ts/Regex.cc
+++ b/lib/ts/Regex.cc
@@ -29,7 +29,6 @@
#ifdef PCRE_CONFIG_JIT
struct RegexThreadKey {
RegexThreadKey() { ink_thread_key_create(&this->key, (void (*)(void *)) & pcre_jit_stack_free); }
-
ink_thread_key key;
};
diff --git a/lib/ts/Regex.h b/lib/ts/Regex.h
index 312ebfd..d150f5b 100644
--- a/lib/ts/Regex.h
+++ b/lib/ts/Regex.h
@@ -66,7 +66,6 @@ class DFA
{
public:
DFA() : _my_patterns(0) {}
-
~DFA();
int compile(const char *pattern, unsigned flags = 0);
diff --git a/lib/ts/Regression.h b/lib/ts/Regression.h
index 289c787..cec9255 100644
--- a/lib/ts/Regression.h
+++ b/lib/ts/Regression.h
@@ -43,7 +43,6 @@
// *pstatus = REGRESSION_TEST_PASSED;
// }
-
// status values
#define REGRESSION_TEST_PASSED 1
#define REGRESSION_TEST_INPROGRESS 0 // initial value
diff --git a/lib/ts/SimpleTokenizer.h b/lib/ts/SimpleTokenizer.h
index c64c2ea..45c77e2 100644
--- a/lib/ts/SimpleTokenizer.h
+++ b/lib/ts/SimpleTokenizer.h
@@ -137,7 +137,6 @@ public:
}
~SimpleTokenizer() { _clearData(); }
-
void
setString(const char *s)
{
diff --git a/lib/ts/TestBox.h b/lib/ts/TestBox.h
index d8140e2..b26625b 100644
--- a/lib/ts/TestBox.h
+++ b/lib/ts/TestBox.h
@@ -41,15 +41,14 @@ struct TestBox {
/// Construct from @a test object and @a status pointer.
TestBox(RegressionTest *test, int *status) : _test(test), _status(status) {}
-
/// Construct from @a test object, @a status pointer and @a regression status.
TestBox(RegressionTest *test, int *status, int rstatus) : _test(test), _status(status) { *this = rstatus; }
-
/// Check the result and print a message on failure.
bool check(bool result, char const *fmt, ...) TS_PRINTFLIKE(3, 4);
/// Directly assign status.
- self &operator=(int status)
+ self &
+ operator=(int status)
{
*_status = status;
return *this;
diff --git a/lib/ts/TestHttpHeader.cc b/lib/ts/TestHttpHeader.cc
index 3fdb0f6..2927bda 100644
--- a/lib/ts/TestHttpHeader.cc
+++ b/lib/ts/TestHttpHeader.cc
@@ -203,7 +203,6 @@ TestHttpHeader()
cout << "first accept" << endl;
cout << h.m_header_fields.m_accept.get(0, &l) << endl;
-
char buf[4096];
int marshal_length = h.marshal(buf, sizeof(buf));
diff --git a/lib/ts/Tokenizer.cc b/lib/ts/Tokenizer.cc
index 4c0e635..dfc501a 100644
--- a/lib/ts/Tokenizer.cc
+++ b/lib/ts/Tokenizer.cc
@@ -238,7 +238,6 @@ Tokenizer::Initialize(char *str, unsigned opt)
return tok_count;
}
-
void
Tokenizer::addToken(char *startAddr, int length)
{
@@ -270,7 +269,6 @@ Tokenizer::addToken(char *startAddr, int length)
}
}
-
const char *Tokenizer::operator[](unsigned index) const
{
const tok_node *cur_node = &start_node;
@@ -328,7 +326,6 @@ Tokenizer::iterNext(tok_iter_state *state)
}
}
-
void
Tokenizer::Print()
{
diff --git a/lib/ts/Trie.h b/lib/ts/Trie.h
index 84be064..c307617 100644
--- a/lib/ts/Trie.h
+++ b/lib/ts/Trie.h
@@ -35,7 +35,6 @@ template <typename T> class Trie
{
public:
Trie() { m_root.Clear(); }
-
// will return false for duplicates; key should be NULL-terminated
// if key_len is defaulted to -1
bool Insert(const char *key, T *value, int rank, int key_len = -1);
@@ -52,7 +51,6 @@ public:
}
virtual ~Trie() { Clear(); }
-
private:
static const int N_NODE_CHILDREN = 256;
@@ -101,7 +99,11 @@ private:
// make copy-constructor and assignment operator private
// till we properly implement them
Trie(const Trie<T> &rhs){};
- Trie &operator=(const Trie<T> &rhs) { return *this; }
+ Trie &
+ operator=(const Trie<T> &rhs)
+ {
+ return *this;
+ }
};
template <typename T>
@@ -196,7 +198,6 @@ Trie<T>::Search(const char *key, int key_len /* = -1 */) const
return NULL;
}
-
template <typename T>
void
Trie<T>::_Clear(Node *node)
diff --git a/lib/ts/TsBuffer.h b/lib/ts/TsBuffer.h
index 4da12ff..76b8196 100644
--- a/lib/ts/TsBuffer.h
+++ b/lib/ts/TsBuffer.h
@@ -310,19 +310,23 @@ Buffer::reset()
_size = 0;
return *this;
}
-inline bool Buffer::operator!=(self const &that) const
+inline bool
+Buffer::operator!=(self const &that) const
{
return !(*this == that);
}
-inline bool Buffer::operator!=(ConstBuffer const &that) const
+inline bool
+Buffer::operator!=(ConstBuffer const &that) const
{
return !(*this == that);
}
-inline bool Buffer::operator==(self const &that) const
+inline bool
+Buffer::operator==(self const &that) const
{
return _size == that._size && _ptr == that._ptr;
}
-inline bool Buffer::operator==(ConstBuffer const &that) const
+inline bool
+Buffer::operator==(ConstBuffer const &that) const
{
return _size == that._size && _ptr == that._ptr;
}
@@ -390,25 +394,30 @@ ConstBuffer::reset()
_size = 0;
return *this;
}
-inline bool ConstBuffer::operator!=(self const &that) const
+inline bool
+ConstBuffer::operator!=(self const &that) const
{
return !(*this == that);
}
-inline bool ConstBuffer::operator!=(Buffer const &that) const
+inline bool
+ConstBuffer::operator!=(Buffer const &that) const
{
return !(*this == that);
}
-inline bool ConstBuffer::operator==(self const &that) const
+inline bool
+ConstBuffer::operator==(self const &that) const
{
return _size == that._size && 0 == memcmp(_ptr, that._ptr, _size);
}
-inline ConstBuffer &ConstBuffer::operator=(Buffer const &that)
+inline ConstBuffer &
+ConstBuffer::operator=(Buffer const &that)
{
_ptr = that._ptr;
_size = that._size;
return *this;
}
-inline bool ConstBuffer::operator==(Buffer const &that) const
+inline bool
+ConstBuffer::operator==(Buffer const &that) const
{
return _size == that._size && 0 == memcmp(_ptr, that._ptr, _size);
}
@@ -430,7 +439,8 @@ inline ConstBuffer &ConstBuffer::operator++()
--_size;
return *this;
}
-inline ConstBuffer &ConstBuffer::operator+=(size_t n)
+inline ConstBuffer &
+ConstBuffer::operator+=(size_t n)
{
_ptr += n;
_size -= n;
diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h
index f42f621..8192914 100644
--- a/lib/ts/Vec.h
+++ b/lib/ts/Vec.h
@@ -57,7 +57,6 @@ public:
~Vec();
C &operator[](int i) const { return v[i]; }
-
C get(size_t i) const;
void add(C a);
void
@@ -134,7 +133,8 @@ public:
{
return v[n - 1];
}
- Vec<C, A, S> &operator=(Vec<C, A, S> &v)
+ Vec<C, A, S> &
+ operator=(Vec<C, A, S> &v)
{
this->copy(v);
return *this;
diff --git a/lib/ts/Version.cc b/lib/ts/Version.cc
index e7b007f..4f7ae02 100644
--- a/lib/ts/Version.cc
+++ b/lib/ts/Version.cc
@@ -41,7 +41,6 @@ AppVersionInfo::AppVersionInfo()
// coverity[uninit_member]
}
-
void
AppVersionInfo::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)
@@ -115,7 +114,6 @@ AppVersionInfo::setup(const char *pkg_name, const char *app_name, const char *ap
defined = 1;
}
-
#if TS_HAS_TESTS
#include <ts/TestBox.h>
diff --git a/lib/ts/X509HostnameValidator.cc b/lib/ts/X509HostnameValidator.cc
index 7a7f646..fc3f969 100644
--- a/lib/ts/X509HostnameValidator.cc
+++ b/lib/ts/X509HostnameValidator.cc
@@ -96,7 +96,6 @@ find_wildcard_in_hostname(const unsigned char *p, size_t len, bool idna_subject)
return NULL;
}
-
/*
* Comparison functions
* @param pattern is the value from the certificate
@@ -162,7 +161,6 @@ wildcard_match(const unsigned char *prefix, size_t prefix_len, const unsigned ch
return true;
}
-
/* Compare using wildcards. */
static bool
equal_wildcard(const unsigned char *pattern, size_t pattern_len, const unsigned char *subject, size_t subject_len)
@@ -182,7 +180,6 @@ equal_wildcard(const unsigned char *pattern, size_t pattern_len, const unsigned
return wildcard_match(pattern, wildcard - pattern, wildcard + 1, (pattern + pattern_len) - wildcard - 1, subject, subject_len);
}
-
/*
* Compare an ASN1_STRING to a supplied string. only compare if string matches the specified type
*
@@ -202,7 +199,6 @@ do_check_string(ASN1_STRING *a, int cmp_type, equal_fn equal, const unsigned cha
return retval;
}
-
bool
validate_hostname(X509 *x, const unsigned char *hostname, bool is_ip, char **peername)
{
diff --git a/lib/ts/X509HostnameValidator.h b/lib/ts/X509HostnameValidator.h
index 4618c8b..3b76886 100644
--- a/lib/ts/X509HostnameValidator.h
+++ b/lib/ts/X509HostnameValidator.h
@@ -37,5 +37,4 @@
bool validate_hostname(X509 *cert, const unsigned char *hostname, bool is_ip, char **peername);
-
#endif /* LIB_TS_X509HOSTNAMEVALIDATOR_H_ */
diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index f0c05b8..d455198 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -47,8 +47,8 @@ unsigned n_file_arguments = 0;
//
static const char *argument_types_keys = (char *)"ISDfFTL";
-static const char *argument_types_descriptions[] = {(char *)"int ", (char *) "str ", (char *) "dbl ", (char *) "off ",
- (char *) "on ", (char *) "tog ", (char *) "i64 ", (char *) " "};
+static const char *argument_types_descriptions[] = {(char *)"int ", (char *)"str ", (char *)"dbl ", (char *)"off ",
+ (char *)"on ", (char *)"tog ", (char *)"i64 ", (char *)" "};
//
// Functions
@@ -125,7 +125,6 @@ process_arg(const AppVersionInfo *appinfo, const ArgumentDescription *argument_d
return true;
}
-
void
show_argument_configuration(const ArgumentDescription *argument_descriptions, unsigned n_argument_descriptions)
{
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index ad7c323..03b81ca 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -65,7 +65,6 @@ typedef vvoidp *pvvoidp;
/* GCC compiler >= 4.1 */
#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)) || (__GNUC__ >= 5))
-
/* see http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Atomic-Builtins.html */
// ink_atomic_swap(ptr, value)
@@ -190,7 +189,6 @@ ink_atomic_decrement(pvuint64 mem, Amount value)
#define INK_WRITE_MEMORY_BARRIER
#define INK_MEMORY_BARRIER
-
#else /* not gcc > v4.1.2 */
#error Need a compiler / libc that supports atomic operations, e.g. gcc v4.1.2 or later
#endif
diff --git a/lib/ts/ink_base64.cc b/lib/ts/ink_base64.cc
index a994e77..b99a652 100644
--- a/lib/ts/ink_base64.cc
+++ b/lib/ts/ink_base64.cc
@@ -96,7 +96,6 @@ ats_base64_encode(const char *inBuffer, size_t inBufferSize, char *outBuffer, si
return ats_base64_encode((const unsigned char *)inBuffer, inBufferSize, outBuffer, outBufSize, length);
}
-
/*-------------------------------------------------------------------------
This is a reentrant, and malloc free implemetnation of ats_base64_decode.
-------------------------------------------------------------------------*/
diff --git a/lib/ts/ink_defs.h b/lib/ts/ink_defs.h
index ac2a321..46cd6b5 100644
--- a/lib/ts/ink_defs.h
+++ b/lib/ts/ink_defs.h
@@ -24,7 +24,6 @@
#ifndef _ink_defs_h
#define _ink_defs_h
-
#include "ts/ink_config.h"
#include <stddef.h>
#include <sys/mman.h>
@@ -79,7 +78,7 @@
#ifdef __cplusplus
template <typename T, unsigned N>
static inline unsigned
-countof(const T(&)[N])
+countof(const T (&)[N])
{
return N;
}
@@ -134,7 +133,6 @@ max(const T a, const T b)
#define unlikely(x) __builtin_expect(!!(x), 0)
#endif
-
#if TS_USE_HWLOC
#include <hwloc.h>
#endif
diff --git a/lib/ts/ink_exception.h b/lib/ts/ink_exception.h
index 2a091f7..7089cf7 100644
--- a/lib/ts/ink_exception.h
+++ b/lib/ts/ink_exception.h
@@ -31,7 +31,6 @@
*
*/
-
class Exception
{
};
diff --git a/lib/ts/ink_hash_table.cc b/lib/ts/ink_hash_table.cc
index f6e328b..4eff846 100644
--- a/lib/ts/ink_hash_table.cc
+++ b/lib/ts/ink_hash_table.cc
@@ -73,7 +73,6 @@ ink_hash_table_create(InkHashTableKeyType key_type)
return (ht_ptr);
} /* End ink_hash_table_create */
-
/*---------------------------------------------------------------------------*
void ink_hash_table_destroy(InkHashTable *ht_ptr)
@@ -93,7 +92,6 @@ ink_hash_table_destroy(InkHashTable *ht_ptr)
return (InkHashTable *)0;
} /* End ink_hash_table_destroy */
-
/*---------------------------------------------------------------------------*
void ink_hash_table_destroy_and_free_values(InkHashTable *ht_ptr)
@@ -143,7 +141,6 @@ ink_hash_table_isbound(InkHashTable *ht_ptr, const char *key)
return ((he_ptr == NULL) ? 0 : 1);
} /* End ink_hash_table_isbound */
-
/*---------------------------------------------------------------------------*
int ink_hash_table_lookup(InkHashTable *ht_ptr,
InkHashTableKey key,
@@ -170,7 +167,6 @@ ink_hash_table_lookup(InkHashTable *ht_ptr, const char *key, InkHashTableValue *
return (1);
} /* End ink_hash_table_lookup */
-
/*---------------------------------------------------------------------------*
int ink_hash_table_delete(InkHashTable *ht_ptr, InkHashTableKey key)
@@ -199,7 +195,6 @@ ink_hash_table_delete(InkHashTable *ht_ptr, const char *key)
return (1);
} /* End ink_hash_table_delete */
-
/*---------------------------------------------------------------------------*
InkHashTableEntry *ink_hash_table_lookup_entry(InkHashTable *ht_ptr,
@@ -224,7 +219,6 @@ ink_hash_table_lookup_entry(InkHashTable *ht_ptr, const char *key)
return (he_ptr);
} /* End ink_hash_table_lookup_entry */
-
/*---------------------------------------------------------------------------*
InkHashTableEntry *ink_hash_table_get_entry(InkHashTable *ht_ptr,
@@ -253,7 +247,6 @@ ink_hash_table_get_entry(InkHashTable *ht_ptr, const char *key, int *new_value)
return ((InkHashTableEntry *)tcl_he_ptr);
} /* End ink_hash_table_get_entry */
-
/*---------------------------------------------------------------------------*
void ink_hash_table_set_entry(InkHashTable *ht_ptr,
@@ -277,7 +270,6 @@ ink_hash_table_set_entry(InkHashTable *ht_ptr, InkHashTableEntry *he_ptr, InkHas
Tcl_SetHashValue(tcl_he_ptr, tcl_value);
} /* End ink_hash_table_set_entry */
-
/*---------------------------------------------------------------------------*
void ink_hash_table_insert(InkHashTable *ht_ptr,
@@ -299,7 +291,6 @@ ink_hash_table_insert(InkHashTable *ht_ptr, const char *key, InkHashTableValue v
ink_hash_table_set_entry(ht_ptr, he_ptr, value);
} /* End ink_hash_table_insert */
-
/*---------------------------------------------------------------------------*
void ink_hash_table_map(InkHashTable *ht_ptr, InkHashTableEntryFunction map)
@@ -324,7 +315,6 @@ ink_hash_table_map(InkHashTable *ht_ptr, InkHashTableEntryFunction map)
}
} /* End ink_hash_table_map */
-
/*---------------------------------------------------------------------------*
InkHashTableKey ink_hash_table_entry_key(InkHashTable *ht_ptr,
@@ -344,7 +334,6 @@ ink_hash_table_entry_key(InkHashTable *ht_ptr, InkHashTableEntry *entry_ptr)
return ((InkHashTableKey)tcl_key);
} /* End ink_hash_table_entry_key */
-
/*---------------------------------------------------------------------------*
InkHashTableValue ink_hash_table_entry_value(InkHashTable *ht_ptr,
@@ -365,7 +354,6 @@ ink_hash_table_entry_value(InkHashTable *ht_ptr, InkHashTableEntry *entry_ptr)
return ((InkHashTableValue)tcl_value);
} /* End ink_hash_table_entry_value */
-
/*---------------------------------------------------------------------------*
void ink_hash_table_dump_strings(InkHashTable *ht_ptr)
@@ -390,14 +378,12 @@ DumpStringEntry(InkHashTable *ht_ptr, InkHashTableEntry *e)
return (0);
}
-
void
ink_hash_table_dump_strings(InkHashTable *ht_ptr)
{
ink_hash_table_map(ht_ptr, DumpStringEntry);
} /* End ink_hash_table_dump_strings */
-
/*---------------------------------------------------------------------------*
void ink_hash_table_replace_string(InkHashTable *ht_ptr,
diff --git a/lib/ts/ink_hash_table.h b/lib/ts/ink_hash_table.h
index 76beeb2..9a223cd 100644
--- a/lib/ts/ink_hash_table.h
+++ b/lib/ts/ink_hash_table.h
@@ -114,7 +114,6 @@ ink_hash_table_iterator_first(InkHashTable *ht_ptr, InkHashTableIteratorState *s
return (he_ptr);
} /* End ink_hash_table_iterator_first */
-
/*---------------------------------------------------------------------------*
InkHashTableEntry *ink_hash_table_iterator_next(InkHashTable *ht_ptr,
diff --git a/lib/ts/ink_hrtime.cc b/lib/ts/ink_hrtime.cc
index 7432d10..b38deae 100644
--- a/lib/ts/ink_hrtime.cc
+++ b/lib/ts/ink_hrtime.cc
@@ -135,7 +135,6 @@ int64_to_str(char *buf, unsigned int buf_size, int64_t val, unsigned int *total_
return out_buf;
}
-
int
squid_timestamp_to_buf(char *buf, unsigned int buf_size, long timestamp_sec, long timestamp_usec)
{
diff --git a/lib/ts/ink_hrtime.h b/lib/ts/ink_hrtime.h
index 6e2ec5e..e118991 100644
--- a/lib/ts/ink_hrtime.h
+++ b/lib/ts/ink_hrtime.h
@@ -210,7 +210,6 @@ ink_hrtime_to_timeval(ink_hrtime t)
which translates to (365 + 0.25)369*24*60*60 seconds */
#define NT_TIMEBASE_DIFFERENCE_100NSECS 116444736000000000i64
-
static inline ink_hrtime
ink_get_hrtime_internal()
{
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index 9016bd1..4cf99e9 100644
--- a/lib/ts/ink_inet.cc
+++ b/lib/ts/ink_inet.cc
@@ -392,7 +392,8 @@ IpAddr::isMulticast() const
return (AF_INET == _family && 0xe == (_addr._byte[0] >> 4)) || (AF_INET6 == _family && IN6_IS_ADDR_MULTICAST(&_addr._ip6));
}
-bool operator==(IpAddr const &lhs, sockaddr const *rhs)
+bool
+operator==(IpAddr const &lhs, sockaddr const *rhs)
{
bool zret = false;
if (lhs._family == rhs->sa_family) {
@@ -650,8 +651,7 @@ REGRESSION_TEST(Ink_Inet)(RegressionTest *t, int /* atype */, int *pstatus)
case AF_INET6:
box.check(memcmp(&ep.sin6.sin6_addr, &addr._addr._ip6, sizeof(in6_addr)) == 0, "IPv6 address mismatch");
break;
- default:
- ;
+ default:;
}
}
}
diff --git a/lib/ts/ink_inet.h b/lib/ts/ink_inet.h
index 8945de3..6d13907 100644
--- a/lib/ts/ink_inet.h
+++ b/lib/ts/ink_inet.h
@@ -101,7 +101,6 @@ union IpEndpoint {
self &setToLoopback(int family ///< Address family.
);
-
/// Port in network order.
in_port_t &port();
/// Port in network order.
@@ -863,11 +862,13 @@ ats_ip_addr_eq(IpEndpoint const *lhs, IpEndpoint const *rhs)
return 0 == ats_ip_addr_cmp(&lhs->sa, &rhs->sa);
}
-inline bool operator==(IpEndpoint const &lhs, IpEndpoint const &rhs)
+inline bool
+operator==(IpEndpoint const &lhs, IpEndpoint const &rhs)
{
return 0 == ats_ip_addr_cmp(&lhs.sa, &rhs.sa);
}
-inline bool operator!=(IpEndpoint const &lhs, IpEndpoint const &rhs)
+inline bool
+operator!=(IpEndpoint const &lhs, IpEndpoint const &rhs)
{
return 0 != ats_ip_addr_cmp(&lhs.sa, &rhs.sa);
}
@@ -912,7 +913,6 @@ ats_ip_port_host_order(IpEndpoint const *ip ///< Address with port.
return ntohs(ats_ip_port_cast(const_cast<sockaddr *>(&ip->sa)));
}
-
/** Extract the IPv4 address.
@return Host order IPv4 address.
*/
@@ -1053,7 +1053,6 @@ ats_ip_nptop(IpEndpoint const *addr, ///< Address.
return ats_ip_nptop(&addr->sa, dst, size);
}
-
/** Convert @a text to an IP address and write it to @a addr.
@a text is expected to be an explicit address, not a hostname. No
@@ -1197,13 +1196,16 @@ struct IpAddr {
explicit IpAddr(IpEndpoint const &addr) { this->assign(&addr.sa); }
/// Construct from @c IpEndpoint.
explicit IpAddr(IpEndpoint const *addr) { this->assign(&addr->sa); }
-
/// Assign sockaddr storage.
self &assign(sockaddr const *addr ///< May be @c NULL
);
/// Assign from end point.
- self &operator=(IpEndpoint const &ip) { return this->assign(&ip.sa); }
+ self &
+ operator=(IpEndpoint const &ip)
+ {
+ return this->assign(&ip.sa);
+ }
/// Assign from IPv4 raw address.
self &operator=(in_addr_t ip ///< Network order IPv4 address.
);
@@ -1234,15 +1236,21 @@ struct IpAddr {
) const;
/// Equality.
- bool operator==(self const &that) const
+ bool
+ operator==(self const &that) const
{
- return _family == AF_INET ? (that._family == AF_INET && _addr._ip4 == that._addr._ip4) : _family == AF_INET6 ?
- (that._family == AF_INET6 && 0 == memcmp(&_addr._ip6, &that._addr._ip6, TS_IP6_SIZE)) :
- (_family == AF_UNSPEC && that._family == AF_UNSPEC);
+ return _family == AF_INET ?
+ (that._family == AF_INET && _addr._ip4 == that._addr._ip4) :
+ _family == AF_INET6 ? (that._family == AF_INET6 && 0 == memcmp(&_addr._ip6, &that._addr._ip6, TS_IP6_SIZE)) :
+ (_family == AF_UNSPEC && that._family == AF_UNSPEC);
}
/// Inequality.
- bool operator!=(self const &that) { return !(*this == that); }
+ bool
+ operator!=(self const &that)
+ {
+ return !(*this == that);
+ }
/// Generic compare.
int cmp(self const &that) const;
@@ -1258,7 +1266,11 @@ struct IpAddr {
@see hash
*/
struct Hasher {
- uint32_t operator()(self const &ip) const { return ip.hash(); }
+ uint32_t
+ operator()(self const &ip) const
+ {
+ return ip.hash();
+ }
};
/// Test for same address family.
@@ -1305,14 +1317,16 @@ struct IpAddr {
static self const INVALID;
};
-inline IpAddr &IpAddr::operator=(in_addr_t ip)
+inline IpAddr &
+IpAddr::operator=(in_addr_t ip)
{
_family = AF_INET;
_addr._ip4 = ip;
return *this;
}
-inline IpAddr &IpAddr::operator=(in6_addr const &ip)
+inline IpAddr &
+IpAddr::operator=(in6_addr const &ip)
{
_family = AF_INET6;
_addr._ip6 = ip;
@@ -1369,51 +1383,62 @@ IpAddr::assign(sockaddr const *addr)
// Associated operators.
bool operator==(IpAddr const &lhs, sockaddr const *rhs);
-inline bool operator==(sockaddr const *lhs, IpAddr const &rhs)
+inline bool
+operator==(sockaddr const *lhs, IpAddr const &rhs)
{
return rhs == lhs;
}
-inline bool operator!=(IpAddr const &lhs, sockaddr const *rhs)
+inline bool
+operator!=(IpAddr const &lhs, sockaddr const *rhs)
{
return !(lhs == rhs);
}
-inline bool operator!=(sockaddr const *lhs, IpAddr const &rhs)
+inline bool
+operator!=(sockaddr const *lhs, IpAddr const &rhs)
{
return !(rhs == lhs);
}
-inline bool operator==(IpAddr const &lhs, IpEndpoint const &rhs)
+inline bool
+operator==(IpAddr const &lhs, IpEndpoint const &rhs)
{
return lhs == &rhs.sa;
}
-inline bool operator==(IpEndpoint const &lhs, IpAddr const &rhs)
+inline bool
+operator==(IpEndpoint const &lhs, IpAddr const &rhs)
{
return &lhs.sa == rhs;
}
-inline bool operator!=(IpAddr const &lhs, IpEndpoint const &rhs)
+inline bool
+operator!=(IpAddr const &lhs, IpEndpoint const &rhs)
{
return !(lhs == &rhs.sa);
}
-inline bool operator!=(IpEndpoint const &lhs, IpAddr const &rhs)
+inline bool
+operator!=(IpEndpoint const &lhs, IpAddr const &rhs)
{
return !(rhs == &lhs.sa);
}
-inline bool operator<(IpAddr const &lhs, IpAddr const &rhs)
+inline bool
+operator<(IpAddr const &lhs, IpAddr const &rhs)
{
return -1 == lhs.cmp(rhs);
}
-inline bool operator>=(IpAddr const &lhs, IpAddr const &rhs)
+inline bool
+operator>=(IpAddr const &lhs, IpAddr const &rhs)
{
return lhs.cmp(rhs) >= 0;
}
-inline bool operator>(IpAddr const &lhs, IpAddr const &rhs)
+inline bool
+operator>(IpAddr const &lhs, IpAddr const &rhs)
{
return 1 == lhs.cmp(rhs);
}
-inline bool operator<=(IpAddr const &lhs, IpAddr const &rhs)
+inline bool
+operator<=(IpAddr const &lhs, IpAddr const &rhs)
{
return lhs.cmp(rhs) <= 0;
}
diff --git a/lib/ts/ink_inout.h b/lib/ts/ink_inout.h
index 56b04b3..66677fe 100644
--- a/lib/ts/ink_inout.h
+++ b/lib/ts/ink_inout.h
@@ -82,5 +82,4 @@ extern "C" {
(cp) += 8; \
}
-
#endif /* #ifndef _INOUT_H */
diff --git a/lib/ts/ink_llqueue.h b/lib/ts/ink_llqueue.h
index a63f1d4..3161b1f 100644
--- a/lib/ts/ink_llqueue.h
+++ b/lib/ts/ink_llqueue.h
@@ -53,5 +53,4 @@ 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 0296d17..5f5e74f 100644
--- a/lib/ts/ink_lockfile.h
+++ b/lib/ts/ink_lockfile.h
@@ -35,12 +35,9 @@ class Lockfile
{
public:
Lockfile(void) : fd(0) { fname[0] = '\0'; }
-
// coverity[uninit_member]
Lockfile(const char *filename) : fd(0) { ink_strlcpy(fname, filename, sizeof(fname)); }
-
~Lockfile(void) {}
-
void
SetLockfileName(const char *filename)
{
diff --git a/lib/ts/ink_memory.h b/lib/ts/ink_memory.h
index 8a1ca8b..049f011 100644
--- a/lib/ts/ink_memory.h
+++ b/lib/ts/ink_memory.h
@@ -136,7 +136,7 @@ make_iovec(PtrType ptr, SizeType sz)
return iov;
}
-template <typename PtrType, unsigned N> static inline IOVec make_iovec(PtrType(&array)[N])
+template <typename PtrType, unsigned N> static inline IOVec make_iovec(PtrType (&array)[N])
{
IOVec iov = {&array[0], static_cast<size_t>(sizeof(array))};
return iov;
@@ -249,10 +249,8 @@ public:
public:
/// Default constructor - an empty container.
ats_scoped_resource() : _r(Traits::initValue()) {}
-
/// Construct with contained resource.
explicit ats_scoped_resource(value_type rt) : _r(rt) {}
-
/// Destructor.
~ats_scoped_resource()
{
@@ -297,7 +295,8 @@ public:
@internal This is usually overridden in subclasses to get the return type adjusted.
*/
- self &operator=(value_type rt)
+ self &
+ operator=(value_type rt)
{
if (Traits::isValid(_r))
Traits::destroy(_r);
@@ -306,10 +305,18 @@ public:
}
/// Equality.
- bool operator==(value_type rt) const { return _r == rt; }
+ bool
+ operator==(value_type rt) const
+ {
+ return _r == rt;
+ }
/// Inequality.
- bool operator!=(value_type rt) const { return _r != rt; }
+ bool
+ operator!=(value_type rt) const
+ {
+ return _r != rt;
+ }
/// Test if the contained resource is valid.
bool
@@ -358,15 +365,14 @@ public:
/// Default constructor - an empty container.
ats_scoped_fd() : super() {}
-
/// Construct with contained resource.
explicit ats_scoped_fd(value_type rt) : super(rt) {}
-
/** Place a new resource @a rt in the container.
Any resource currently contained is destroyed.
This object becomes the owner of @a rt.
*/
- self &operator=(value_type rt)
+ self &
+ operator=(value_type rt)
{
super::operator=(rt);
return *this;
@@ -424,11 +430,11 @@ struct SCOPED_OBJECT_TRAITS {
/** Specialization of @c ats_scoped_resource for strings.
This contains an allocated string that is cleaned up if not explicitly released.
*/
-class ats_scoped_str : public ats_scoped_resource<detail::SCOPED_MALLOC_TRAITS<char> >
+class ats_scoped_str : public ats_scoped_resource<detail::SCOPED_MALLOC_TRAITS<char>>
{
public:
- typedef ats_scoped_resource<detail::SCOPED_MALLOC_TRAITS<char> > super; ///< Super type.
- typedef ats_scoped_str self; ///< Self reference type.
+ typedef ats_scoped_resource<detail::SCOPED_MALLOC_TRAITS<char>> super; ///< Super type.
+ typedef ats_scoped_str self; ///< Self reference type.
/// Default constructor (no string).
ats_scoped_str() {}
@@ -437,7 +443,8 @@ public:
/// Put string @a s in this container for cleanup.
explicit ats_scoped_str(char *s) : super(s) {}
/// Assign a string @a s to this container.
- self &operator=(char *s)
+ self &
+ operator=(char *s)
{
super::operator=(s);
return *this;
@@ -448,13 +455,14 @@ public:
*/
template <typename T ///< Underlying (not pointer) type.
>
-class ats_scoped_mem : public ats_scoped_resource<detail::SCOPED_MALLOC_TRAITS<T> >
+class ats_scoped_mem : public ats_scoped_resource<detail::SCOPED_MALLOC_TRAITS<T>>
{
public:
- typedef ats_scoped_resource<detail::SCOPED_MALLOC_TRAITS<T> > super; ///< Super type.
- typedef ats_scoped_mem self; ///< Self reference.
+ typedef ats_scoped_resource<detail::SCOPED_MALLOC_TRAITS<T>> super; ///< Super type.
+ typedef ats_scoped_mem self; ///< Self reference.
- self &operator=(T *ptr)
+ self &
+ operator=(T *ptr)
{
super::operator=(ptr);
return *this;
@@ -467,19 +475,18 @@ public:
template <typename T /// Underlying (not pointer) type.
>
-class ats_scoped_obj : public ats_scoped_resource<detail::SCOPED_OBJECT_TRAITS<T> >
+class ats_scoped_obj : public ats_scoped_resource<detail::SCOPED_OBJECT_TRAITS<T>>
{
public:
- typedef ats_scoped_resource<detail::SCOPED_OBJECT_TRAITS<T> > super; ///< Super type.
- typedef ats_scoped_obj self; ///< Self reference.
+ typedef ats_scoped_resource<detail::SCOPED_OBJECT_TRAITS<T>> super; ///< Super type.
+ typedef ats_scoped_obj self; ///< Self reference.
/// Default constructor - an empty container.
ats_scoped_obj() : super() {}
-
/// Construct with contained resource.
explicit ats_scoped_obj(T *obj) : super(obj) {}
-
- self &operator=(T *obj)
+ self &
+ operator=(T *obj)
{
super::operator=(obj);
return *this;
diff --git a/lib/ts/ink_platform.h b/lib/ts/ink_platform.h
index 90105c3..db38cb7 100644
--- a/lib/ts/ink_platform.h
+++ b/lib/ts/ink_platform.h
@@ -119,7 +119,6 @@
#include <port.h>
#endif
-
#ifdef HAVE_VALUES_H
#include <values.h>
#endif
@@ -168,7 +167,6 @@ struct ifafilt;
#include <resolv.h>
-
#if defined(linux)
typedef unsigned int in_addr_t;
#endif
@@ -203,7 +201,6 @@ typedef unsigned int in_addr_t;
#include <sys/prctl.h>
#endif
-
#ifndef PATH_NAME_MAX
#define PATH_NAME_MAX 4096 // instead of PATH_MAX which is inconsistent
// on various OSs (linux-4096,osx/bsd-1024,
diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc
index af3766e..01cc8be 100644
--- a/lib/ts/ink_queue.cc
+++ b/lib/ts/ink_queue.cc
@@ -129,7 +129,6 @@ ink_freelist_init(InkFreeList **fl, const char *name, uint32_t type_size, uint32
fll->next = freelists;
freelists = fll;
-
f->name = name;
/* quick test for power of 2 */
ink_assert(!(alignment & (alignment - 1)));
@@ -454,7 +453,6 @@ ink_freelists_dump(FILE *f)
fprintf(f, "-----------------------------------------------------------------------------------------\n");
}
-
void
ink_atomiclist_init(InkAtomicList *l, const char *name, uint32_t offset_to_next)
{
diff --git a/lib/ts/ink_queue.h b/lib/ts/ink_queue.h
index 7608ae0..6794fb4 100644
--- a/lib/ts/ink_queue.h
+++ b/lib/ts/ink_queue.h
@@ -70,9 +70,9 @@ void ink_queue_load_64(void *dst, void *src);
#endif
#if TS_HAS_128BIT_CAS
-#define INK_QUEUE_LD(dst, src) \
- do { \
- *(__int128_t *) & (dst) = __sync_val_compare_and_swap((__int128_t *)&(src), 0, 0); \
+#define INK_QUEUE_LD(dst, src) \
+ do { \
+ *(__int128_t *)&(dst) = __sync_val_compare_and_swap((__int128_t *)&(src), 0, 0); \
} while (0)
#else
#define INK_QUEUE_LD(dst, src) INK_QUEUE_LD64(dst, src)
diff --git a/lib/ts/ink_rand.cc b/lib/ts/ink_rand.cc
index 06bd5b4..3e0d9fc 100644
--- a/lib/ts/ink_rand.cc
+++ b/lib/ts/ink_rand.cc
@@ -54,7 +54,6 @@
email: m-mat @ math.sci.hiroshima-u.ac.jp (remove spaces)
*/
-
#include "ts/ink_platform.h"
#include "ts/ink_rand.h"
diff --git a/lib/ts/ink_rand.h b/lib/ts/ink_rand.h
index 901b37c..40d554a 100644
--- a/lib/ts/ink_rand.h
+++ b/lib/ts/ink_rand.h
@@ -61,11 +61,9 @@
#ifndef __INK_RAND_H__
#define __INK_RAND_H__
-
#include "ts/ink_defs.h"
#include "ts/ink_apidefs.h"
-
class InkRand
{
public:
diff --git a/lib/ts/ink_res_init.cc b/lib/ts/ink_res_init.cc
index 958f2dd..1376ed0 100644
--- a/lib/ts/ink_res_init.cc
+++ b/lib/ts/ink_res_init.cc
@@ -64,7 +64,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-
#include "ts/ink_platform.h"
#include "ts/ink_defs.h"
diff --git a/lib/ts/ink_res_mkquery.cc b/lib/ts/ink_res_mkquery.cc
index 3d37ad1..b17a3d5 100644
--- a/lib/ts/ink_res_mkquery.cc
+++ b/lib/ts/ink_res_mkquery.cc
@@ -64,7 +64,6 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-
#include "ts/ink_config.h"
#include "ts/ink_defs.h"
diff --git a/lib/ts/ink_sock.cc b/lib/ts/ink_sock.cc
index 2b98ed1..b0ccb97 100644
--- a/lib/ts/ink_sock.cc
+++ b/lib/ts/ink_sock.cc
@@ -38,7 +38,6 @@
// #define CHECK_PLAUSIBILITY_OF_SOCKADDR
-
#ifdef CHECK_PLAUSIBILITY_OF_SOCKADDR
#define CHECK_PLAUSIBLE_SOCKADDR(_n, _f, _l) check_plausible_sockaddr(_n, _f, _n)
inline void
@@ -247,7 +246,6 @@ fd_read_line(int fd, char *s, int len)
return numread;
}
-
int
close_socket(int s)
{
diff --git a/lib/ts/ink_sprintf.cc b/lib/ts/ink_sprintf.cc
index 9d58f9d..82a9dcd 100644
--- a/lib/ts/ink_sprintf.cc
+++ b/lib/ts/ink_sprintf.cc
@@ -62,7 +62,6 @@ ink_bsprintf(char *buffer, const char *format, ...)
return (l);
}
-
int
ink_bvsprintf(char *buffer, const char *format, va_list ap)
{
diff --git a/lib/ts/ink_string++.cc b/lib/ts/ink_string++.cc
index 3b47eb6..647d6b1 100644
--- a/lib/ts/ink_string++.cc
+++ b/lib/ts/ink_string++.cc
@@ -117,7 +117,6 @@ StrList::overflow_heap_clean()
overflow_first->clean();
}
-
#define INIT_OVERFLOW_ALIGNMENT 8
// XXX: This is basically INK_ALIGN_DEFAULT
const int overflow_head_hdr_size = INK_ALIGN(sizeof(StrListOverflow), INIT_OVERFLOW_ALIGNMENT);
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index 529bab9..65598a5 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -75,7 +75,6 @@ ink_string_concatenate_strings(char *dest, ...)
return (dest);
} /* End ink_string_concatenate_strings */
-
/*---------------------------------------------------------------------------*
char *ink_string_concatenate_strings_n(char *dest, int n, ...)
@@ -112,7 +111,6 @@ ink_string_concatenate_strings_n(char *dest, int n, ...)
return (dest);
} /* End ink_string_concatenate_strings_n */
-
/*---------------------------------------------------------------------------*
char *ink_string_append(char *dest, char *src, int n)
@@ -165,7 +163,6 @@ ink_string_append(char *dest, char *src, int n)
return (dest);
} /* End ink_string_append */
-
#if !HAVE_STRLCPY
size_t
ink_strlcpy(char *dst, const char *src, size_t siz)
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index addd9dc..10f0d24 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -41,7 +41,6 @@
#include "ts/ParseRules.h"
#include "ts/ink_apidefs.h"
-
/*===========================================================================*
Function Prototypes
@@ -89,7 +88,6 @@ void ink_utf8_to_latin1(const char *in, int inlen, char *out, int *outlen);
*===========================================================================*/
-
// inline int ptr_len_cmp(const char* p1, int l1, const char* p2, int l2)
//
// strcmp() functionality for two ptr length pairs
@@ -216,7 +214,6 @@ ptr_len_ncmp(const char *p1, int l1, const char *str, int n)
}
}
-
// int ptr_len_ncasecmp(const char* p1, int l1, const char* str, int n) {
//
// strncasecmp like functionality for comparing a ptr,len pair with
@@ -297,7 +294,6 @@ ptr_len_casecmp(const char *p1, int l1, const char *str)
}
}
-
// int ptr_len_cmp(const char* p1, int l1, const char* str) {
//
// strcmp like functionality for comparing a ptr,len pair with
diff --git a/lib/ts/ink_syslog.cc b/lib/ts/ink_syslog.cc
index ac3b896..6edd75d 100644
--- a/lib/ts/ink_syslog.cc
+++ b/lib/ts/ink_syslog.cc
@@ -36,24 +36,16 @@ struct syslog_fac {
int fac_int;
};
-static const syslog_fac convert_table[] = {{(char *)"LOG_KERN", (char *) "KERN", LOG_KERN},
- {(char *)"LOG_USER", (char *) "USER", LOG_USER},
- {(char *)"LOG_MAIL", (char *) "MAIL", LOG_MAIL},
- {(char *)"LOG_DAEMON", (char *) "DAEMON", LOG_DAEMON},
- {(char *)"LOG_AUTH", (char *) "AUTH", LOG_AUTH},
- {(char *)"LOG_LPR", (char *) "LPR", LOG_LPR},
- {(char *)"LOG_NEWS", (char *) "NEWS", LOG_NEWS},
- {(char *)"LOG_UUCP", (char *) "UUCP", LOG_UUCP},
- {(char *)"LOG_CRON", (char *) "CRON", LOG_CRON},
- {(char *)"LOG_LOCAL0", (char *) "LOCAL0", LOG_LOCAL0},
- {(char *)"LOG_LOCAL1", (char *) "LOCAL1", LOG_LOCAL1},
- {(char *)"LOG_LOCAL2", (char *) "LOCAL2", LOG_LOCAL2},
- {(char *)"LOG_LOCAL3", (char *) "LOCAL3", LOG_LOCAL3},
- {(char *)"LOG_LOCAL4", (char *) "LOCAL4", LOG_LOCAL4},
- {(char *)"LOG_LOCAL5", (char *) "LOCAL5", LOG_LOCAL5},
- {(char *)"LOG_LOCAL6", (char *) "LOCAL6", LOG_LOCAL6},
- {(char *)"LOG_LOCAL7", (char *) "LOCAL7", LOG_LOCAL7},
- {(char *)"INVALID_LOG_FAC", (char *) "INVALID", -1}};
+static const syslog_fac convert_table[] = {
+ {(char *)"LOG_KERN", (char *)"KERN", LOG_KERN}, {(char *)"LOG_USER", (char *)"USER", LOG_USER},
+ {(char *)"LOG_MAIL", (char *)"MAIL", LOG_MAIL}, {(char *)"LOG_DAEMON", (char *)"DAEMON", LOG_DAEMON},
+ {(char *)"LOG_AUTH", (char *)"AUTH", LOG_AUTH}, {(char *)"LOG_LPR", (char *)"LPR", LOG_LPR},
+ {(char *)"LOG_NEWS", (char *)"NEWS", LOG_NEWS}, {(char *)"LOG_UUCP", (char *)"UUCP", LOG_UUCP},
+ {(char *)"LOG_CRON", (char *)"CRON", LOG_CRON}, {(char *)"LOG_LOCAL0", (char *)"LOCAL0", LOG_LOCAL0},
+ {(char *)"LOG_LOCAL1", (char *)"LOCAL1", LOG_LOCAL1}, {(char *)"LOG_LOCAL2", (char *)"LOCAL2", LOG_LOCAL2},
+ {(char *)"LOG_LOCAL3", (char *)"LOCAL3", LOG_LOCAL3}, {(char *)"LOG_LOCAL4", (char *)"LOCAL4", LOG_LOCAL4},
+ {(char *)"LOG_LOCAL5", (char *)"LOCAL5", LOG_LOCAL5}, {(char *)"LOG_LOCAL6", (char *)"LOCAL6", LOG_LOCAL6},
+ {(char *)"LOG_LOCAL7", (char *)"LOCAL7", LOG_LOCAL7}, {(char *)"INVALID_LOG_FAC", (char *)"INVALID", -1}};
static const int convert_table_size = sizeof(convert_table) / sizeof(syslog_fac) - 1;
// int facility_string_to_int(const char* str)
diff --git a/lib/ts/ink_thread.h b/lib/ts/ink_thread.h
index d916d11..a7d64a9 100644
--- a/lib/ts/ink_thread.h
+++ b/lib/ts/ink_thread.h
@@ -29,12 +29,10 @@
#ifndef _INK_THREAD_H
#define _INK_THREAD_H
-
#include "ts/ink_hrtime.h"
#include "ts/ink_defs.h"
#include <sched.h>
-
//////////////////////////////////////////////////////////////////////////////
//
// The POSIX threads interface
@@ -128,7 +126,6 @@ ink_thread_key_delete(ink_thread_key key)
ink_assert(!pthread_key_delete(key));
}
-
static inline ink_thread
ink_thread_create(void *(*f)(void *), void *a, int detached = 0, size_t stacksize = 0)
{
diff --git a/lib/ts/ink_time.cc b/lib/ts/ink_time.cc
index 11cd891..174f52c 100644
--- a/lib/ts/ink_time.cc
+++ b/lib/ts/ink_time.cc
@@ -91,7 +91,6 @@ ink_time_wall_seconds()
return ((double)s_val.tv_sec + 0.000001 * s_val.tv_usec);
} /* End ink_time_wall_seconds */
-
struct dtconv {
char *abbrev_month_names[12];
char *month_names[12];
@@ -105,7 +104,6 @@ struct dtconv {
char *ldate_format;
};
-
/*
* The man page for cftime lies. It claims that it is thread safe.
* Instead, it silently trashes the heap (by freeing things more than
diff --git a/lib/ts/llqueue.cc b/lib/ts/llqueue.cc
index 04cb182..c24ab87 100644
--- a/lib/ts/llqueue.cc
+++ b/lib/ts/llqueue.cc
@@ -55,7 +55,6 @@ newrec(LLQ *Q)
Q->free[RECORD_CHUNK - 1].next = NULL;
-
new_val = Q->free;
Q->free = Q->free->next;
@@ -148,7 +147,6 @@ queue_highwater(LLQ *Q)
return highwater;
}
-
/*
*---------------------------------------------------------------------------
*
@@ -186,7 +184,6 @@ dequeue(LLQ *Q)
ink_sem_wait(&(Q->sema));
ink_mutex_acquire(&(Q->mux));
-
if (Q->head == NULL) {
ink_mutex_release(&(Q->mux));
@@ -209,7 +206,6 @@ dequeue(LLQ *Q)
return d;
}
-
#ifdef LLQUEUE_MAIN
void *
diff --git a/lib/ts/load_http_hdr.cc b/lib/ts/load_http_hdr.cc
index 284b3f4..ff14f39 100644
--- a/lib/ts/load_http_hdr.cc
+++ b/lib/ts/load_http_hdr.cc
@@ -119,7 +119,6 @@ load_buffer(int fd, hdr_type h_type)
char *file_buf = (char *)ats_malloc(sizeof(char) * (s_info.st_size + 1));
file_buf[s_info.st_size] = '\0';
-
// Read in the entire file
int bytes_to_read = s_info.st_size;
while (bytes_to_read > 0) {
@@ -139,7 +138,6 @@ load_buffer(int fd, hdr_type h_type)
Tokenizer line_tok("\n");
Tokenizer el_tok(" \t");
-
int num_lines = line_tok.Initialize(file_buf);
int num_el = el_tok.Initialize(line_tok[0]);
@@ -242,7 +240,6 @@ main(int argc, const char *argv[])
return 0;
}
-
/*********************************************************************
Code for manual groking the mbuf objects
*******************************************************************/
@@ -288,7 +285,6 @@ walk_mbuffer(MBuffer *bufp)
break;
}
-
default:
printf("\n");
}
diff --git a/lib/ts/lockfile.cc b/lib/ts/lockfile.cc
index 624f158..119f63a 100644
--- a/lib/ts/lockfile.cc
+++ b/lib/ts/lockfile.cc
@@ -130,7 +130,6 @@ Lockfile::Get(pid_t *holding_pid)
int err;
*holding_pid = 0;
-
fd = -1;
// Open the Lockfile and get the lock. If we are successful, the
diff --git a/lib/ts/mkdfa.c b/lib/ts/mkdfa.c
index 7b94b93..19c597f 100644
--- a/lib/ts/mkdfa.c
+++ b/lib/ts/mkdfa.c
@@ -29,7 +29,6 @@
#define SIZEOF(t) (sizeof(t) / (sizeof((t)[0])))
-
typedef struct _info_t info_t;
typedef struct _state_t state_t;
typedef struct _transition_t transition_t;
@@ -52,7 +51,6 @@ struct _transition_t {
transition_t *next;
};
-
info_t fields[] = {
{"Accept", "MIME_FIELD_ACCEPT", 0},
{"Accept-Charset", "MIME_FIELD_ACCEPT_CHARSET", 0},
@@ -124,32 +122,17 @@ info_t fields[] = {
};
info_t schemes[] = {
- {"file", "URL_SCHEME_FILE", 0},
- {"ftp", "URL_SCHEME_FTP", 0},
- {"gopher", "URL_SCHEME_GOPHER", 0},
- {"http", "URL_SCHEME_HTTP", 0},
- {"https", "URL_SCHEME_HTTPS", 0},
- {"mailto", "URL_SCHEME_MAILTO", 0},
- {"news", "URL_SCHEME_NEWS", 0},
- {"nntp", "URL_SCHEME_NNTP", 0},
- {"prospero", "URL_SCHEME_PROSPERO", 0},
- {"telnet", "URL_SCHEME_TELNET", 0},
- {"wais", "URL_SCHEME_WAIS", 0},
- {NULL, "URL_SCHEME_NONE", 0},
+ {"file", "URL_SCHEME_FILE", 0}, {"ftp", "URL_SCHEME_FTP", 0}, {"gopher", "URL_SCHEME_GOPHER", 0},
+ {"http", "URL_SCHEME_HTTP", 0}, {"https", "URL_SCHEME_HTTPS", 0}, {"mailto", "URL_SCHEME_MAILTO", 0},
+ {"news", "URL_SCHEME_NEWS", 0}, {"nntp", "URL_SCHEME_NNTP", 0}, {"prospero", "URL_SCHEME_PROSPERO", 0},
+ {"telnet", "URL_SCHEME_TELNET", 0}, {"wais", "URL_SCHEME_WAIS", 0}, {NULL, "URL_SCHEME_NONE", 0},
};
info_t methods[] = {
- {"CONNECT", "HTTP_METHOD_CONNECT", -1},
- {"DELETE", "HTTP_METHOD_DELETE", -1},
- {"GET", "HTTP_METHOD_GET", -1},
- {"HEAD", "HTTP_METHOD_HEAD", -1},
- {"HTTP/", "HTTP_METHOD_HTTP", -1},
- {"OPTIONS", "HTTP_METHOD_OPTIONS", -1},
- {"POST", "HTTP_METHOD_POST", -1},
- {"PURGE", "HTTP_METHOD_PURGE", -1},
- {"PUT", "HTTP_METHOD_PUT", -1},
- {"TRACE", "HTTP_METHOD_TRACE", -1},
- {NULL, "HTTP_METHOD_NONE", 0},
+ {"CONNECT", "HTTP_METHOD_CONNECT", -1}, {"DELETE", "HTTP_METHOD_DELETE", -1}, {"GET", "HTTP_METHOD_GET", -1},
+ {"HEAD", "HTTP_METHOD_HEAD", -1}, {"HTTP/", "HTTP_METHOD_HTTP", -1}, {"OPTIONS", "HTTP_METHOD_OPTIONS", -1},
+ {"POST", "HTTP_METHOD_POST", -1}, {"PURGE", "HTTP_METHOD_PURGE", -1}, {"PUT", "HTTP_METHOD_PUT", -1},
+ {"TRACE", "HTTP_METHOD_TRACE", -1}, {NULL, "HTTP_METHOD_NONE", 0},
};
info_t statuses[] = {
@@ -194,37 +177,16 @@ info_t statuses[] = {
};
info_t days[] = {
- {"Fri", "FRIDAY", -1},
- {"Friday", "FRIDAY", -1},
- {"Mon", "MONDAY", -1},
- {"Monday", "MONDAY", -1},
- {"Sat", "SATURDAY", -1},
- {"Saturday", "SATURDAY", -1},
- {"Sun", "SUNDAY", -1},
- {"Sunday", "SUNDAY", -1},
- {"Thu", "THURSDAY", -1},
- {"Thursday", "THURSDAY", -1},
- {"Tue", "TUESDAY", -1},
- {"Tuesday", "TUESDAY", -1},
- {"Wed", "WEDNESDAY", -1},
- {"Wednesday", "WEDNESDAY", -1},
- {NULL, "UNKNOWN_DAY", -1},
+ {"Fri", "FRIDAY", -1}, {"Friday", "FRIDAY", -1}, {"Mon", "MONDAY", -1}, {"Monday", "MONDAY", -1},
+ {"Sat", "SATURDAY", -1}, {"Saturday", "SATURDAY", -1}, {"Sun", "SUNDAY", -1}, {"Sunday", "SUNDAY", -1},
+ {"Thu", "THURSDAY", -1}, {"Thursday", "THURSDAY", -1}, {"Tue", "TUESDAY", -1}, {"Tuesday", "TUESDAY", -1},
+ {"Wed", "WEDNESDAY", -1}, {"Wednesday", "WEDNESDAY", -1}, {NULL, "UNKNOWN_DAY", -1},
};
info_t months[] = {
- {"Apr", "APRIL", -1},
- {"Aug", "AUGUST", -1},
- {"Dec", "DECEMBER", -1},
- {"Feb", "FEBRUARY", -1},
- {"Jan", "JANUARY", -1},
- {"Jul", "JULY", -1},
- {"Jun", "JUNE", -1},
- {"Mar", "MARCH", -1},
- {"May", "MAY", -1},
- {"Nov", "NOVEMBER", -1},
- {"Oct", "OCTOBER", -1},
- {"Sep", "SEPTEMBER", -1},
- {NULL, "UNKNOWN_MONTH", -1},
+ {"Apr", "APRIL", -1}, {"Aug", "AUGUST", -1}, {"Dec", "DECEMBER", -1}, {"Feb", "FEBRUARY", -1}, {"Jan", "JANUARY", -1},
+ {"Jul", "JULY", -1}, {"Jun", "JUNE", -1}, {"Mar", "MARCH", -1}, {"May", "MAY", -1}, {"Nov", "NOVEMBER", -1},
+ {"Oct", "OCTOBER", -1}, {"Sep", "SEPTEMBER", -1}, {NULL, "UNKNOWN_MONTH", -1},
};
info_t connections[] = {
@@ -249,7 +211,6 @@ info_t cache_controls[] = {
{NULL, "HTTP_CACHE_DIRECTIVE_CACHE_EXTENSION", -1},
};
-
state_t *start = NULL;
int state_count = 0;
@@ -260,7 +221,6 @@ int *checktbl = NULL;
const char **accepttbl = NULL;
char **prefixtbl = NULL;
-
state_t *
mkstate()
{
diff --git a/lib/ts/test_List.cc b/lib/ts/test_List.cc
index f5e78a5..5642802 100644
--- a/lib/ts/test_List.cc
+++ b/lib/ts/test_List.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "ts/List.h"
class Foo
diff --git a/lib/ts/test_Map.cc b/lib/ts/test_Map.cc
index 64f5f2a..ca8e4bd 100644
--- a/lib/ts/test_Map.cc
+++ b/lib/ts/test_Map.cc
@@ -210,7 +210,6 @@ main(int /* argc ATS_UNUSED */, char ** /*argv ATS_UNUSED */)
ssh.get_keys(chars);
ink_assert(chars.n == 8);
-
test_TSHashTable();
printf("test_Map PASSED\n");
diff --git a/lib/ts/test_PriorityQueue.cc b/lib/ts/test_PriorityQueue.cc
index a6e1740..de5672c 100644
--- a/lib/ts/test_PriorityQueue.cc
+++ b/lib/ts/test_PriorityQueue.cc
@@ -34,8 +34,11 @@ class N
{
public:
N(uint32_t w, string c) : weight(w), content(c) {}
-
- bool operator<(const N &n) const { return weight < n.weight; }
+ bool
+ operator<(const N &n) const
+ {
+ return weight < n.weight;
+ }
uint32_t weight;
string content;
diff --git a/lib/ts/test_Vec.cc b/lib/ts/test_Vec.cc
index 1d8fe26..6933cd2 100644
--- a/lib/ts/test_Vec.cc
+++ b/lib/ts/test_Vec.cc
@@ -139,7 +139,6 @@ test_sort()
for (int i = 0; i < 1000; ++i)
ink_assert(reinterpret_cast<void *>(static_cast<intptr_t>(i + 1)) == v[i]);
-
v.clear();
for (long i = 1; i <= 1000000; ++i) {
v.add(reinterpret_cast<void *>(static_cast<intptr_t>(((i * 51511) % 1000000) + 1)));
diff --git a/lib/ts/test_X509HostnameValidator.cc b/lib/ts/test_X509HostnameValidator.cc
index 3252275..fe5fd0b 100644
--- a/lib/ts/test_X509HostnameValidator.cc
+++ b/lib/ts/test_X509HostnameValidator.cc
@@ -85,7 +85,6 @@ static const char *test_certificate_cn_and_SANs = "-----BEGIN CERTIFICATE-----\n
"gQP8uiG6cly7NruPZn2Yc1Cha0TycSYfVkRi0dMF2RKtaVvd4uaXDNb4Qpwv3Q==\n"
"-----END CERTIFICATE-----\n";
-
static X509 *
load_cert_from_string(const char *cert_string)
{
diff --git a/lib/ts/test_arena.cc b/lib/ts/test_arena.cc
index 9f93522..bc30448 100644
--- a/lib/ts/test_arena.cc
+++ b/lib/ts/test_arena.cc
@@ -72,7 +72,6 @@ test_block_boundries()
int failures = 0;
Arena *a = new Arena();
-
for (int i = 0; i < sizes_to_test; i++) {
int test_size = 1 << i;
diff --git a/lib/ts/test_atomic.cc b/lib/ts/test_atomic.cc
index 193faf8..9e79e1d 100644
--- a/lib/ts/test_atomic.cc
+++ b/lib/ts/test_atomic.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include <unistd.h>
#include <stdlib.h>
#include <time.h>
@@ -32,7 +31,6 @@
#include "ts/ink_queue.h"
#include "ts/ink_thread.h"
-
#ifndef LONG_ATOMICLIST_TEST
#define MAX_ALIST_TEST 10
@@ -148,7 +146,6 @@ main(int /* argc ATS_UNUSED */, const char * /* argv ATS_UNUSED */ [])
printf("sizeof(int32_t)==%d sizeof(void *)==%d\n", (int)sizeof(int32_t), (int)sizeof(void *));
-
printf("CAS: %d == 1 then 2\n", m);
n = ink_atomic_cas(&m, 1, 2);
printf("changed to: %d, result=%s\n", m, n ? "true" : "false");
@@ -170,7 +167,6 @@ main(int /* argc ATS_UNUSED */, const char * /* argv ATS_UNUSED */ [])
m = ink_atomic_increment((int *)&n, 1);
printf("changed to: %d, result=%d\n", n, m);
-
printf("Atomic Fetch-and-Add 2 to pointer to '%s'\n", m2);
n2 = (char *)ink_atomic_increment((pvvoidp)&m2, (void *)2);
printf("changed to: %s, result=%s\n", m2, n2);
diff --git a/lib/ts/test_freelist.cc b/lib/ts/test_freelist.cc
index c7b3e3f..18d16e5 100644
--- a/lib/ts/test_freelist.cc
+++ b/lib/ts/test_freelist.cc
@@ -26,11 +26,9 @@
#include "ts/ink_thread.h"
#include "ts/ink_queue.h"
-
#define NTHREADS 64
InkFreeList *flist = NULL;
-
void *
test(void *d)
{
@@ -67,7 +65,6 @@ test(void *d)
}
}
-
int
main(int /* argc ATS_UNUSED */, char * /*argv ATS_UNUSED */ [])
{
diff --git a/lib/wccp/Wccp.h b/lib/wccp/Wccp.h
index 5fdf1c2..ded1a7d 100644
--- a/lib/wccp/Wccp.h
+++ b/lib/wccp/Wccp.h
@@ -371,7 +371,6 @@ public:
self &setCacheAssignment(CacheAssignmentStyle style ///< Style to use.
);
-
private:
Service(Cache const &cache, detail::cache::GroupData &group);
Cache m_cache; ///< Parent cache.
@@ -379,7 +378,6 @@ private:
friend class Cache;
};
-
class Router : public EndPoint
{
public:
@@ -405,7 +403,8 @@ protected:
};
// ------------------------------------------------------
-inline bool ServiceGroup::operator!=(self const &that) const
+inline bool
+ServiceGroup::operator!=(self const &that) const
{
return !(*this == that);
}
diff --git a/lib/wccp/WccpConfig.cc b/lib/wccp/WccpConfig.cc
index 60bf842..039cc2b 100644
--- a/lib/wccp/WccpConfig.cc
+++ b/lib/wccp/WccpConfig.cc
@@ -33,7 +33,8 @@ using ts::config::Value;
// Support that must go in the standard namespace.
namespace std
{
-inline ostream &operator<<(ostream &s, ts::ConstBuffer const &b)
+inline ostream &
+operator<<(ostream &s, ts::ConstBuffer const &b)
{
if (b._ptr)
s.write(b._ptr, b._size);
@@ -110,7 +111,8 @@ struct ValueNamePrinter {
ValueNamePrinter(Value const &v) : _v(v) {}
};
-std::ostream &operator<<(std::ostream &out, ValueNamePrinter const &v)
+std::ostream &
+operator<<(std::ostream &out, ValueNamePrinter const &v)
{
ts::ConstBuffer const &name = v._v.getName();
if (name._ptr)
@@ -352,12 +354,14 @@ Port_Type_Invalid(ts::ConstBuffer const &text, int line)
namespace wccp
{
-inline bool operator==(ts::ConstBuffer const &b, char const *text)
+inline bool
+operator==(ts::ConstBuffer const &b, char const *text)
{
return 0 == strncasecmp(text, b._ptr, b._size);
}
-inline bool operator==(char const *text, ts::ConstBuffer const &b)
+inline bool
+operator==(char const *text, ts::ConstBuffer const &b)
{
return 0 == strncasecmp(text, b._ptr, b._size);
}
diff --git a/lib/wccp/WccpLocal.h b/lib/wccp/WccpLocal.h
index aefc526..3cb9c77 100644
--- a/lib/wccp/WccpLocal.h
+++ b/lib/wccp/WccpLocal.h
@@ -896,7 +896,6 @@ public:
/// Default constructor.
MsgHeaderComp() {}
-
/// @name Accessors
//@{
message_type_t getType(); ///< Get message type field.
@@ -1641,7 +1640,6 @@ public:
/// Force virtual desctructor.
virtual ~AltAssignComp() {}
-
/// @name Accessors
//@{
/// Get the assignment type.
@@ -1697,7 +1695,6 @@ public:
/// Force virtual desctructor.
virtual ~AltHashAssignComp() {}
-
/// Fill out the component from an @c Assignment.
virtual self &fill(MsgBuffer &buffer, ///< Target storage.
detail::Assignment const &assign ///< Assignment data.
@@ -1731,7 +1728,6 @@ public:
/// Force virtual desctructor.
virtual ~AltMaskAssignComp() {}
-
/// Fill out the component from an @c Assignment.
virtual self &fill(MsgBuffer &buffer, ///< Target storage.
detail::Assignment const &assign ///< Assignment data.
@@ -2013,7 +2009,6 @@ public:
BaseMsg();
/// Destructor.
virtual ~BaseMsg() {}
-
/// Set the message @a buffer.
void setBuffer(MsgBuffer const &buffer ///< Storage for message.
);
@@ -2365,7 +2360,6 @@ namespace detail
/// Cache assignment methods supported.
ServiceGroup::CacheAssignmentStyle m_cache_assign;
-
/// Known caches.
CacheBag m_caches;
/// Known routers.
@@ -2695,7 +2689,8 @@ RouterIdElt::setRecvId(uint32_t recv_id)
m_recv_id = htonl(recv_id);
return *this;
}
-inline RouterIdElt &RouterIdElt::operator=(super const &that)
+inline RouterIdElt &
+RouterIdElt::operator=(super const &that)
{
return this->setAddr(that.m_addr).setRecvId(that.m_recv_id);
}
diff --git a/lib/wccp/WccpMeta.h b/lib/wccp/WccpMeta.h
index a2cacc2..000ba60 100644
--- a/lib/wccp/WccpMeta.h
+++ b/lib/wccp/WccpMeta.h
@@ -51,7 +51,7 @@ template <> struct TEST_BOOL<false> {
};
// Fail to compile if VALUE is not true.
-template <bool VALUE> struct TEST_IF_TRUE : public TEST_RESULT<TEST_BOOL<VALUE> > {
+template <bool VALUE> struct TEST_IF_TRUE : public TEST_RESULT<TEST_BOOL<VALUE>> {
};
// Helper for assigning a value to all instances in a container.
@@ -59,7 +59,11 @@ template <typename T, typename R, typename A1> struct TsAssignMember : public st
R T::*_m;
A1 _arg1;
TsAssignMember(R T::*m, A1 const &arg1) : _m(m), _arg1(arg1) {}
- R operator()(T &t) const { return t.*_m = _arg1; }
+ R
+ operator()(T &t) const
+ {
+ return t.*_m = _arg1;
+ }
};
// Helper function to compute types for TsAssignMember.
@@ -132,7 +136,11 @@ struct MemberPredicate {
Value const &m_value; ///< Value to test against.
Value Elt::*m_mptr; ///< Pointer to member to test.
MemberPredicate(Value Elt::*mptr, Value const &v) : m_value(v), m_mptr(mptr) {}
- bool operator()(Elt const &elt) const { return elt.*m_mptr == m_value; }
+ bool
+ operator()(Elt const &elt) const
+ {
+ return elt.*m_mptr == m_value;
+ }
};
template <typename T, typename V>
@@ -150,7 +158,11 @@ struct MethodPredicate {
Value const &m_value; ///< Value to test against.
MethodPtr m_mptr; ///< Pointer to method returning value.
MethodPredicate(MethodPtr mptr, Value const &v) : m_value(v), m_mptr(mptr) {}
- bool operator()(Elt const &elt) const { return (elt.*m_mptr)() == m_value; }
+ bool
+ operator()(Elt const &elt) const
+ {
+ return (elt.*m_mptr)() == m_value;
+ }
};
template <typename T, typename V>
diff --git a/lib/wccp/WccpMsg.cc b/lib/wccp/WccpMsg.cc
index dfc404b..894b8b1 100644
--- a/lib/wccp/WccpMsg.cc
+++ b/lib/wccp/WccpMsg.cc
@@ -42,7 +42,8 @@ ServiceGroup::setSvcType(ServiceGroup::Type t)
return *this;
}
-bool ServiceGroup::operator==(self const &that) const
+bool
+ServiceGroup::operator==(self const &that) const
{
if (m_svc_type == STANDARD) {
// If type are different, fail, else if both are STANDARD
@@ -1225,7 +1226,6 @@ AltHashAssignComp::getCacheCount() const
return ntohl(*m_cache_count);
}
-
size_t
AltHashAssignComp::calcSize(int n_routers, int n_caches)
{
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index d444a7b..e309423 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "ts/ink_platform.h"
#include "ts/ink_string.h"
#include "ts/ink_file.h"
@@ -35,12 +34,29 @@
#include "P_RecCore.h"
const char *alarmText[] = {
- "Unknown Alarm", "[TrafficManager] Traffic Server process was reset.", "[TrafficManager] Traffic Server process established.",
- "New Peer", "Peer Died", "Invalid Configuration", "System Error", "Log Space Crisis", "Cache Error", "Cache Warning",
- "Logging Error", "Logging Warning", "Mgmt Debugging Alarm", "Configuration File Update Failed",
- "Unable to Establish Manager User-Interface Services", "Ping Failure", "", "Add OEM Alarm", "", "HTTP Origin Server is Congested",
- "Congested HTTP Origin Server is now Alleviated", "", /* congested server */
- "" /* alleviated server */
+ "Unknown Alarm",
+ "[TrafficManager] Traffic Server process was reset.",
+ "[TrafficManager] Traffic Server process established.",
+ "New Peer",
+ "Peer Died",
+ "Invalid Configuration",
+ "System Error",
+ "Log Space Crisis",
+ "Cache Error",
+ "Cache Warning",
+ "Logging Error",
+ "Logging Warning",
+ "Mgmt Debugging Alarm",
+ "Configuration File Update Failed",
+ "Unable to Establish Manager User-Interface Services",
+ "Ping Failure",
+ "",
+ "Add OEM Alarm",
+ "",
+ "HTTP Origin Server is Congested",
+ "Congested HTTP Origin Server is now Alleviated",
+ "", /* congested server */
+ "" /* alleviated server */
};
const int alarmTextNum = sizeof(alarmText) / sizeof(char *);
@@ -70,7 +86,6 @@ Alarms::Alarms()
alarmOEMcount = minOEMkey;
} /* End Alarms::Alarms */
-
Alarms::~Alarms()
{
ink_hash_table_destroy(cblist);
@@ -79,7 +94,6 @@ Alarms::~Alarms()
ink_mutex_destroy(&mutex);
} /* End Alarms::Alarms */
-
void
Alarms::registerCallback(AlarmCallbackFunc func)
{
@@ -92,7 +106,6 @@ Alarms::registerCallback(AlarmCallbackFunc func)
ink_mutex_release(&mutex);
} /* End Alarms::registerCallback */
-
bool
Alarms::isCurrentAlarm(alarm_t a, char *ip)
{
@@ -116,7 +129,6 @@ Alarms::isCurrentAlarm(alarm_t a, char *ip)
return ret;
} /* End Alarms::isCurrentAlarm */
-
void
Alarms::resolveAlarm(alarm_t a, char *ip)
{
@@ -150,7 +162,6 @@ Alarms::resolveAlarm(alarm_t a, char *ip)
return;
} /* End Alarms::resolveAlarm */
-
void
Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
{
@@ -304,7 +315,6 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
} /* End Alarms::signalAlarm */
-
/*
* resetSeenFlag(...)
* Function resets the "seen" flag for a given peer's alarms. This allows
@@ -330,7 +340,6 @@ Alarms::resetSeenFlag(char *ip)
return;
} /* End Alarms::resetSeenFlag */
-
/*
* clearUnSeen(...)
* This function is a sweeper functionto clean up those alarms that have
@@ -360,7 +369,6 @@ Alarms::clearUnSeen(char *ip)
return;
} /* End Alarms::clearUnSeen */
-
/*
* constructAlarmMessage(...)
* This functions builds a message buffer for passing to peers. It basically
@@ -422,7 +430,6 @@ Alarms::constructAlarmMessage(const AppVersionInfo &version, char *ip, char *mes
return;
} /* End Alarms::constructAlarmMessage */
-
/*
* checkSystemNAlert(...)
* This function should test the system and signal local alarms. Sending
diff --git a/mgmt/Alarms.h b/mgmt/Alarms.h
index 0ec9854..e4f3588 100644
--- a/mgmt/Alarms.h
+++ b/mgmt/Alarms.h
@@ -81,7 +81,6 @@ class AppVersionInfo;
extern const char *alarmText[];
extern const int alarmTextNum;
-
/* OEM_ALARM: the alarm type is used as a key for hash tables;
need offset and modulo constants which will keep the unique
keys for OEM alarms within a specified range */
diff --git a/mgmt/BaseManager.cc b/mgmt/BaseManager.cc
index afa05bc..9fb2751 100644
--- a/mgmt/BaseManager.cc
+++ b/mgmt/BaseManager.cc
@@ -36,7 +36,6 @@
#include "ts/ink_memory.h"
#include "BaseManager.h"
-
BaseManager::BaseManager()
{
/* Setup the event queue and callback tables */
@@ -45,7 +44,6 @@ BaseManager::BaseManager()
} /* End BaseManager::BaseManager */
-
BaseManager::~BaseManager()
{
InkHashTableEntry *entry;
@@ -71,7 +69,6 @@ BaseManager::~BaseManager()
return;
} /* End BaseManager::~BaseManager */
-
/*
* registerMgmtCallback(...)
* Function to register callback's for various management events, such
@@ -115,7 +112,6 @@ BaseManager::registerMgmtCallback(int msg_id, MgmtCallback cb, void *opaque_cb_d
return msg_id;
} /* End BaseManager::registerMgmtCallback */
-
/*
* signalMgmtEntity(...)
*/
@@ -153,7 +149,6 @@ BaseManager::signalMgmtEntity(int msg_id, char *data_raw, int data_len)
} /* End BaseManager::signalMgmtEntity */
-
void
BaseManager::executeMgmtCallback(int msg_id, char *data_raw, int data_len)
{
diff --git a/mgmt/BaseManager.h b/mgmt/BaseManager.h
index 676277b..c816f0c 100644
--- a/mgmt/BaseManager.h
+++ b/mgmt/BaseManager.h
@@ -109,14 +109,12 @@ typedef struct _mgmt_message_hdr_type {
int data_len;
} MgmtMessageHdr;
-
typedef struct _mgmt_event_callback_list {
MgmtCallback func;
void *opaque_data;
struct _mgmt_event_callback_list *next;
} MgmtCallbackList;
-
class BaseManager
{
public:
@@ -137,5 +135,4 @@ protected:
private:
}; /* End class BaseManager */
-
#endif /* _BASE_MANAGER_H */
diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc
index 06b7cbb..f42b36f 100644
--- a/mgmt/FileManager.cc
+++ b/mgmt/FileManager.cc
@@ -38,11 +38,17 @@
typedef fileEntry snapshot;
-const char *SnapshotStrings[] = {"Request Successful\n", "No Snapshot Directory", "Snapshot was not found\n",
- "Creation of snapshot directory failed\n", "Creation of snapshot file failed\n",
- "Access to snapshot file Failed\n", "Unable to write to snapshot file\n",
- "Remove of Snapshot failed\n", "Internal Error: Form Submission was invalid\n",
- "No Snapshot Name Was Given\n", "Invalid Snapshot name\n"};
+const char *SnapshotStrings[] = {"Request Successful\n",
+ "No Snapshot Directory",
+ "Snapshot was not found\n",
+ "Creation of snapshot directory failed\n",
+ "Creation of snapshot file failed\n",
+ "Access to snapshot file Failed\n",
+ "Unable to write to snapshot file\n",
+ "Remove of Snapshot failed\n",
+ "Internal Error: Form Submission was invalid\n",
+ "No Snapshot Name Was Given\n",
+ "Invalid Snapshot name\n"};
FileManager::FileManager()
{
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index c43f0e6..dac34ee 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "ts/ink_platform.h"
#include "ts/ink_sock.h"
#include "ts/ink_file.h"
@@ -52,7 +51,6 @@ LocalManager::mgmtCleanup()
return;
}
-
void
LocalManager::mgmtShutdown()
{
@@ -72,7 +70,6 @@ LocalManager::mgmtShutdown()
mgmtCleanup();
}
-
void
LocalManager::processShutdown(bool mainThread)
{
@@ -85,7 +82,6 @@ LocalManager::processShutdown(bool mainThread)
return;
}
-
void
LocalManager::processRestart()
{
@@ -94,7 +90,6 @@ LocalManager::processRestart()
return;
}
-
void
LocalManager::processBounce()
{
@@ -499,7 +494,6 @@ LocalManager::pollMgmtProcessServer()
}
}
-
void
LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
{
@@ -626,7 +620,6 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
}
}
-
void
LocalManager::sendMgmtMsgToProcesses(int msg_id, const char *data_str)
{
@@ -634,7 +627,6 @@ LocalManager::sendMgmtMsgToProcesses(int msg_id, const char *data_str)
return;
}
-
void
LocalManager::sendMgmtMsgToProcesses(int msg_id, const char *data_raw, int data_len)
{
@@ -648,7 +640,6 @@ LocalManager::sendMgmtMsgToProcesses(int msg_id, const char *data_raw, int data_
return;
}
-
void
LocalManager::sendMgmtMsgToProcesses(MgmtMessageHdr *mh)
{
@@ -757,7 +748,6 @@ LocalManager::sendMgmtMsgToProcesses(MgmtMessageHdr *mh)
}
}
-
void
LocalManager::signalFileChange(const char *var_name, bool incVersion)
{
@@ -769,7 +759,6 @@ LocalManager::signalFileChange(const char *var_name, bool incVersion)
return;
}
-
void
LocalManager::signalEvent(int msg_id, const char *data_str)
{
@@ -777,7 +766,6 @@ LocalManager::signalEvent(int msg_id, const char *data_str)
return;
}
-
void
LocalManager::signalEvent(int msg_id, const char *data_raw, int data_len)
{
@@ -792,7 +780,6 @@ LocalManager::signalEvent(int msg_id, const char *data_raw, int data_len)
return;
}
-
/*
* processEventQueue()
* Function drains and processes the mgmt event queue
@@ -837,7 +824,6 @@ LocalManager::processEventQueue()
}
}
-
/*
* startProxy()
* Function fires up a proxy process.
@@ -1010,7 +996,6 @@ LocalManager::listenForProxy()
return;
}
-
/*
* bindProxyPort()
* Function binds the accept port of the proxy
diff --git a/mgmt/MultiFile.cc b/mgmt/MultiFile.cc
index a0c8773..d83447d 100644
--- a/mgmt/MultiFile.cc
+++ b/mgmt/MultiFile.cc
@@ -147,7 +147,6 @@ MultiFile::WalkFiles(ExpandingArray *fileList)
return MF_OK;
}
-
bool
MultiFile::isManaged(const char *fileName)
{
diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc
index 6ae18b1..87f76f9 100644
--- a/mgmt/ProcessManager.cc
+++ b/mgmt/ProcessManager.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "ts/ink_platform.h"
#undef HTTP_CACHE
@@ -80,7 +79,6 @@ ProcessManager::ProcessManager(bool rlm) : BaseManager(), require_lm(rlm), local
pid = getpid();
} /* End ProcessManager::ProcessManager */
-
void
ProcessManager::reconfigure()
{
@@ -113,7 +111,6 @@ ProcessManager::signalManager(int msg_id, const char *data_str)
return;
} /* End ProcessManager::signalManager */
-
void
ProcessManager::signalManager(int msg_id, const char *data_raw, int data_len)
{
@@ -128,7 +125,6 @@ ProcessManager::signalManager(int msg_id, const char *data_raw, int data_len)
} /* End ProcessManager::signalManager */
-
bool
ProcessManager::processEventQueue()
{
@@ -153,7 +149,6 @@ ProcessManager::processEventQueue()
return ret;
} /* End ProcessManager::processEventQueue */
-
bool
ProcessManager::processSignalQueue()
{
@@ -176,7 +171,6 @@ ProcessManager::processSignalQueue()
return ret;
} /* End ProcessManager::processSignalQueue */
-
void
ProcessManager::initLMConnection()
{
@@ -223,7 +217,6 @@ ProcessManager::initLMConnection()
} /* End ProcessManager::initLMConnection */
-
void
ProcessManager::pollLMConnection()
{
diff --git a/mgmt/ProxyConfig.cc b/mgmt/ProxyConfig.cc
index ca6273d..b3a92fa 100644
--- a/mgmt/ProxyConfig.cc
+++ b/mgmt/ProxyConfig.cc
@@ -28,7 +28,6 @@
ConfigProcessor configProcessor;
-
void *
config_int_cb(void *data, void *value)
{
@@ -90,7 +89,6 @@ config_string_alloc_cb(void *data, void *value)
return NULL;
}
-
class ConfigInfoReleaser : public Continuation
{
public:
@@ -112,7 +110,6 @@ public:
ConfigInfo *m_info;
};
-
ConfigProcessor::ConfigProcessor() : ninfos(0)
{
int i;
@@ -228,7 +225,6 @@ struct RegressionConfig : public ConfigInfo {
// object count drops below the specified count.
template <typename CallType> struct DeferredCall : public Continuation {
DeferredCall(int _r, CallType _c) : remain(_r), call(_c) { SET_HANDLER(&DeferredCall::handleEvent); }
-
int
handleEvent(int event ATS_UNUSED, Event *e)
{
@@ -289,8 +285,8 @@ volatile int RegressionConfig::nobjects = 0;
struct ProxyConfig_Set_Completion {
ProxyConfig_Set_Completion(int _id, RegressionConfig *_c) : configid(_id), config(_c) {}
-
- void operator()(void) const
+ void
+ operator()(void) const
{
// Push one more RegressionConfig to force the LAST-tagged one to get destroyed.
rprintf(config->test, "setting LAST config object %p\n", config);
@@ -323,8 +319,8 @@ EXCLUSIVE_REGRESSION_TEST(ProxyConfig_Set)(RegressionTest *test, int /* atype AT
struct ProxyConfig_Release_Completion {
ProxyConfig_Release_Completion(int _id, RegressionConfig *_c) : configid(_id), config(_c) {}
-
- void operator()(void) const
+ void
+ operator()(void) const
{
// Release the reference count. Since we were keeping this alive, it should be the last to die.
configProcessor.release(configid, config);
diff --git a/mgmt/ProxyConfig.h b/mgmt/ProxyConfig.h
index 078892d..b3a35a5 100644
--- a/mgmt/ProxyConfig.h
+++ b/mgmt/ProxyConfig.h
@@ -78,11 +78,9 @@ public:
template <typename ClassType, typename ConfigType> struct scoped_config {
scoped_config() : ptr(ClassType::acquire()) {}
~scoped_config() { ClassType::release(ptr); }
-
operator bool() const { return ptr != 0; }
operator const ConfigType *() const { return ptr; }
const ConfigType *operator->() const { return ptr; }
-
private:
ConfigType *ptr;
};
@@ -119,9 +117,7 @@ ConfigScheduleUpdate(ProxyMutex *mutex)
template <typename UpdateClass> struct ConfigUpdateHandler {
ConfigUpdateHandler() : mutex(new_ProxyMutex()) {}
-
~ConfigUpdateHandler() { mutex->free(); }
-
int
attach(const char *name)
{
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 187f5fe..8d17edb 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "ts/ink_config.h"
#include "RecordsConfig.h"
@@ -2039,7 +2038,6 @@ static const RecordElement RecordsConfig[] =
};
// clang-format on
-
void
RecordsConfigIterate(RecordElementCallback callback, void *data)
{
diff --git a/mgmt/RecordsConfig.h b/mgmt/RecordsConfig.h
index 8d73023..fabebad 100644
--- a/mgmt/RecordsConfig.h
+++ b/mgmt/RecordsConfig.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#if !defined(_RECORDS_CONFIG_H_)
#define _RECORDS_CONFIG_H_
diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc
index f1361f4..a8e4487 100644
--- a/mgmt/Rollback.cc
+++ b/mgmt/Rollback.cc
@@ -222,7 +222,6 @@ Rollback::~Rollback()
ats_free(fileName);
}
-
// Rollback::createPathStr(version_t version)
//
// CALLEE DELETES STORAGE
@@ -314,7 +313,6 @@ Rollback::closeFile(int fd, bool callSync)
return result;
}
-
RollBackCodes
Rollback::updateVersion(textBuffer *buf, version_t basedOn, version_t newVersion, bool notifyChange, bool incVersion)
{
@@ -341,7 +339,6 @@ Rollback::updateVersion_ml(textBuffer *buf, version_t basedOn, version_t newVers
return returnCode;
}
-
RollBackCodes
Rollback::forceUpdate(textBuffer *buf, version_t newVersion)
{
@@ -379,7 +376,6 @@ Rollback::internalUpdate(textBuffer *buf, version_t newVersion, bool notifyChang
bool failedLink = false;
char *alarmMsg = NULL;
-
// Check to see if the callee has specified a newVersion number
// If the newVersion argument is less than zero, the callee
// is telling us to use the next version in squence
@@ -475,7 +471,6 @@ Rollback::internalUpdate(textBuffer *buf, version_t newVersion, bool notifyChang
this->numVersions++;
this->currentVersion = newVersion;
-
returnCode = OK_ROLLBACK;
// Post the change to the config file manager
@@ -508,7 +503,6 @@ UPDATE_CLEANUP:
return returnCode;
}
-
RollBackCodes
Rollback::getVersion(version_t version, textBuffer **buffer)
{
@@ -774,7 +768,6 @@ Rollback::findVersions_ml(Queue<versionInfo> &q)
return highest;
}
-
RollBackCodes
Rollback::removeVersion(version_t version)
{
diff --git a/mgmt/WebMgmtUtils.cc b/mgmt/WebMgmtUtils.cc
index e9df35e..2392102 100644
--- a/mgmt/WebMgmtUtils.cc
+++ b/mgmt/WebMgmtUtils.cc
@@ -40,7 +40,6 @@
*
****************************************************************************/
-
// bool varSetFromStr(const char*, const char* )
//
// Sets the named local manager variable from the value string
@@ -290,7 +289,6 @@ varDataFromName(RecDataT varType, const char *varName, RecData *value)
return (err == REC_ERR_OKAY);
}
-
// bool varCounterFromName (const char*, RecFloat* )
//
// Sets the *value to value of the varName.
@@ -439,7 +437,6 @@ varIntFromName(const char *varName, RecInt *value)
return found;
}
-
// void percentStrFromFloat(MgmtFloat, char* bufVal)
//
// Converts a float to a percent string
@@ -789,7 +786,6 @@ varType(const char *varName)
return data_type;
}
-
// InkHashTable* processFormSubmission(char* submission)
//
// A generic way to handle a HTML form submission.
@@ -1015,7 +1011,6 @@ substituteForHTMLChars(const char *buffer)
return safeBuf;
}
-
// bool ProxyShutdown()
//
// Attempts to turn the proxy off. Returns
diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc
index 28328f3..a6a38e7 100644
--- a/mgmt/api/APITestCliRemote.cc
+++ b/mgmt/api/APITestCliRemote.cc
@@ -140,7 +140,6 @@ print_err(const char *module, TSMgmtError err)
TSfree(err_msg);
}
-
/*--------------------------------------------------------------
* print_ports
*--------------------------------------------------------------*/
@@ -222,7 +221,6 @@ print_domain_list(TSDomainList list)
}
}
-
void
print_ip_addr_ele(TSIpAddrEle *ele)
{
@@ -279,7 +277,6 @@ print_list_of_ip_list(TSList list)
}
}
-
/*-------------------------------------------------------
* print_pd_sspec
*-------------------------------------------------------*/
@@ -349,7 +346,6 @@ print_pd_sspec(TSPdSsFormat info)
}
printf("\n");
-
printf("\tscheme: ");
switch (info.sec_spec.scheme) {
case TS_SCHEME_NONE:
@@ -369,7 +365,6 @@ print_pd_sspec(TSPdSsFormat info)
return;
}
-
void
print_cache_ele(TSCacheEle *ele)
{
@@ -440,7 +435,6 @@ print_cache_ele(TSCacheEle *ele)
return;
}
-
void
print_hosting_ele(TSHostingEle *ele)
{
@@ -839,7 +833,6 @@ print_ele_list(TSFileNameT file, TSCfgContext ctx)
return;
}
-
/***************************************************************************
* Control Testing
***************************************************************************/
@@ -991,7 +984,6 @@ test_error_records()
ret = TSRecordSetInt("proy.config.cop.core_signal", new_port, &action);
print_err("TSRecordSetInt", ret);
-
printf("\n");
if (TSRecordGetCounter("proxy.press.socks.connections_successful", &ctr1) != TS_ERR_OKAY)
printf("TSRecordGetCounter FAILED!\n");
@@ -1034,7 +1026,6 @@ test_records()
printf("[TSRecordSetInt] proxy.config.cop.core_signal=%" PRId64 " \n", new_port);
#endif
-
#if TEST_REC_GET
TSRecordEle *rec_ele;
// retrieve a string value record using generic RecordGet
@@ -1048,7 +1039,6 @@ test_records()
printf("\n\n");
#endif
-
#if TEST_REC_GET_2
// retrieve a string value record using generic RecordGet
rec_ele = TSRecordEleCreate();
@@ -1078,7 +1068,6 @@ test_records()
else
printf("[TSRecordSetString] proxy.config.proxy_name=%s\n", new_str);
-
// get
err = TSRecordGetString("proxy.config.proxy_name", &rec_value);
if (err != TS_ERR_OKAY)
@@ -1251,7 +1240,6 @@ test_record_get_mlt(void)
TSStringListEnqueue(name_list, v7);
TSStringListEnqueue(name_list, v8);
-
num = TSStringListLen(name_list);
printf("Num Records to Get: %d\n", num);
ret = TSRecordGetMlt(name_list, rec_list);
@@ -1335,7 +1323,6 @@ test_record_set_mlt(void)
ele5->rec_type = TS_REC_INT;
ele5->valueT.int_val = 555;
-
TSListEnqueue(list, ele4);
TSListEnqueue(list, ele1);
TSListEnqueue(list, ele2);
@@ -1355,7 +1342,6 @@ test_record_set_mlt(void)
TSListDestroy(list);
}
-
/***************************************************************************
* File I/O Testing
***************************************************************************/
@@ -1730,7 +1716,6 @@ test_cfg_context_ops()
}
// print_VirtIpAddr_ele_list(ctx);
-
printf("\nMove ele at index %d to botoom of list\n", insert_at);
for (i = insert_at; i < TSCfgContextGetCount(ctx); i++) {
err = TSCfgContextMoveEleDown(ctx, i);
@@ -1752,7 +1737,6 @@ test_cfg_context_ops()
}
// print_VirtIpAddr_ele_list(ctx);
-
// commit change
TSCfgContextCommit(ctx, NULL, NULL);
@@ -1885,7 +1869,6 @@ test_cfg_socks()
TSCfgContextDestroy(ctx);
}
-
/***************************************************************************
* Events Testing
***************************************************************************/
@@ -2137,7 +2120,6 @@ set_stats()
fprintf(stderr, "[set_stats] Set Dummy Stat Values\n");
-
TSRecordSetInt("proxy.process.http.user_agent_response_document_total_size", 100, &action);
TSRecordSetInt("proxy.process.http.user_agent_response_header_total_size", 100, &action);
TSRecordSetInt("proxy.process.http.current_client_connections", 100, &action);
@@ -2147,7 +2129,6 @@ set_stats()
TSRecordSetInt("proxy.process.http.current_server_connections", 100, &action);
TSRecordSetInt("proxy.process.http.current_server_transactions", 100, &action);
-
TSRecordSetFloat("proxy.node.bandwidth_hit_ratio", 110, &action);
TSRecordSetFloat("proxy.node.hostdb.hit_ratio", 110, &action);
TSRecordSetFloat("proxy.node.cache.percent_free", 110, &action);
@@ -2194,7 +2175,6 @@ print_stats()
fprintf(stderr, "[print_stats]\n");
-
TSRecordGetInt("proxy.process.http.user_agent_response_document_total_size", &i1);
TSRecordGetInt("proxy.process.http.user_agent_response_header_total_size", &i2);
TSRecordGetInt("proxy.process.http.current_client_connections", &i3);
@@ -2396,12 +2376,10 @@ runInteractive()
sync_test();
}
-
} // end while(1)
} // end runInteractive
-
/* ------------------------------------------------------------------------
* main
* ------------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextImpl.cc b/mgmt/api/CfgContextImpl.cc
index 3abb06e..cb93731 100644
--- a/mgmt/api/CfgContextImpl.cc
+++ b/mgmt/api/CfgContextImpl.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "ts/ink_platform.h"
#include "ts/ink_string.h"
@@ -67,7 +66,6 @@ CommentObj::getCfgEleCopy()
return (TSCfgEle *)copy_comment_ele(m_ele);
}
-
//--------------------------------------------------------------------------
// CacheObj
//--------------------------------------------------------------------------
@@ -247,7 +245,6 @@ CacheObj::getCfgEleCopy()
return (TSCfgEle *)copy_cache_ele(m_ele);
}
-
//--------------------------------------------------------------------------
// CongestionObj
//--------------------------------------------------------------------------
@@ -465,7 +462,6 @@ CongestionObj::getCfgEleCopy()
return (TSCfgEle *)copy_congestion_ele(m_ele);
}
-
//--------------------------------------------------------------------------
// HostingObj
//--------------------------------------------------------------------------
@@ -976,7 +972,6 @@ IpAllowObj::getCfgEleCopy()
return (TSCfgEle *)copy_ip_allow_ele(m_ele);
}
-
//--------------------------------------------------------------------------
// ParentProxyObj
//--------------------------------------------------------------------------
@@ -1418,7 +1413,6 @@ PluginObj::getCfgEleCopy()
return (TSCfgEle *)copy_plugin_ele(m_ele);
}
-
//--------------------------------------------------------------------------
// RemapObj
//--------------------------------------------------------------------------
@@ -2279,7 +2273,6 @@ StorageObj::getCfgEleCopy()
return (TSCfgEle *)copy_storage_ele(m_ele);
}
-
//--------------------------------------------------------------------------
// VirtIpAddrObj
//--------------------------------------------------------------------------
@@ -2389,7 +2382,6 @@ VirtIpAddrObj::getCfgEleCopy()
return (TSCfgEle *)copy_virt_ip_addr_ele(m_ele);
}
-
/*****************************************************************
* CfgContext
*****************************************************************/
diff --git a/mgmt/api/CfgContextImpl.h b/mgmt/api/CfgContextImpl.h
index db9364b..6928618 100644
--- a/mgmt/api/CfgContextImpl.h
+++ b/mgmt/api/CfgContextImpl.h
@@ -36,7 +36,6 @@
#include "ts/List.h"
-
/**********************************************************************
* CfgEleObj
*
@@ -49,7 +48,6 @@ public:
using INK<file>Ele or a TokenList */
virtual ~CfgEleObj() {} // virtual destructor
-
virtual char *formatEleToRule() = 0;
virtual bool isValid() = 0;
@@ -308,7 +306,6 @@ private:
TSLogObjectEle *m_ele;
};
-
/* parent.config *******************************************/
class ParentProxyObj : public CfgEleObj
{
@@ -439,7 +436,6 @@ private:
TSSocksEle *m_ele;
};
-
/* splitdns.config *******************************************/
class SplitDnsObj : public CfgEleObj
{
@@ -492,7 +488,6 @@ private:
TSStorageEle *m_ele;
};
-
/* vaddrs.config *******************************************/
class VirtIpAddrObj : public CfgEleObj
{
@@ -519,7 +514,6 @@ private:
TSVirtIpAddrEle *m_ele;
};
-
/*****************************************************************
* CfgContext
*****************************************************************/
@@ -567,5 +561,4 @@ private:
Queue<CfgEleObj> m_eles;
};
-
#endif
diff --git a/mgmt/api/CfgContextManager.cc b/mgmt/api/CfgContextManager.cc
index 315c61e..b2d79fe 100644
--- a/mgmt/api/CfgContextManager.cc
+++ b/mgmt/api/CfgContextManager.cc
@@ -141,7 +141,6 @@ CfgContextCommit(CfgContext *ctx, LLQ *errRules)
return err;
}
-
/* ---------------------------------------------------------------
* CfgContextGet
* ---------------------------------------------------------------
@@ -198,7 +197,6 @@ CfgContextGet(CfgContext *ctx)
return TS_ERR_OKAY;
}
-
/***************************************************************
* CfgContext Operations
***************************************************************/
@@ -265,7 +263,6 @@ CfgContextGetObjAt(CfgContext *ctx, int index)
return NULL; // invalid index
}
-
/*--------------------------------------------------------------
* CfgContextGetEleAt
*--------------------------------------------------------------
@@ -304,7 +301,6 @@ CfgContextGetEleAt(CfgContext *ctx, int index)
return NULL; // invalid index
}
-
/*--------------------------------------------------------------
* CfgContextGetFirst
*--------------------------------------------------------------
@@ -375,7 +371,6 @@ CfgContextGetNext(CfgContext *ctx, TSCfgIterState *state)
return NULL; // ERROR
}
-
/*--------------------------------------------------------------
* CfgContextMoveEleUp
*--------------------------------------------------------------
diff --git a/mgmt/api/CfgContextManager.h b/mgmt/api/CfgContextManager.h
index bce6fe8..8578af7 100644
--- a/mgmt/api/CfgContextManager.h
+++ b/mgmt/api/CfgContextManager.h
@@ -39,7 +39,6 @@
#include "CfgContextImpl.h"
#include "CfgContextDefs.h"
-
/***************************************************************************
* CfgContext Operations
***************************************************************************/
@@ -52,7 +51,6 @@ TSMgmtError CfgContextDestroy(CfgContext *ctx);
TSMgmtError CfgContextCommit(CfgContext *ctx, LLQ *errRules = NULL);
TSMgmtError CfgContextGet(CfgContext *ctx);
-
/***************************************************************************
* CfgContext Operations
***************************************************************************/
diff --git a/mgmt/api/CfgContextUtils.cc b/mgmt/api/CfgContextUtils.cc
index c9507bb..f42ed81 100644
--- a/mgmt/api/CfgContextUtils.cc
+++ b/mgmt/api/CfgContextUtils.cc
@@ -118,7 +118,6 @@ Lerror:
return NULL;
}
-
/* ----------------------------------------------------------------------------
* ip_addr_ele_to_string
* ---------------------------------------------------------------------------
@@ -560,7 +559,6 @@ int_list_to_string(TSIntList list, const char *delimiter)
if (list == TS_INVALID_LIST || !delimiter)
return NULL;
-
numElems = queue_len((LLQ *)list);
memset(buf, 0, MAX_BUF_SIZE);
@@ -617,7 +615,6 @@ Lerror:
return TS_INVALID_LIST;
}
-
/* ---------------------------------------------------------------
* string_to_domain_list
* ---------------------------------------------------------------
@@ -655,7 +652,6 @@ string_to_domain_list(const char *str_list, const char *delimiter)
return list;
}
-
/*----------------------------------------------------------------------------
* domain_list_to_string
*----------------------------------------------------------------------------
@@ -959,7 +955,6 @@ pdest_sspec_to_string(TSPrimeDestT pd, char *pd_val, TSSspec *sspec)
return str;
}
-
/*----------------------------------------------------------------------------
* string_to_pdss_format
*----------------------------------------------------------------------------
@@ -1038,7 +1033,6 @@ Lerror:
return TS_ERR_FAIL;
}
-
/*----------------------------------------------------------------------------
* hms_time_to_string
*----------------------------------------------------------------------------
@@ -1186,7 +1180,6 @@ Lerror:
return TS_ERR_FAIL;
}
-
/*----------------------------------------------------------------------------
* string_to_header_type
*----------------------------------------------------------------------------
@@ -1248,7 +1241,6 @@ string_to_scheme_type(const char *scheme)
return TS_SCHEME_UNDEFINED;
}
-
char *
scheme_type_to_string(TSSchemeT scheme)
{
@@ -1487,7 +1479,6 @@ admin_acc_type_to_string(TSAccessT access)
return NULL;
}
-
/***************************************************************************
* Tokens-to-Struct Converstion Functions
***************************************************************************/
@@ -1532,7 +1523,6 @@ tokens_to_pdss_format(TokenList *tokens, Token *first_tok, TSPdSsFormat *pdss)
}
pdss->pd_val = ats_strdup(first_tok->value);
-
// iterate through tokens checking for sec specifiers
// state determines which sec specifier being checked
// the state is only set if there's a sec spec match
@@ -2105,7 +2095,6 @@ get_rule_type(TokenList *token_list, TSFileNameT file)
case TS_FNAME_IP_ALLOW: /* ip_allow.config */
return TS_IP_ALLOW;
-
case TS_FNAME_LOGS_XML: /* logs_xml.config */
printf(" *** CfgContextUtils.cc: NOT DONE YET! **\n");
// TS_LOG_FILTER, /* logs_xml.config */
@@ -2188,7 +2177,6 @@ copy_cfg_ele(TSCfgEle *src_ele, TSCfgEle *dst_ele)
dst_ele->error = src_ele->error;
}
-
void
copy_sspec(TSSspec *src, TSSspec *dst)
{
@@ -2453,7 +2441,6 @@ copy_congestion_ele(TSCongestionEle *ele)
return nele;
}
-
TSHostingEle *
copy_hosting_ele(TSHostingEle *ele)
{
diff --git a/mgmt/api/CfgContextUtils.h b/mgmt/api/CfgContextUtils.h
index 3fb4de0..e8487f4 100644
--- a/mgmt/api/CfgContextUtils.h
+++ b/mgmt/api/CfgContextUtils.h
@@ -131,7 +131,6 @@ char *admin_acc_type_to_string(TSAccessT access);
***************************************************************************/
Token *tokens_to_pdss_format(TokenList *tokens, Token *first_tok, TSPdSsFormat *pdss);
-
/***************************************************************************
* Validation Functions
***************************************************************************/
@@ -153,7 +152,6 @@ CfgEleObj *create_ele_obj_from_rule_node(Rule *rule);
CfgEleObj *create_ele_obj_from_ele(TSCfgEle *ele);
TSRuleTypeT get_rule_type(TokenList *token_list, TSFileNameT file);
-
/***************************************************************************
* Copy Helper Functions
***************************************************************************/
diff --git a/mgmt/api/CoreAPI.cc b/mgmt/api/CoreAPI.cc
index 2d249b8..ed5e3ea 100644
--- a/mgmt/api/CoreAPI.cc
+++ b/mgmt/api/CoreAPI.cc
@@ -270,7 +270,6 @@ threads_for_process(pid_t proc)
}
}
-
done:
if (dir) {
closedir(dir);
diff --git a/mgmt/api/CoreAPI.h b/mgmt/api/CoreAPI.h
index c6ed7e5..e27c212 100644
--- a/mgmt/api/CoreAPI.h
+++ b/mgmt/api/CoreAPI.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef _CORE_API_H
#define _CORE_API_H
diff --git a/mgmt/api/CoreAPIRemote.cc b/mgmt/api/CoreAPIRemote.cc
index 3d79b43..ee1c931 100644
--- a/mgmt/api/CoreAPIRemote.cc
+++ b/mgmt/api/CoreAPIRemote.cc
@@ -485,8 +485,7 @@ mgmt_record_convert_value(TSRecordT rec_type, const MgmtMarshallData &data, TSRe
ink_assert(data.len == strlen((char *)data.ptr) + 1);
value.string_val = ats_strdup((char *)data.ptr);
break;
- default:
- ; // nothing ... shut up compiler!
+ default:; // nothing ... shut up compiler!
}
}
}
diff --git a/mgmt/api/CoreAPIShared.cc b/mgmt/api/CoreAPIShared.cc
index 926d23e..bebf752 100644
--- a/mgmt/api/CoreAPIShared.cc
+++ b/mgmt/api/CoreAPIShared.cc
@@ -178,7 +178,6 @@ error: /* "Houston, we have a problem!" (Apollo 13) */
return TS_ERR_NET_WRITE;
}
-
/* Modified from TrafficCop.cc (open_socket) */
int
connectDirect(const char *host, int port, uint64_t /* timeout ATS_UNUSED */)
@@ -274,7 +273,6 @@ poll_write(int fd, int timeout)
err = poll(&info, 1, timeout);
} while ((err < 0) && ((errno == EINTR) || (errno == EAGAIN)));
-
if ((err > 0) && (info.revents & POLLOUT)) {
return 1;
}
diff --git a/mgmt/api/EventCallback.cc b/mgmt/api/EventCallback.cc
index c86ad3f..9f15a76 100644
--- a/mgmt/api/EventCallback.cc
+++ b/mgmt/api/EventCallback.cc
@@ -35,7 +35,6 @@
#include "EventCallback.h"
#include "CoreAPIShared.h"
-
/**********************************************************************
* create_event_callback
*
@@ -92,7 +91,6 @@ create_callback_table(const char *lock_name)
return cb_table;
}
-
/**********************************************************************
* delete_callback_table
*
@@ -238,7 +236,6 @@ cb_table_register(CallbackTable *cb_table, const char *event_name, TSEventSignal
return TS_ERR_OKAY;
}
-
/**********************************************************************
* cb_table_unregister
*
diff --git a/mgmt/api/GenericParser.cc b/mgmt/api/GenericParser.cc
index 770b2a6..7a00b9d 100644
--- a/mgmt/api/GenericParser.cc
+++ b/mgmt/api/GenericParser.cc
@@ -224,7 +224,6 @@ Rule::parse(const char *const_rule, TSFileNameT filetype)
}
}
-
/**
* arm_securityParse
**/
@@ -266,7 +265,6 @@ Rule::arm_securityParse(char *rule)
return m_tokenList;
}
-
/**
* cacheParse
* CAUTION: This function is used for number of similar formatted
@@ -365,7 +363,6 @@ Rule::cacheParse(char *rule, unsigned short minNumToken, unsigned short maxNumTo
return m_tokenList;
}
-
/**
* congestionParse
**/
@@ -387,7 +384,6 @@ Rule::hostingParse(char *rule)
return cacheParse(rule, 2, 2);
}
-
/**
* icpParse
* - mimic proxy/ICPConfig/icp_config_change_callback
@@ -413,7 +409,6 @@ Rule::icpParse(char *rule, unsigned short minNumToken, unsigned short maxNumToke
return NULL;
}
-
m_tokenList = new TokenList();
for (; tokenStr; tokenStr = ruleTok.iterNext(&ruleTok_state)) {
token = new Token();
@@ -424,7 +419,6 @@ Rule::icpParse(char *rule, unsigned short minNumToken, unsigned short maxNumToke
return m_tokenList;
}
-
/**
* ip_allowParse
**/
@@ -437,7 +431,6 @@ Rule::ip_allowParse(char *rule)
return cacheParse(rule, 2, 2);
}
-
/**
* logsParse
**/
@@ -447,7 +440,6 @@ Rule::logsParse(char * /* rule ATS_UNUSED */)
return NULL;
}
-
/**
* log_hostsParse
**/
@@ -466,7 +458,6 @@ Rule::log_hostsParse(char *rule)
return m_tokenList;
}
-
/**
* logs_xmlParse
**/
@@ -476,7 +467,6 @@ Rule::logs_xmlParse(char * /* rule ATS_UNUSED */)
return NULL;
}
-
/**
* parentParse
**/
@@ -486,7 +476,6 @@ Rule::parentParse(char *rule)
return cacheParse(rule, 2);
}
-
/**
* volumeParse
**/
@@ -496,7 +485,6 @@ Rule::volumeParse(char *rule)
return cacheParse(rule, 3, 3);
}
-
/**
* pluginParse
**/
@@ -519,7 +507,6 @@ Rule::pluginParse(char *rule)
return m_tokenList;
}
-
/**
* remapParse
**/
@@ -561,7 +548,6 @@ Rule::remapParse(char *rule)
return m_tokenList;
}
-
/**
* socksParse
**/
@@ -576,7 +562,6 @@ Rule::socksParse(char *rule)
bool insideQuote = false;
const char *newStr;
-
if (numRuleTok < 2) {
setErrorHint("Expecting at least 2 space delimited tokens");
return NULL;
@@ -675,7 +660,6 @@ Rule::socksParse(char *rule)
return m_tokenList;
}
-
/**
* splitdnsParse
**/
@@ -761,7 +745,6 @@ Rule::splitdnsParse(char *rule)
// return cacheParse(rule, 2);
}
-
/**
* updateParse
**/
@@ -793,7 +776,6 @@ Rule::updateParse(char *rule)
return m_tokenList;
}
-
/**
* vaddrsParse
**/
@@ -819,7 +801,6 @@ Rule::vaddrsParse(char *rule)
return m_tokenList;
}
-
/**
* storageParse
* ------------
@@ -854,7 +835,6 @@ Rule::storageParse(char *rule)
return m_tokenList;
}
-
/*
* bool Rule::inQuote(char *str)
* Counts the number of quote found in "str"
@@ -873,7 +853,6 @@ Rule::inQuote(const char *str)
return (numQuote & 1);
}
-
/***************************************************************************
* RuleList
* a rule list is a list of rule; which compose to a configuration file.
@@ -1011,7 +990,6 @@ RuleList::parse(char *fileBuf, TSFileNameT filetype)
// this->Print();
}
-
/***************************************************************************
* General Routines
***************************************************************************/
diff --git a/mgmt/api/GenericParser.h b/mgmt/api/GenericParser.h
index 935069a..75e9c92 100644
--- a/mgmt/api/GenericParser.h
+++ b/mgmt/api/GenericParser.h
@@ -151,7 +151,6 @@ private:
Queue<Token> m_nameList;
};
-
/***************************************************************************
* Rule
* a rule is nothing more than just a token list. This object also
diff --git a/mgmt/api/NetworkMessage.cc b/mgmt/api/NetworkMessage.cc
index c4b96ca..2ef23df 100644
--- a/mgmt/api/NetworkMessage.cc
+++ b/mgmt/api/NetworkMessage.cc
@@ -311,7 +311,7 @@ send_mgmt_response(int fd, OpType optype, ...)
template <unsigned N>
static TSMgmtError
-recv_x(const struct NetCmdOperation(&ops)[N], void *buf, size_t buflen, OpType optype, va_list ap)
+recv_x(const struct NetCmdOperation (&ops)[N], void *buf, size_t buflen, OpType optype, va_list ap)
{
ssize_t msglen;
const NetCmdOperation *cmd;
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index 0fe51e0..fbadc9c 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -323,7 +323,6 @@ typedef enum {
TS_FNAME_UNDEFINED
} TSFileNameT;
-
/* Each rule type within a file has its own enumeration.
* Need this enumeration because it's possible there are different Ele's used
* for rule types within the same file
@@ -391,7 +390,7 @@ typedef struct {
/*--- records -------------------------------------------------------------*/
-typedef union {/* record value */
+typedef union { /* record value */
TSInt int_val;
TSCounter counter_val;
TSFloat float_val;
@@ -455,7 +454,6 @@ typedef struct {
/*unsigned long timestamp; */ /* only applies to active events */
} TSActiveEvent;
-
/*--- abstract file operations --------------------------------------------*/
typedef struct {
@@ -507,7 +505,6 @@ typedef struct {
TSSspec sec_spec; /* secondary specifier */
} TSPdSsFormat; /* PdSs = Primary Destination Secondary Specifier */
-
/* Generic Ele struct which is used as first member in all other Ele structs.
* The TSCfgContext operations deal with TSCfgEle* type, so must typecast
* all Ele's to an TSCfgEle*
@@ -894,7 +891,6 @@ tsapi TSMgmtError TSDisconnectCbRegister(TSDisconnectFunc *func, void *data);
tsapi TSMgmtError TSDisconnectRetrySet(int retries, int retry_sleep_msec);
tsapi TSMgmtError TSDisconnect();
-
/*--- control operations --------------------------------------------------*/
/* TSProxyStateGet: get the proxy state (on/off)
* Input: <none>
@@ -1053,7 +1049,6 @@ tsapi TSMgmtError TSSnapshotRemove(char *snapshot_name);
*/
tsapi TSMgmtError TSSnapshotGetMlt(TSStringList snapshots);
-
/*--- statistics operations -----------------------------------------------*/
/* TSStatsReset: sets all the statistics variables to their default values
* Input: cluster - Reset the stats clusterwide or not
@@ -1061,7 +1056,6 @@ tsapi TSMgmtError TSSnapshotGetMlt(TSStringList snapshots);
*/
tsapi TSMgmtError TSStatsReset(bool cluster, const char *name);
-
/*--- variable operations -------------------------------------------------*/
/* TSRecordGet: gets a record
* Input: rec_name - the name of the record (proxy.config.record_name)
@@ -1142,7 +1136,6 @@ tsapi TSMgmtError TSRecordSetMlt(TSList rec_list, TSActionNeedT *action_need);
*/
/*tsapi TSMgmtError TSEventSignal (char *event_name, ...); */
-
/* TSEventResolve: enables the user to resolve an event
* Input: event_name - event to resolve
* Output: TSMgmtError
@@ -1185,7 +1178,6 @@ tsapi TSMgmtError TSEventSignalCbRegister(char *event_name, TSEventSignalFunc fu
*/
tsapi TSMgmtError TSEventSignalCbUnregister(char *event_name, TSEventSignalFunc func);
-
/*--- abstracted file operations ------------------------------------------*/
/* TSCfgContextCreate: allocates memory for an empty TSCfgContext for the specified file
* Input: file - the file
@@ -1212,7 +1204,6 @@ tsapi TSMgmtError TSCfgContextDestroy(TSCfgContext ctx);
*/
tsapi TSMgmtError TSCfgContextCommit(TSCfgContext ctx, TSActionNeedT *action_need, TSIntList errRules);
-
/* TSCfgContextGet: retrieves all the Ele's for the file specified in the ctx and
* puts them into ctx; note that the ele's in the TSCfgContext don't
* all have to be of the same ele type
@@ -1222,7 +1213,6 @@ tsapi TSMgmtError TSCfgContextCommit(TSCfgContext ctx, TSActionNeedT *action_nee
*/
tsapi TSMgmtError TSCfgContextGet(TSCfgContext ctx);
-
/*--- TSCfgContext Operations --------------------------------------------*/
/*
* These operations are used to manipulate the opaque TSCfgContext type,
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index 0c8d2ca..0a28264 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -324,7 +324,6 @@ drainIncomingChannel(void *arg)
return NULL;
} /* End drainIncomingChannel */
-
/*
* cluster_com_port_watcher(...)
* This function watches updates and changes that are made to the
@@ -345,7 +344,6 @@ cluster_com_port_watcher(const char *name, RecDataT /* data_type ATS_UNUSED */,
return 0;
} /* End cluster_com_port_watcher */
-
ClusterCom::ClusterCom(unsigned long oip, char *host, int mcport, char *group, int rsport, char *p)
: our_wall_clock(0), alive_peers_count(0), reliable_server_fd(0), broadcast_fd(0), receive_fd(0)
{
@@ -469,7 +467,6 @@ ClusterCom::ClusterCom(unsigned long oip, char *host, int mcport, char *group, i
return;
} /* End ClusterCom::ClusterCom */
-
/*
* checkPeers(...)
* Function checks on our peers by racing through the peer list(ht) and
@@ -587,7 +584,6 @@ ClusterCom::checkPeers(time_t *ticker)
}
}
-
if (num_peers == number_of_nodes) {
/*
* If the number of peers in the hash_table is the same as the
@@ -660,7 +656,6 @@ ClusterCom::checkPeers(time_t *ticker)
return;
} /* End ClusterCom::checkPeers */
-
void
ClusterCom::generateClusterDelta(void)
{
@@ -693,7 +688,6 @@ ClusterCom::generateClusterDelta(void)
} /* End ClusterCom::generateClusterDelta */
-
/*
* handleMultCastMessage(...)
* Function is called to handle(parse) messages received from the broadcast
@@ -901,7 +895,6 @@ Lbogus:
}
} /* End ClusterCom::handleMultiCastMessage */
-
/*
* handleMultiCastStatPacket(...)
* Function groks the stat packets received on the mc channel and updates
@@ -1232,7 +1225,6 @@ ClusterCom::handleMultiCastFilePacket(char *last, char *ip)
return;
} /* End ClusterCom::handleMultiCastFilePacket */
-
/*
* handleMultiCastAlarmPacket(...)
* Function receives incoming alarm messages and updates the alarms class.
@@ -1269,7 +1261,6 @@ ClusterCom::handleMultiCastAlarmPacket(char *last, char *ip)
return;
} /* End ClusterCom::handleMultiCastAlarmPacket */
-
/*
* handleMultiCastVMapPacket(...)
* Handles incoming reports from peers about which virtual interfaces
@@ -1311,7 +1302,6 @@ ClusterCom::handleMultiCastVMapPacket(char *last, char *ip)
return;
} /* End ClusterCom::handleMultiCastVMapPacket */
-
/*
* sendSharedData
* Function serves as aggregator of NODE data to be shared with the
@@ -1382,7 +1372,6 @@ ClusterCom::sendSharedData(bool send_proxy_heart_beat)
return true;
} /* End ClusterCom::sendSharedData */
-
/*
* constructSharedGenericPacket(...)
* A generic packet builder that can construct config or stat
@@ -1417,7 +1406,6 @@ ClusterCom::constructSharedGenericPacket(char *message, int max, RecT packet_typ
running_sum += strlen(tmp);
ink_release_assert(running_sum < max);
-
if (sys_release[0]) {
snprintf(tmp, sizeof(tmp), "rel: %s\n", sys_release);
} else {
@@ -1493,7 +1481,6 @@ ClusterCom::constructSharedGenericPacket(char *message, int max, RecT packet_typ
return;
} /* End ClusterCom::constructSharedGenericPacket */
-
void
ClusterCom::constructSharedStatPacket(char *message, int max)
{
@@ -1501,7 +1488,6 @@ ClusterCom::constructSharedStatPacket(char *message, int max)
return;
} /* End ClusterCom::constructSharedStatPacket */
-
/* static int constructSharedPacketHeader(...)
* Each multicast packet needs to have the following
* header info. Ip, Cluster Name, TS Version. This function
@@ -1522,7 +1508,6 @@ ClusterCom::constructSharedPacketHeader(const AppVersionInfo &version, char *mes
return running_sum;
} /* End ClusterCom::constructSharedPacketHeader */
-
/*
* constructSharedFilePacket(...)
* Foreach of the config files we are holding build a packet that
@@ -1592,7 +1577,6 @@ ClusterCom::constructSharedFilePacket(char *message, int max)
return;
} /* End ClusterCom::constructSharedFilePacket */
-
/*
* estabilishChannels(...)
* Sets up the multi-cast and reliable tcp channels for cluster
@@ -1641,7 +1625,6 @@ ClusterCom::establishChannels()
return;
}
-
/*
* establishBroadcastChannel()
* Setup our multicast channel for broadcasting.
@@ -1682,7 +1665,6 @@ ClusterCom::establishBroadcastChannel(void)
return;
} /* End ClusterCom::establishBroadcastChannel */
-
/*
* establishReceiveChannel()
* Setup our multicast channel for receiving incoming broadcasts
@@ -1753,7 +1735,6 @@ ClusterCom::establishReceiveChannel(int fatal_on_error)
return 0;
} /* End ClusterCom::establishReceiveChannel */
-
/*
* sendOutgoingMessage
* Function basically writes a message to the broadcast_fd, it is blocking,
@@ -1770,7 +1751,6 @@ ClusterCom::sendOutgoingMessage(char *buf, int len)
return true;
} /* End ClusterCom::sendOutgoingMessage */
-
bool
ClusterCom::sendClusterMessage(int msg_type, const char *args)
{
@@ -1838,7 +1818,6 @@ ClusterCom::sendClusterMessage(int msg_type, const char *args)
return ret;
} /* End ClusterCom::sendClusterMessage */
-
bool
ClusterCom::sendReliableMessage(unsigned long addr, char *buf, int len)
{
@@ -1875,7 +1854,6 @@ ClusterCom::rl_sendReliableMessage(unsigned long addr, const char *buf, int len)
serv_addr.sin_addr.s_addr = addr;
serv_addr.sin_port = htons(cport);
-
if ((fd = mgmt_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
mgmt_elog(errno, "[ClusterCom::rl_sendReliableMessage] Unable to create socket\n");
return false;
@@ -1901,7 +1879,6 @@ ClusterCom::rl_sendReliableMessage(unsigned long addr, const char *buf, int len)
return true;
} /* End ClusterCom::rl_sendReliableMessage */
-
/*
* sendReliableMessage(...)
* Used to send a string across the reliable fd.
@@ -1985,7 +1962,6 @@ ClusterCom::sendReliableMessage(unsigned long addr, char *buf, int len, char *re
return true;
} /* End ClusterCom::sendReliableMessage */
-
/*
* sendReliableMessage(...)
* Used to send a string across the reliable fd.
@@ -2063,7 +2039,6 @@ ClusterCom::sendReliableMessageReadTillClose(unsigned long addr, char *buf, int
return true;
} /* End ClusterCom::sendReliableMessageReadTillClose */
-
/*
* receiveIncomingMessage
* This function reads from the incoming channel. It is blocking,
@@ -2080,7 +2055,6 @@ ClusterCom::receiveIncomingMessage(char *buf, int max)
return nbytes;
} /* End ClusterCom::processIncomingMessages */
-
/*
* isMaster()
* Function checks known hosts and decides whether this local manager is
@@ -2114,7 +2088,6 @@ ClusterCom::isMaster()
return false;
} /* End ClusterCom::isMaster */
-
/*
* lowestPeer()
* Function finds the peer with the lowest number of current virtual
@@ -2150,7 +2123,6 @@ ClusterCom::lowestPeer(int *no)
return min_ip;
} /* End ClusterCom::lowestPeer */
-
void
ClusterCom::logClusterMismatch(const char *ip, ClusterMismatch type, char *data)
{
@@ -2189,7 +2161,6 @@ ClusterCom::logClusterMismatch(const char *ip, ClusterMismatch type, char *data)
ink_hash_table_insert(mismatchLog, ip, (void *)type);
}
-
/*
* highestPeer()
* Function finds the peer with the highest number of current virtual
@@ -2226,7 +2197,6 @@ ClusterCom::highestPeer(int *no)
return max_ip;
} /* End ClusterCom::highestPeer */
-
/*
* checkBackDoor(...)
* Function checks for "backdoor" commands on the cluster port.
@@ -2371,7 +2341,6 @@ checkBackDoor(int req_fd, char *message)
(int64_t)tmp->idle_ticks, tmp->last_time_recorded, tmp->delta, (int64_t)tmp->manager_idle_ticks, tmp->manager_alive);
mgmt_writeline(req_fd, reply, strlen(reply));
-
tmp_msg = "---------------------------\n";
mgmt_writeline(req_fd, tmp_msg, strlen(tmp_msg));
}
diff --git a/mgmt/cluster/VMap.cc b/mgmt/cluster/VMap.cc
index 8a2e14f..832ea2e 100644
--- a/mgmt/cluster/VMap.cc
+++ b/mgmt/cluster/VMap.cc
@@ -57,7 +57,6 @@ vmapEnableHandler(const char *tok, RecDataT /* data_type ATS_UNUSED */, RecData
return 0;
} /* End vmapEnableHandler */
-
VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
{
bool found;
@@ -77,7 +76,6 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
num_addrs = 0;
num_nics = 0;
-
this->interface = ats_strdup(interface);
turning_off = false; // we are not turning off VIP
@@ -198,7 +196,6 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
close(tmp_socket);
}
-
RecRegisterConfigUpdateCb("proxy.config.vmap.enabled", vmapEnableHandler, NULL);
down_up_timeout = REC_readInteger("proxy.config.vmap.down_up_timeout", &found);
@@ -212,7 +209,6 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
} /* End VMap::VMap */
-
VMap::~VMap()
{
if (id_map)
@@ -225,7 +221,6 @@ VMap::~VMap()
ats_free(addr_list);
} /* End VMap::~VMap */
-
/*
* lt_runGambit()
* Function basically runs the virtual ip assignment gambit. If you are
@@ -242,7 +237,6 @@ VMap::lt_runGambit()
bool init = false;
struct in_addr virtual_addr, real_addr;
-
if (!enabled) {
return;
}
@@ -282,7 +276,6 @@ VMap::lt_runGambit()
}
}
-
for (i = 0; i < num_addrs; i++) { /* Check for conflicts with your interfaces */
virtual_addr.s_addr = addr_list[i];
ink_strlcpy(vaddr, inet_ntoa(virtual_addr), sizeof(vaddr));
@@ -298,7 +291,6 @@ VMap::lt_runGambit()
return;
} /* End VMap::lt_runGambit */
-
/*
* lt_readAListFile(...)
* Function reads in the virtual ip list, basically a parsing routine for the
@@ -390,7 +382,6 @@ VMap::lt_readAListFile(const char *fname)
return;
} /* End VMap::lt_readAListFile */
-
/*
* rl_resetSeenFlag(...)
* Function resets the "seen" flag for a given peer's mapped addrs.
@@ -413,7 +404,6 @@ VMap::rl_resetSeenFlag(char *ip)
return;
} /* End VMap::rl_resetSeenFlag */
-
/*
* rl_clearUnSeen(...)
* This function is a sweeper function to clean up the map.
@@ -442,7 +432,6 @@ VMap::rl_clearUnSeen(char *ip)
return numAddrs;
} /* End VMap::rl_clearUnSeen */
-
/*
* rl_remote_map(...)
* Function sends the up interface command to a remote node.
@@ -464,7 +453,6 @@ VMap::rl_remote_map(char *virt_ip, char *real_ip)
return true;
} /* End VMap::rl_remote_map */
-
/*
* rl_remote_unmap(...)
* Function sends the up interface command to a remote node.
@@ -485,7 +473,6 @@ VMap::rl_remote_unmap(char *virt_ip, char *real_ip)
return true;
} /* End VMap::rl_remote_unmap */
-
/*
* rl_map(...)
* Function maps a virt_ip to a real_ip, if real_ip is NULL it maps it
@@ -524,7 +511,6 @@ VMap::rl_map(char *virt_ip, char *real_ip)
return true;
} /* End VMap::rl_map */
-
bool
VMap::rl_unmap(char *virt_ip, char *real_ip)
{
@@ -552,7 +538,6 @@ VMap::rl_unmap(char *virt_ip, char *real_ip)
return true;
} /* End VMap::rl_unmap */
-
/*
* rl_checkConflict(...)
* This function checks for virt conflicts between the local node and
@@ -598,7 +583,6 @@ VMap::rl_checkConflict(char *virt_ip)
return NULL;
} /* End VMap::rl_checkConflict */
-
/*
* checkGlobConflict(...)
* This function checks for conflict in the local map as well as the
@@ -696,7 +680,6 @@ VMap::rl_remap(char *virt_ip, char *cur_ip, char *dest_ip, int cur_naddr, int de
return true;
} /* End VMap::rl_remap */
-
/*
* boundAddr(...)
* Function tests whether or not the addr is bound. Returns 0(not bound),
@@ -724,7 +707,6 @@ VMap::rl_boundAddr(char *virt_ip)
return 0;
} /* End VMap::rl_boundAddr */
-
/*
* boundTo(...)
* Function returns ip addr(string form) of the node that the virt address
@@ -759,7 +741,6 @@ VMap::rl_boundTo(char *virt_ip)
return 0;
} /* End VMap::rl_boundTo */
-
/*
* constructVMapMessage(...)
* Constructs the broadcast message of the local nodes virtual ip map.
@@ -844,7 +825,6 @@ VMap::downAddrs()
return;
} /* End VMap::downAddrs */
-
void
VMap::downOurAddrs()
{
diff --git a/mgmt/cluster/VMap.h b/mgmt/cluster/VMap.h
index 6e092ec..2a59d23 100644
--- a/mgmt/cluster/VMap.h
+++ b/mgmt/cluster/VMap.h
@@ -31,19 +31,16 @@
#define MAX_INTERFACE 16
#define MAX_SUB_ID 8
-
typedef struct _vip_info {
char interface[MAX_INTERFACE];
char sub_interface_id[MAX_SUB_ID];
} VIPInfo;
-
typedef struct _realip_info {
struct in_addr real_ip;
bool mappings_for_interface;
} RealIPInfo;
-
/*
* class VMap
* Class implements the protocol and support functions for mapping the
diff --git a/mgmt/utils/MgmtHashTable.h b/mgmt/utils/MgmtHashTable.h
index e538801..dcd9a88 100644
--- a/mgmt/utils/MgmtHashTable.h
+++ b/mgmt/utils/MgmtHashTable.h
@@ -189,5 +189,4 @@ private:
}; /* End class MgmtHashTable */
-
#endif /* _MGMT_HASH_TABLE_H */
diff --git a/plugins/cacheurl/cacheurl.cc b/plugins/cacheurl/cacheurl.cc
index 72eea1b..e65b2dd 100644
--- a/plugins/cacheurl/cacheurl.cc
+++ b/plugins/cacheurl/cacheurl.cc
@@ -58,7 +58,6 @@ struct pr_list {
std::vector<regex_info *> pr;
pr_list() {}
-
~pr_list()
{
for (std::vector<regex_info *>::iterator info = this->pr.begin(); info != this->pr.end(); ++info) {
@@ -406,7 +405,6 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf ATS_UNUSED, i
return (NULL == *ih) ? TS_ERROR : TS_SUCCESS;
}
-
void
TSRemapDeleteInstance(void *ih)
{
diff --git a/plugins/conf_remap/conf_remap.cc b/plugins/conf_remap/conf_remap.cc
index 726d50c..c81b911 100644
--- a/plugins/conf_remap/conf_remap.cc
+++ b/plugins/conf_remap/conf_remap.cc
@@ -32,7 +32,6 @@ static const char PLUGIN_NAME[] = "conf_remap";
// OK, since this plugin is distributed only with the "core" (it's a core piece).
#define MAX_OVERRIDABLE_CONFIGS TS_CONFIG_LAST_ENTRY
-
// Class to hold a set of configurations (one for each remap rule instance)
struct RemapConfigs {
struct Item {
@@ -43,7 +42,6 @@ struct RemapConfigs {
};
RemapConfigs() : _current(0) { memset(_items, 0, sizeof(_items)); };
-
bool parse_file(const char *filename);
bool parse_inline(const char *arg);
@@ -239,7 +237,6 @@ RemapConfigs::parse_file(const char *filename)
return (_current > 0);
}
-
///////////////////////////////////////////////////////////////////////////////
// Initialize the plugin as a remap plugin.
//
@@ -260,7 +257,6 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
return TS_SUCCESS; /* success */
}
-
TSReturnCode
TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSED */, int /* errbuf_size ATS_UNUSED */)
{
@@ -305,7 +301,6 @@ TSRemapDeleteInstance(void *ih)
delete conf;
}
-
///////////////////////////////////////////////////////////////////////////////
// Main entry point when used as a remap plugin.
//
diff --git a/plugins/experimental/ats_pagespeed/ats_base_fetch.cc b/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
index eae2dca..d8e0da0 100644
--- a/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
+++ b/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
@@ -33,7 +33,6 @@
#include "net/instaweb/util/public/string_writer.h"
#include "net/instaweb/util/public/google_message_handler.h"
-
using namespace net_instaweb;
// TODO(oschaaf): rename is_resource_fetch -> write_raw_response_headers
@@ -194,7 +193,6 @@ AtsBaseFetch::HandleDone(bool success)
copy_request_headers_to_psol(reqp, req_hdr_loc, intercept_ctx->request_headers);
TSHandleMLocRelease(reqp, TS_NULL_MLOC, req_hdr_loc);
-
TSContDataSet(interceptCont, intercept_ctx);
// TODO(oschaaf): when we serve an IPRO optimized asset, that will be handled
// by the resource intercept. Which means we should set TXN_INDEX_OWNED_ARG to
@@ -209,7 +207,6 @@ AtsBaseFetch::HandleDone(bool success)
return;
}
-
TSDebug("ats-speed", "Done()!");
CHECK(!done_called_);
CHECK(downstream_vio_);
diff --git a/plugins/experimental/ats_pagespeed/ats_base_fetch.h b/plugins/experimental/ats_pagespeed/ats_base_fetch.h
index 6305944..36feb9c 100644
--- a/plugins/experimental/ats_pagespeed/ats_base_fetch.h
+++ b/plugins/experimental/ats_pagespeed/ats_base_fetch.h
@@ -34,7 +34,6 @@
#include "net/instaweb/http/public/headers.h"
#include "net/instaweb/util/public/string.h"
-
namespace net_instaweb
{
class AtsServerContext;
@@ -108,5 +107,4 @@ private:
} /* ats_pagespeed */
-
#endif /* ATS_BASE_FETCH_H_ */
diff --git a/plugins/experimental/ats_pagespeed/ats_config.cc b/plugins/experimental/ats_pagespeed/ats_config.cc
index 250b455..b2c7b10 100644
--- a/plugins/experimental/ats_pagespeed/ats_config.cc
+++ b/plugins/experimental/ats_pagespeed/ats_config.cc
@@ -36,7 +36,6 @@ namespace net_instaweb
{
using namespace std;
-
void
ltrim_if(string &s, int (*fp)(int))
{
@@ -170,7 +169,6 @@ AtsConfig::Parse(const char *path)
return false;
}
-
while (!f.eof()) {
std::string line;
getline(f, line);
@@ -216,5 +214,4 @@ AtsConfig::Parse(const char *path)
return true;
}
-
} // namespace net_instaweb
diff --git a/plugins/experimental/ats_pagespeed/ats_config.h b/plugins/experimental/ats_pagespeed/ats_config.h
index 60937d8..1d0a1c5 100644
--- a/plugins/experimental/ats_pagespeed/ats_config.h
+++ b/plugins/experimental/ats_pagespeed/ats_config.h
@@ -34,7 +34,6 @@
#include "net/instaweb/util/public/string.h"
#include "net/instaweb/util/public/string_util.h"
-
namespace net_instaweb
{
class AtsRewriteOptions;
@@ -104,7 +103,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(AtsConfig);
}; // class Configuration
-
} // namespace net_instaweb
#endif // ATS_CONFIG_H
diff --git a/plugins/experimental/ats_pagespeed/ats_header_utils.h b/plugins/experimental/ats_pagespeed/ats_header_utils.h
index 53bd415..022ae27 100644
--- a/plugins/experimental/ats_pagespeed/ats_header_utils.h
+++ b/plugins/experimental/ats_pagespeed/ats_header_utils.h
@@ -31,7 +31,6 @@
#include "net/instaweb/util/public/string.h"
#include "net/instaweb/util/public/string_util.h"
-
GoogleString get_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header_name);
void unset_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header_name);
void hide_accept_encoding(TSMBuffer reqp, TSMLoc hdr_loc, const char *hidden_header_name);
diff --git a/plugins/experimental/ats_pagespeed/ats_log_message_handler.cc b/plugins/experimental/ats_pagespeed/ats_log_message_handler.cc
index 5c39c6e..1e4efc8 100644
--- a/plugins/experimental/ats_pagespeed/ats_log_message_handler.cc
+++ b/plugins/experimental/ats_pagespeed/ats_log_message_handler.cc
@@ -76,7 +76,6 @@ LogMessageHandler(int severity, const char *file, int line, size_t message_start
} // namespace
-
namespace net_instaweb
{
namespace log_message_handler
diff --git a/plugins/experimental/ats_pagespeed/ats_log_message_handler.h b/plugins/experimental/ats_pagespeed/ats_log_message_handler.h
index e84cab2..335cb59 100644
--- a/plugins/experimental/ats_pagespeed/ats_log_message_handler.h
+++ b/plugins/experimental/ats_pagespeed/ats_log_message_handler.h
@@ -24,7 +24,6 @@
#ifndef ATS_LOG_MESSAGE_HANDLER_H_
#define ATS_LOG_MESSAGE_HANDLER_H_
-
namespace net_instaweb
{
namespace log_message_handler
diff --git a/plugins/experimental/ats_pagespeed/ats_message_handler.cc b/plugins/experimental/ats_pagespeed/ats_message_handler.cc
index 0141257..ce01359 100644
--- a/plugins/experimental/ats_pagespeed/ats_message_handler.cc
+++ b/plugins/experimental/ats_pagespeed/ats_message_handler.cc
@@ -34,7 +34,6 @@
#include "pagespeed/kernel/base/posix_timer.h"
#include "pagespeed/kernel/base/time_util.h"
-
namespace
{
// This will be prefixed to every logged message.
@@ -49,7 +48,6 @@ AtsMessageHandler::AtsMessageHandler(AbstractMutex *mutex) : mutex_(mutex), buff
SetPidString(static_cast<int64>(getpid()));
}
-
bool
AtsMessageHandler::Dump(Writer *writer)
{
diff --git a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
index 5ef7587..f537d33 100644
--- a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
+++ b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
@@ -35,7 +35,6 @@
#include <vector>
#include <set>
-
#include "ats_pagespeed.h"
#include "ats_config.h"
@@ -82,7 +81,6 @@
#include "net/instaweb/util/stack_buffer.h"
#include "net/instaweb/system/public/system_request_context.h"
-
#include <dirent.h>
#ifndef INT64_MIN
@@ -468,7 +466,6 @@ ats_transform_init(TSCont contp, TransformCtx *ctx)
TSMLoc req_hdr_loc;
ctx->state = transform_state_output;
-
// TODO: check cleanup flow
if (TSHttpTxnTransformRespGet(ctx->txn, &bufp, &hdr_loc) != TS_SUCCESS) {
TSError("[ats_pagespeed] TSHttpTxnTransformRespGet failed");
@@ -536,7 +533,6 @@ ats_transform_init(TSCont contp, TransformCtx *ctx)
true);
*/
-
// TODO(oschaaf): use the determined option/query params
// Take ownership of custom_options.
scoped_ptr<RewriteOptions> custom_options(options);
@@ -639,7 +635,6 @@ ats_transform_one(TransformCtx *ctx, TSIOBufferReader upstream_reader, int amoun
// We could also have a look at directly writing to the traffic server buffers
}
-
static void
ats_transform_finish(TransformCtx *ctx)
{
@@ -717,7 +712,6 @@ ats_transform_do(TSCont contp)
}
}
-
static int
ats_pagespeed_transform(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
{
@@ -799,7 +793,6 @@ handle_read_request_header(TSHttpTxn txnp)
ctx->url_string = new GoogleString(url, url_length);
ctx->gurl = new GoogleUrl(*(ctx->url_string));
-
if (!ctx->gurl->IsWebValid()) {
TSDebug("ats-speed", "URL != WebValid(): %s", ctx->url_string->c_str());
} else {
@@ -838,7 +831,6 @@ handle_read_request_header(TSHttpTxn txnp)
ctx->base_fetch = new AtsBaseFetch(server_context, rptr, ctx->downstream_vio, ctx->downstream_buffer, false);
-
RequestHeaders *request_headers = new RequestHeaders();
ctx->base_fetch->SetRequestHeadersTakingOwnership(request_headers);
copy_request_headers_to_psol(reqp, hdr_loc, request_headers);
@@ -858,7 +850,6 @@ handle_read_request_header(TSHttpTxn txnp)
options = server_context->global_options()->Clone();
}
-
// GoogleString pagespeed_query_params;
// GoogleString pagespeed_option_cookies;
// bool ok = ps_determine_options(server_context,
@@ -958,8 +949,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
if (ctx != NULL) {
bool is_owned = TSHttpTxnArgGet(txn, TXN_INDEX_OWNED_ARG) == &TXN_INDEX_OWNED_ARG_SET
// TODO(oschaaf): rewrite this.
- &&
- !ctx->serve_in_place;
+ && !ctx->serve_in_place;
if (is_owned) {
ats_ctx_destroy(ctx);
}
@@ -1024,7 +1014,6 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
override_expiry = get_override_expiry(host);
}
-
if (ctx->mps_user_agent && override_expiry) {
if (TSHttpTxnServerRespGet(txn, &response_header_buf, &response_header_loc) == TS_SUCCESS) {
// TODO => set cacheable.
@@ -1262,7 +1251,6 @@ config_notification_callback(void *data)
return NULL;
}
-
void
TSPluginInit(int argc, const char *argv[])
{
diff --git a/plugins/experimental/ats_pagespeed/ats_process_context.h b/plugins/experimental/ats_pagespeed/ats_process_context.h
index 1b8c309..f3fe9c3 100644
--- a/plugins/experimental/ats_pagespeed/ats_process_context.h
+++ b/plugins/experimental/ats_pagespeed/ats_process_context.h
@@ -70,7 +70,6 @@ private:
AtsServerContext *server_context_;
};
-
} // namespace net_instaweb
#endif // ATS_PROCESS_CONTEXT_H_
diff --git a/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc b/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
index 22df176..a27d15a 100644
--- a/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
+++ b/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
@@ -27,7 +27,6 @@
#include "ats_resource_intercept.h"
-
#include "ats_base_fetch.h"
#include "ats_rewrite_driver_factory.h"
#include "ats_rewrite_options.h"
@@ -42,7 +41,6 @@
#include "net/instaweb/util/public/string_writer.h"
-
using namespace net_instaweb;
static void
@@ -138,7 +136,6 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
options = server_context->global_options()->Clone();
}
-
/* GoogleString pagespeed_query_params;
GoogleString pagespeed_option_cookies;
bool ok = ps_determine_options(server_context,
@@ -159,7 +156,6 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
*/
scoped_ptr<RewriteOptions> custom_options(options);
-
// TODO(oschaaf): directory options should be coming from configuration!
// TODO(oschaaf): do we need to sync the url?
system_request_context->set_options(options->ComputeHttpOptions());
@@ -299,7 +295,6 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
copy_request_headers_to_psol(reqp, req_hdr_loc, intercept_ctx->request_headers);
TSHandleMLocRelease(reqp, TS_NULL_MLOC, req_hdr_loc);
-
TSContDataSet(interceptCont, intercept_ctx);
TSHttpTxnServerIntercept(interceptCont, txn);
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
diff --git a/plugins/experimental/ats_pagespeed/ats_resource_intercept.h b/plugins/experimental/ats_pagespeed/ats_resource_intercept.h
index fb1acb1..bffda6e 100644
--- a/plugins/experimental/ats_pagespeed/ats_resource_intercept.h
+++ b/plugins/experimental/ats_pagespeed/ats_resource_intercept.h
@@ -28,7 +28,6 @@
#include <ts/ts.h>
-
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/headers.h"
#include "net/instaweb/util/public/string_util.h"
diff --git a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
index ea1b737..3fd3bc3 100644
--- a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
+++ b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
@@ -56,7 +56,6 @@
#include "net/instaweb/util/public/string_util.h"
#include "net/instaweb/util/public/thread_system.h"
-
namespace net_instaweb
{
AtsRewriteDriverFactory::AtsRewriteDriverFactory(const ProcessContext &process_context, AtsThreadSystem *thread_system,
@@ -175,7 +174,6 @@ AtsRewriteDriverFactory::InitStats(Statistics *statistics)
AtsServerContext::InitStats(statistics);
}
-
AtsServerContext *
AtsRewriteDriverFactory::MakeAtsServerContext()
{
diff --git a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h
index 6f4e186..d6f1a66 100644
--- a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h
+++ b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h
@@ -30,7 +30,6 @@
#include "net/instaweb/util/public/md5_hasher.h"
#include "net/instaweb/util/public/scoped_ptr.h"
-
namespace net_instaweb
{
class AbstractSharedMem;
diff --git a/plugins/experimental/ats_pagespeed/ats_rewrite_options.cc b/plugins/experimental/ats_pagespeed/ats_rewrite_options.cc
index ffb5159..ca02dcc 100644
--- a/plugins/experimental/ats_pagespeed/ats_rewrite_options.cc
+++ b/plugins/experimental/ats_pagespeed/ats_rewrite_options.cc
@@ -100,7 +100,6 @@ AtsRewriteOptions::ParseAndSetOptions0(StringPiece directive, GoogleString *msg,
return RewriteOptions::kOptionOk;
}
-
RewriteOptions::OptionSettingResult
AtsRewriteOptions::ParseAndSetOptionFromName1(StringPiece name, StringPiece arg, GoogleString *msg, MessageHandler *handler)
{
@@ -264,5 +263,4 @@ AtsRewriteOptions::Clone() const
return options;
}
-
} // namespace net_instaweb
diff --git a/plugins/experimental/ats_pagespeed/ats_rewrite_options.h b/plugins/experimental/ats_pagespeed/ats_rewrite_options.h
index 1e1e08b..502442c 100644
--- a/plugins/experimental/ats_pagespeed/ats_rewrite_options.h
+++ b/plugins/experimental/ats_pagespeed/ats_rewrite_options.h
@@ -32,10 +32,8 @@
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/system/public/system_rewrite_options.h"
-
//#include "ats_configuration.h"
-
namespace net_instaweb
{
class ThreadSystem;
@@ -61,7 +59,6 @@ struct global_settings {
int shm_cache_size_kb;
};
-
class AtsRewriteOptions : public SystemRewriteOptions
{
public:
@@ -71,7 +68,6 @@ public:
AtsRewriteOptions(ThreadSystem *thread_system);
virtual ~AtsRewriteOptions() {}
-
const char *ParseAndSetOptions(std::vector<std::string> args, MessageHandler *handler, global_settings &global_config);
virtual AtsRewriteOptions *Clone() const;
@@ -80,7 +76,6 @@ public:
virtual OptionSettingResult ParseAndSetOptionFromName1(StringPiece name, StringPiece arg, GoogleString *msg,
MessageHandler *handler);
-
private:
bool SetBoolFlag(bool *v, StringPiece arg);
static Properties *ats_properties_;
diff --git a/plugins/experimental/ats_pagespeed/ats_server_context.cc b/plugins/experimental/ats_pagespeed/ats_server_context.cc
index bcfd7a3..d13d393 100644
--- a/plugins/experimental/ats_pagespeed/ats_server_context.cc
+++ b/plugins/experimental/ats_pagespeed/ats_server_context.cc
@@ -27,7 +27,6 @@
#include "net/instaweb/system/public/system_caches.h"
-
using namespace net_instaweb;
AtsRewriteOptions *
diff --git a/plugins/experimental/ats_pagespeed/ats_thread_system.h b/plugins/experimental/ats_pagespeed/ats_thread_system.h
index afbe6ff..eeb5164 100644
--- a/plugins/experimental/ats_pagespeed/ats_thread_system.h
+++ b/plugins/experimental/ats_pagespeed/ats_thread_system.h
@@ -49,5 +49,4 @@ public:
} // net_instaweb
-
#endif // ATS_THREAD_SYSTEM_H_
diff --git a/plugins/experimental/ats_pagespeed/gzip/configuration.cc b/plugins/experimental/ats_pagespeed/gzip/configuration.cc
index c10874f..afdd70a 100644
--- a/plugins/experimental/ats_pagespeed/gzip/configuration.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/configuration.cc
@@ -190,7 +190,6 @@ Configuration::Parse(const char *path)
current_host_configuration->add_compressible_content_type("*javascript*");
current_host_configuration->add_compressible_content_type("image/svg+xml");
-
if (pathstring.empty()) {
return c;
}
diff --git a/plugins/experimental/ats_pagespeed/gzip/configuration.h b/plugins/experimental/ats_pagespeed/gzip/configuration.h
index dbc5d80..cf2d04b 100644
--- a/plugins/experimental/ats_pagespeed/gzip/configuration.h
+++ b/plugins/experimental/ats_pagespeed/gzip/configuration.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef GZIP_CONFIGURATION_H_
#define GZIP_CONFIGURATION_H_
@@ -35,7 +34,6 @@ class HostConfiguration
{
public: // todo -> only configuration should be able to construct hostconfig
explicit HostConfiguration(const std::string &host) : host_(host), enabled_(true), cache_(true), remove_accept_encoding_(false) {}
-
inline bool
enabled()
{
diff --git a/plugins/experimental/ats_pagespeed/gzip/gzip.cc b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
index 64b8726..4fd9edc 100644
--- a/plugins/experimental/ats_pagespeed/gzip/gzip.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
@@ -53,7 +53,6 @@ int arg_idx_hooked;
int arg_idx_host_configuration;
int arg_idx_url_disallowed;
-
const char *global_hidden_header_name;
Configuration *config = NULL;
const char *dictionary = NULL;
@@ -100,7 +99,6 @@ gzip_data_alloc(int compression_type)
return data;
}
-
static void
gzip_data_destroy(GzipData *data)
{
@@ -248,7 +246,6 @@ gzip_transform_init(TSCont contp, GzipData *data)
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
}
-
static void
gzip_transform_one(GzipData *data, TSIOBufferReader upstream_reader, int amount)
{
@@ -350,7 +347,6 @@ gzip_transform_finish(GzipData *data)
}
}
-
static void
gzip_transform_do(TSCont contp)
{
@@ -413,7 +409,6 @@ gzip_transform_do(TSCont contp)
}
}
-
static int
gzip_transform(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
{
@@ -447,7 +442,6 @@ gzip_transform(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
return 0;
}
-
static int
gzip_transformable(TSHttpTxn txnp, int server, HostConfiguration *host_configuration, int *compress_type)
{
@@ -562,7 +556,6 @@ gzip_transformable(TSHttpTxn txnp, int server, HostConfiguration *host_configura
return rv;
}
-
static void
gzip_transform_add(TSHttpTxn txnp, int /* server ATS_UNUSED */, HostConfiguration *hc, int compress_type)
{
@@ -650,7 +643,6 @@ find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc
return config->GlobalConfiguration();
}
-
static int
transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
@@ -736,7 +728,6 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
return 0;
}
-
static void
read_configuration(TSCont contp)
{
@@ -762,7 +753,6 @@ management_update(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
return 0;
}
-
void
TSPluginInit(int argc, const char *argv[])
{
diff --git a/plugins/experimental/ats_pagespeed/gzip/misc.h b/plugins/experimental/ats_pagespeed/gzip/misc.h
index f3d49d4..a57ff98 100644
--- a/plugins/experimental/ats_pagespeed/gzip/misc.h
+++ b/plugins/experimental/ats_pagespeed/gzip/misc.h
@@ -61,7 +61,6 @@ typedef struct {
int compression_type;
} GzipData;
-
voidpf gzip_alloc(voidpf opaque, uInt items, uInt size);
void gzip_free(voidpf opaque, voidpf address);
void normalize_accept_encoding(TSHttpTxn txnp, TSMBuffer reqp, TSMLoc hdr_loc);
diff --git a/plugins/experimental/authproxy/authproxy.cc b/plugins/experimental/authproxy/authproxy.cc
index 0eb6f39..ca40600 100644
--- a/plugins/experimental/authproxy/authproxy.cc
+++ b/plugins/experimental/authproxy/authproxy.cc
@@ -62,7 +62,6 @@ struct AuthOptions {
bool force;
AuthOptions() : hostport(-1), transform(NULL), force(false) {}
-
~AuthOptions() {}
};
diff --git a/plugins/experimental/authproxy/utils.h b/plugins/experimental/authproxy/utils.h
index 0e82f12..5892bd8 100644
--- a/plugins/experimental/authproxy/utils.h
+++ b/plugins/experimental/authproxy/utils.h
@@ -76,7 +76,6 @@ private:
struct HttpHeader {
HttpHeader() : buffer(TSMBufferCreate()), header(TSHttpHdrCreate(buffer)) {}
-
~HttpHeader()
{
TSHttpHdrDestroy(this->buffer, this->header);
diff --git a/plugins/experimental/background_fetch/background_fetch.cc b/plugins/experimental/background_fetch/background_fetch.cc
index 6b6d9e3..6e60b4e 100644
--- a/plugins/experimental/background_fetch/background_fetch.cc
+++ b/plugins/experimental/background_fetch/background_fetch.cc
@@ -36,11 +36,9 @@
#include "rules.h"
#include "configs.h"
-
// Global config, if we don't have a remap specific config.
static BgFetchConfig *gConfig;
-
///////////////////////////////////////////////////////////////////////////
// Hold the global ackground fetch state. This is currently shared across all
// configurations, as a singleton. ToDo: Would it ever make sense to do this
@@ -58,7 +56,6 @@ public:
}
~BgFetchState() { TSMutexDestroy(_lock); }
-
void
createLog(const char *log_name)
{
@@ -110,7 +107,6 @@ public:
private:
BgFetchState() : _log(NULL), _lock(TSMutexCreate()) {}
-
BgFetchState(BgFetchState const &); // Don't Implement
void operator=(BgFetchState const &); // Don't implement
@@ -119,7 +115,6 @@ private:
TSMutex _lock;
};
-
//////////////////////////////////////////////////////////////////////////////
// Hold and manage some state for the TXN background fetch continuation.
// This is necessary, because the TXN is likely to not be available
@@ -203,7 +198,6 @@ private:
TSCont _cont;
};
-
// This sets up the data and continuation properly, this is done outside
// of the CTor, since this can actually fail. If we fail, the data is
// useless, and should be delete'd.
@@ -328,7 +322,6 @@ BgFetchData::log(TSEvent event) const
}
}
-
//////////////////////////////////////////////////////////////////////////////
// Continuation to perform a background fill of a URL. This is pretty
// expensive (memory allocations etc.), we could eliminate maybe the
@@ -469,7 +462,6 @@ cont_check_cacheable(TSCont contp, TSEvent /* event ATS_UNUSED */, void *edata)
return 0;
}
-
//////////////////////////////////////////////////////////////////////////////
// Main "plugin", which is a global READ_RESPONSE_HDR hook. Before
// initiating a background fetch, this checks:
@@ -530,7 +522,6 @@ cont_handle_response(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
///////////////////////////////////////////////////////////////////////////
// Setup global hooks
void
@@ -577,7 +568,6 @@ TSPluginInit(int argc, const char *argv[])
TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK, cont);
}
-
///////////////////////////////////////////////////////////////////////////
// Setup Remap mode
///////////////////////////////////////////////////////////////////////////////
@@ -602,7 +592,6 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
return TS_SUCCESS;
}
-
///////////////////////////////////////////////////////////////////////////////
// We don't have any specific "instances" here, at least not yet.
//
@@ -633,7 +622,6 @@ TSRemapDeleteInstance(void *ih)
config->release();
}
-
///////////////////////////////////////////////////////////////////////////////
//// This is the main "entry" point for the plugin, called for every request.
////
diff --git a/plugins/experimental/background_fetch/configs.cc b/plugins/experimental/background_fetch/configs.cc
index c8aa7cc..ddac1e2 100644
--- a/plugins/experimental/background_fetch/configs.cc
+++ b/plugins/experimental/background_fetch/configs.cc
@@ -24,7 +24,6 @@
#include "configs.h"
-
// Read a config file, populare the linked list (chain the BgFetchRule's)
bool
BgFetchConfig::readConfig(const char *config_file)
diff --git a/plugins/experimental/background_fetch/configs.h b/plugins/experimental/background_fetch/configs.h
index f334d04..b28fbd4 100644
--- a/plugins/experimental/background_fetch/configs.h
+++ b/plugins/experimental/background_fetch/configs.h
@@ -33,7 +33,6 @@
// Constants
const char PLUGIN_NAME[] = "background_fetch";
-
///////////////////////////////////////////////////////////////////////////
// This holds one complete background fetch rule, which is also ref-counted.
//
@@ -41,7 +40,6 @@ class BgFetchConfig
{
public:
BgFetchConfig(TSCont cont) : _cont(cont), _rules(NULL), _ref_count(0) { TSContDataSet(cont, static_cast<void *>(this)); }
-
void
acquire()
{
diff --git a/plugins/experimental/background_fetch/headers.cc b/plugins/experimental/background_fetch/headers.cc
index 8c33aba..69f1bbe 100644
--- a/plugins/experimental/background_fetch/headers.cc
+++ b/plugins/experimental/background_fetch/headers.cc
@@ -26,7 +26,6 @@
#include "configs.h"
#include "headers.h"
-
///////////////////////////////////////////////////////////////////////////
// Remove a header (fully) from an TSMLoc / TSMBuffer. Return the number
// of fields (header values) we removed.
@@ -48,7 +47,6 @@ remove_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len)
return cnt;
}
-
///////////////////////////////////////////////////////////////////////////
// Set a header to a specific value. This will avoid going to through a
// remove / add sequence in case of an existing header.
@@ -94,7 +92,6 @@ set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len, const ch
return ret;
}
-
///////////////////////////////////////////////////////////////////////////
// Dump a header on stderr, useful together with TSDebug().
void
diff --git a/plugins/experimental/balancer/balancer.h b/plugins/experimental/balancer/balancer.h
index b7bcd24..24849f5 100644
--- a/plugins/experimental/balancer/balancer.h
+++ b/plugins/experimental/balancer/balancer.h
@@ -31,7 +31,7 @@
// Return the length of a string literal.
template <int N>
unsigned
-lengthof(const char(&)[N])
+lengthof(const char (&)[N])
{
return N - 1;
}
diff --git a/plugins/experimental/balancer/hash.cc b/plugins/experimental/balancer/hash.cc
index b24f22c..ff12758 100644
--- a/plugins/experimental/balancer/hash.cc
+++ b/plugins/experimental/balancer/hash.cc
@@ -47,7 +47,6 @@ sockaddrlen(const struct sockaddr *sa)
struct md5_key {
md5_key() {}
-
md5_key(const BalancerTarget &target, unsigned i)
{
MD5_CTX ctx;
@@ -59,7 +58,11 @@ struct md5_key {
MD5_Final(this->key, &ctx);
}
- bool operator<(const md5_key &rhs) const { return memcmp(this->key, rhs.key, sizeof(this->key)) < 0; }
+ bool
+ operator<(const md5_key &rhs) const
+ {
+ return memcmp(this->key, rhs.key, sizeof(this->key)) < 0;
+ }
unsigned char key[MD5_DIGEST_LENGTH];
};
@@ -148,7 +151,6 @@ struct HashBalancer : public BalancerInstance {
};
HashBalancer() { this->hash_parts.push_back(HashTxnUrl); }
-
void
push_target(const BalancerTarget &target)
{
diff --git a/plugins/experimental/balancer/roundrobin.cc b/plugins/experimental/balancer/roundrobin.cc
index aede787..9ad5693 100644
--- a/plugins/experimental/balancer/roundrobin.cc
+++ b/plugins/experimental/balancer/roundrobin.cc
@@ -32,7 +32,6 @@ namespace
{
struct RoundRobinBalancer : public BalancerInstance {
RoundRobinBalancer() : targets(), next(0) {}
-
void
push_target(const BalancerTarget &target)
{
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc b/plugins/experimental/buffer_upload/buffer_upload.cc
index e4f3645..c4c6a3f 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -912,7 +912,6 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
}
}
-
TSDebug(DEBUG_TAG, "calling TSHttpTxnIntercept() ...");
TSHttpTxnIntercept(new_cont, txnp);
@@ -1034,7 +1033,6 @@ load_urls(char *filename)
TSfree(url_buf);
}
-
void
parse_config_line(char *line, const struct config_val_ul *cv)
{
diff --git a/plugins/experimental/cache_promote/cache_promote.cc b/plugins/experimental/cache_promote/cache_promote.cc
index 3cf9028..73a409f 100644
--- a/plugins/experimental/cache_promote/cache_promote.cc
+++ b/plugins/experimental/cache_promote/cache_promote.cc
@@ -37,7 +37,6 @@
static const char *PLUGIN_NAME = "cache_promote";
TSCont gNocacheCont;
-
//////////////////////////////////////////////////////////////////////////////////////////////
// Note that all options for all policies has to go here. Not particularly pretty...
//
@@ -50,7 +49,6 @@ static const struct option longopt[] = {{const_cast<char *>("policy"), required_
// EOF
{NULL, no_argument, NULL, '\0'}};
-
//////////////////////////////////////////////////////////////////////////////////////////////
// Abstract base class for all policies.
//
@@ -110,7 +108,6 @@ private:
float _sample;
};
-
//////////////////////////////////////////////////////////////////////////////////////////////
// This is the simplest of all policies, just give each request a (small)
// percentage chance to be promoted to cache.
@@ -137,7 +134,6 @@ public:
}
};
-
//////////////////////////////////////////////////////////////////////////////////////////////
// The LRU based policy keeps track of <bucket> number of URLs, with a counter for each slot.
// Objects are not promoted unless the counter reaches <hits> before it gets evicted. An
@@ -150,10 +146,9 @@ class LRUHash
public:
LRUHash() { TSDebug(PLUGIN_NAME, "In LRUHash()"); }
-
~LRUHash() { TSDebug(PLUGIN_NAME, "In ~LRUHash()"); }
-
- LRUHash &operator=(const LRUHash &h)
+ LRUHash &
+ operator=(const LRUHash &h)
{
TSDebug(PLUGIN_NAME, "copying an LRUHash object");
memcpy(_hash, h._hash, sizeof(_hash));
@@ -175,9 +170,17 @@ private:
};
struct LRUHashHasher {
- bool operator()(const LRUHash *s1, const LRUHash *s2) const { return 0 == memcmp(s1->_hash, s2->_hash, sizeof(s2->_hash)); }
+ bool
+ operator()(const LRUHash *s1, const LRUHash *s2) const
+ {
+ return 0 == memcmp(s1->_hash, s2->_hash, sizeof(s2->_hash));
+ }
- size_t operator()(const LRUHash *s) const { return *((size_t *)s->_hash) ^ *((size_t *)(s->_hash + 9)); }
+ size_t
+ operator()(const LRUHash *s) const
+ {
+ return *((size_t *)s->_hash) ^ *((size_t *)(s->_hash + 9));
+ }
};
typedef std::pair<LRUHash, unsigned> LRUEntry;
@@ -190,7 +193,6 @@ class LRUPolicy : public PromotionPolicy
{
public:
LRUPolicy() : PromotionPolicy(), _buckets(1000), _hits(10), _lock(TSMutexCreate()) {}
-
~LRUPolicy()
{
TSDebug(PLUGIN_NAME, "deleting LRUPolicy object");
@@ -313,7 +315,6 @@ private:
LRUList _list, _freelist;
};
-
//////////////////////////////////////////////////////////////////////////////////////////////
// This holds the configuration for a remap rule, as well as parses the configurations.
//
@@ -321,9 +322,7 @@ class PromotionConfig
{
public:
PromotionConfig() : _policy(NULL) {}
-
~PromotionConfig() { delete _policy; }
-
PromotionPolicy *
getPolicy() const
{
@@ -379,7 +378,6 @@ private:
PromotionPolicy *_policy;
};
-
//////////////////////////////////////////////////////////////////////////////////////////////
// Little helper continuation, to turn off writing to the cache. ToDo: when we have proper
// APIs to make requests / responses, we can remove this completely.
@@ -447,7 +445,6 @@ cont_handle_policy(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
//////////////////////////////////////////////////////////////////////////////////////////////
// Initialize the plugin as a remap plugin.
//
@@ -471,7 +468,6 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
return TS_SUCCESS; /* success */
}
-
TSReturnCode
TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf */, int /* errbuf_size */)
{
@@ -502,7 +498,6 @@ TSRemapDeleteInstance(void *ih)
TSContDestroy(contp);
}
-
//////////////////////////////////////////////////////////////////////////////////////////////
// Schedule the cache-read continuation for this remap rule.
//
diff --git a/plugins/experimental/cachekey/configs.h b/plugins/experimental/cachekey/configs.h
index 3281c78..f1376fe 100644
--- a/plugins/experimental/cachekey/configs.h
+++ b/plugins/experimental/cachekey/configs.h
@@ -37,7 +37,6 @@ class ConfigElements
public:
ConfigElements() : _sort(false), _remove(false), _skip(false) {}
virtual ~ConfigElements() {}
-
void setExclude(const char *arg);
void setInclude(const char *arg);
void setExcludePatterns(const char *arg);
@@ -124,7 +123,6 @@ class Configs
{
public:
Configs() {}
-
/**
* @brief initializes plugin configuration.
* @param argc number of plugin parameters
diff --git a/plugins/experimental/cachekey/pattern.h b/plugins/experimental/cachekey/pattern.h
index 57e7bfc..f1941c1 100644
--- a/plugins/experimental/cachekey/pattern.h
+++ b/plugins/experimental/cachekey/pattern.h
@@ -103,7 +103,6 @@ class NonMatchingMultiPattern : public MultiPattern
{
public:
NonMatchingMultiPattern(const String &name) { _name = name; }
-
/*
* @brief Matches the subject string against all patterns.
* @param subject subject string
@@ -121,7 +120,6 @@ private:
NonMatchingMultiPattern &operator=(const NonMatchingMultiPattern &); // disallow
};
-
/**
* @brief Simple classifier which classifies a subject string using a list of named multi-patterns.
*/
diff --git a/plugins/experimental/channel_stats/channel_stats.cc b/plugins/experimental/channel_stats/channel_stats.cc
index bfc11a6..446e60f 100644
--- a/plugins/experimental/channel_stats/channel_stats.cc
+++ b/plugins/experimental/channel_stats/channel_stats.cc
@@ -58,7 +58,6 @@ static uint64_t global_response_bytes_content = 0; // transferred bytes
// channel stats
struct channel_stat {
channel_stat() : response_bytes_content(0), response_count_2xx(0), response_count_5xx(0), speed_ua_bytes_per_sec_64k(0) {}
-
inline void
increment(uint64_t rbc, uint64_t rc2, uint64_t rc5, uint64_t sbps6)
{
@@ -636,7 +635,11 @@ json_out_stat(TSRecordType /* rec_type ATS_UNUSED */, void *edata, int /* regist
}
template <class T> struct compare : std::binary_function<T, T, bool> {
- inline bool operator()(const T &lhs, const T &rhs) { return lhs.second->response_count_2xx > rhs.second->response_count_2xx; }
+ inline bool
+ operator()(const T &lhs, const T &rhs)
+ {
+ return lhs.second->response_count_2xx > rhs.second->response_count_2xx;
+ }
};
static void
diff --git a/plugins/experimental/collapsed_connection/MurmurHash3.cc b/plugins/experimental/collapsed_connection/MurmurHash3.cc
index 3c31196..252c4b0 100644
--- a/plugins/experimental/collapsed_connection/MurmurHash3.cc
+++ b/plugins/experimental/collapsed_connection/MurmurHash3.cc
@@ -29,7 +29,6 @@ rotl64(uint64_t x, int8_t r)
#define BIG_CONSTANT(x) (x##LLU)
-
//-----------------------------------------------------------------------------
// Block read - if your platform needs to do endian-swapping or can only
// handle aligned reads, do the conversion here
diff --git a/plugins/experimental/custom_redirect/custom_redirect.cc b/plugins/experimental/custom_redirect/custom_redirect.cc
index 33a0d1d..eb87c26 100644
--- a/plugins/experimental/custom_redirect/custom_redirect.cc
+++ b/plugins/experimental/custom_redirect/custom_redirect.cc
@@ -87,7 +87,6 @@ handle_response(TSHttpTxn txnp, TSCont /* contp ATS_UNUSED */)
TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
-
static int
plugin_main_handler(TSCont contp, TSEvent event, void *edata)
{
@@ -99,7 +98,6 @@ plugin_main_handler(TSCont contp, TSEvent event, void *edata)
break;
}
-
default: {
TSDebug("[custom_redirect]", "default event");
break;
diff --git a/plugins/experimental/escalate/escalate.cc b/plugins/experimental/escalate/escalate.cc
index c68c0b5..6bca821 100644
--- a/plugins/experimental/escalate/escalate.cc
+++ b/plugins/experimental/escalate/escalate.cc
@@ -31,12 +31,10 @@
#include <iterator>
#include <map>
-
// Constants and some declarations
const char PLUGIN_NAME[] = "escalate";
static int EscalateResponse(TSCont, TSEvent, void *);
-
//////////////////////////////////////////////////////////////////////////////////////////
// Hold information about the escalation / retry states for a remap rule.
//
@@ -60,13 +58,11 @@ struct EscalationState {
}
~EscalationState() { TSContDestroy(cont); }
-
TSCont cont;
StatusMapType status_map;
bool use_pristine;
};
-
// Little helper function, to update the Host portion of a URL, and stringify the result.
// Returns the URL string, and updates url_len with the length.
char *
@@ -153,14 +149,12 @@ no_action:
return TS_EVENT_NONE;
}
-
TSReturnCode
TSRemapInit(TSRemapInterface * /* api */, char * /* errbuf */, int /* bufsz */)
{
return TS_SUCCESS;
}
-
TSReturnCode
TSRemapNewInstance(int argc, char *argv[], void **instance, char *errbuf, int errbuf_size)
{
@@ -219,14 +213,12 @@ fail:
return TS_ERROR;
}
-
void
TSRemapDeleteInstance(void *instance)
{
delete static_cast<EscalationState *>(instance);
}
-
TSRemapStatus
TSRemapDoRemap(void *instance, TSHttpTxn txn, TSRemapRequestInfo * /* rri */)
{
diff --git a/plugins/experimental/esi/combo_handler.cc b/plugins/experimental/esi/combo_handler.cc
index 433d4fb..a4bad01 100644
--- a/plugins/experimental/esi/combo_handler.cc
+++ b/plugins/experimental/esi/combo_handler.cc
@@ -1045,7 +1045,6 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf, int errbuf_s
return TS_SUCCESS;
}
-
void
TSRemapDeleteInstance(void *ih)
{
diff --git a/plugins/experimental/esi/esi.cc b/plugins/experimental/esi/esi.cc
index cdf729e..54e60bd 100644
--- a/plugins/experimental/esi/esi.cc
+++ b/plugins/experimental/esi/esi.cc
@@ -163,7 +163,6 @@ public:
}
};
-
static const char *
createDebugTag(const char *prefix, TSCont contp, string &dest)
{
@@ -899,7 +898,6 @@ transformHandler(TSCont contp, TSEvent event, void *edata)
is_fetch_event = cont_data->data_fetcher->isFetchEvent(event);
-
if (cont_data->xform_closed) {
TSDebug(cont_debug_tag, "[%s] Transformation closed. Post-processing...", __FUNCTION__);
if (cont_data->curr_state == ContData::PROCESSING_COMPLETE) {
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
index aa141f2..a4b8f0a 100644
--- a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
+++ b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
@@ -144,7 +144,6 @@ private:
bool _checkHeaderValue(TSMBuffer bufp, TSMLoc hdr_loc, const char *name, int name_len, const char *exp_value, int exp_value_len,
bool prefix) const;
-
std::string _headers_str;
inline void _release(RequestData &req_data);
diff --git a/plugins/experimental/esi/lib/DocNode.h b/plugins/experimental/esi/lib/DocNode.h
index 7425746..f217c1f 100644
--- a/plugins/experimental/esi/lib/DocNode.h
+++ b/plugins/experimental/esi/lib/DocNode.h
@@ -68,7 +68,6 @@ private:
friend class DocNode; // to use the method above
};
-
class DocNode
{
public:
diff --git a/plugins/experimental/esi/lib/EsiGunzip.cc b/plugins/experimental/esi/lib/EsiGunzip.cc
index ffcd5e1..53aa3e0 100644
--- a/plugins/experimental/esi/lib/EsiGunzip.cc
+++ b/plugins/experimental/esi/lib/EsiGunzip.cc
@@ -47,7 +47,6 @@ EsiGunzip::stream_finish()
_init = false;
}
-
return _success;
}
@@ -120,7 +119,6 @@ EsiGunzip::stream_decode(const char *data, int data_len, std::string &udata)
return true;
}
-
EsiGunzip::~EsiGunzip()
{
_downstream_length = 0;
diff --git a/plugins/experimental/esi/lib/EsiGunzip.h b/plugins/experimental/esi/lib/EsiGunzip.h
index 6df68f8..c3d5e93 100644
--- a/plugins/experimental/esi/lib/EsiGunzip.h
+++ b/plugins/experimental/esi/lib/EsiGunzip.h
@@ -54,5 +54,4 @@ private:
bool _success;
};
-
#endif // _ESI_GUNZIP_H
diff --git a/plugins/experimental/esi/lib/EsiGzip.h b/plugins/experimental/esi/lib/EsiGzip.h
index c8c6bc4..76caa03 100644
--- a/plugins/experimental/esi/lib/EsiGzip.h
+++ b/plugins/experimental/esi/lib/EsiGzip.h
@@ -53,5 +53,4 @@ private:
uLong _crc;
};
-
#endif // _ESI_GZIP_H
diff --git a/plugins/experimental/esi/lib/EsiParser.cc b/plugins/experimental/esi/lib/EsiParser.cc
index 4a97ce5..5a776b9 100644
--- a/plugins/experimental/esi/lib/EsiParser.cc
+++ b/plugins/experimental/esi/lib/EsiParser.cc
@@ -29,7 +29,6 @@
using std::string;
using namespace EsiLib;
-
const char *EsiParser::ESI_TAG_PREFIX = "<esi:";
const int EsiParser::ESI_TAG_PREFIX_LEN = 5;
@@ -40,8 +39,10 @@ const string EsiParser::HANDLER_ATTR_STR("handler");
const unsigned int EsiParser::MAX_DOC_SIZE = 1024 * 1024;
const EsiParser::EsiNodeInfo EsiParser::ESI_NODES[] = {
- EsiNodeInfo(DocNode::TYPE_INCLUDE, "include", 7, "/>", 2), EsiNodeInfo(DocNode::TYPE_REMOVE, "remove>", 7, "</esi:remove>", 13),
- EsiNodeInfo(DocNode::TYPE_COMMENT, "comment", 7, "/>", 2), EsiNodeInfo(DocNode::TYPE_VARS, "vars>", 5, "</esi:vars>", 11),
+ EsiNodeInfo(DocNode::TYPE_INCLUDE, "include", 7, "/>", 2),
+ EsiNodeInfo(DocNode::TYPE_REMOVE, "remove>", 7, "</esi:remove>", 13),
+ EsiNodeInfo(DocNode::TYPE_COMMENT, "comment", 7, "/>", 2),
+ EsiNodeInfo(DocNode::TYPE_VARS, "vars>", 5, "</esi:vars>", 11),
EsiNodeInfo(DocNode::TYPE_CHOOSE, "choose>", 7, "</esi:choose>", 13),
EsiNodeInfo(DocNode::TYPE_WHEN, "when", 4, "</esi:when>", 11),
EsiNodeInfo(DocNode::TYPE_OTHERWISE, "otherwise>", 10, "</esi:otherwise>", 16),
diff --git a/plugins/experimental/esi/lib/EsiProcessor.cc b/plugins/experimental/esi/lib/EsiProcessor.cc
index ae5b17b..362a729 100644
--- a/plugins/experimental/esi/lib/EsiProcessor.cc
+++ b/plugins/experimental/esi/lib/EsiProcessor.cc
@@ -34,7 +34,6 @@ const char *EsiProcessor::INCLUDE_DATA_ID_ATTR = reinterpret_cast<const char *>(
#define FAILURE_INFO_TAG "plugin_esi_failureInfo"
-
EsiProcessor::EsiProcessor(const char *debug_tag, const char *parser_debug_tag, const char *expression_debug_tag,
ComponentBase::Debug debug_func, ComponentBase::Error error_func, HttpDataFetcher &fetcher,
Variables &variables, const HandlerManager &handler_mgr)
diff --git a/plugins/experimental/esi/lib/EsiProcessor.h b/plugins/experimental/esi/lib/EsiProcessor.h
index b02417d..5f6e890 100644
--- a/plugins/experimental/esi/lib/EsiProcessor.h
+++ b/plugins/experimental/esi/lib/EsiProcessor.h
@@ -186,5 +186,4 @@ private:
}
};
-
#endif // _ESI_PROCESSOR_H
diff --git a/plugins/experimental/esi/lib/Expression.cc b/plugins/experimental/esi/lib/Expression.cc
index 1eb3f57..c9e47de 100644
--- a/plugins/experimental/esi/lib/Expression.cc
+++ b/plugins/experimental/esi/lib/Expression.cc
@@ -160,7 +160,6 @@ Expression::_evalSimpleExpr(const char *expr, int expr_len)
return _convert(lhs, val) ? val : !lhs.empty();
}
-
bool
Expression::evaluate(const char *expr, int expr_len /* = -1 */)
{
diff --git a/plugins/experimental/esi/lib/FailureInfo.h b/plugins/experimental/esi/lib/FailureInfo.h
index e96a4f8..78b3a9b 100644
--- a/plugins/experimental/esi/lib/FailureInfo.h
+++ b/plugins/experimental/esi/lib/FailureInfo.h
@@ -43,7 +43,7 @@
#include "ComponentBase.h"
using namespace std;
-typedef std::vector<std::pair<double, double> > FailureToSuccess;
+typedef std::vector<std::pair<double, double>> FailureToSuccess;
typedef std::map<std::string, class FailureInfo *> FailureData;
static const int WINDOW_SIZE = 200;
@@ -64,7 +64,6 @@ public:
};
~FailureInfo() {}
-
/* Fills the statistics vector depending
* upon the position of the window marker
*/
diff --git a/plugins/experimental/esi/lib/Stats.h b/plugins/experimental/esi/lib/Stats.h
index 032a0fd..5f56821 100644
--- a/plugins/experimental/esi/lib/Stats.h
+++ b/plugins/experimental/esi/lib/Stats.h
@@ -62,5 +62,4 @@ namespace Stats
};
};
-
#endif
diff --git a/plugins/experimental/esi/lib/StringHash.h b/plugins/experimental/esi/lib/StringHash.h
index 889d4b7..71ee9c0 100644
--- a/plugins/experimental/esi/lib/StringHash.h
+++ b/plugins/experimental/esi/lib/StringHash.h
@@ -31,7 +31,11 @@
namespace EsiLib
{
struct StringHasher {
- inline size_t operator()(const std::string &str) const { return __gnu_cxx::hash<const char *>()(str.c_str()); };
+ inline size_t
+ operator()(const std::string &str) const
+ {
+ return __gnu_cxx::hash<const char *>()(str.c_str());
+ };
};
typedef __gnu_cxx::hash_map<std::string, std::string, StringHasher> StringHash;
diff --git a/plugins/experimental/esi/lib/Variables.h b/plugins/experimental/esi/lib/Variables.h
index d5407f8..8f321c7 100644
--- a/plugins/experimental/esi/lib/Variables.h
+++ b/plugins/experimental/esi/lib/Variables.h
@@ -90,7 +90,6 @@ public:
void clear();
virtual ~Variables() { _releaseCookieJar(); };
-
private:
Variables(const Variables &); // non-copyable
Variables &operator=(const Variables &); // non-copyable
diff --git a/plugins/experimental/esi/lib/gzip.h b/plugins/experimental/esi/lib/gzip.h
index e43fad0..05e17b9 100644
--- a/plugins/experimental/esi/lib/gzip.h
+++ b/plugins/experimental/esi/lib/gzip.h
@@ -41,7 +41,6 @@ static const char OS_TYPE = 3; // Unix
static const int BUF_SIZE = 1 << 15; // 32k buffer
-
namespace EsiLib
{
struct ByteBlock {
diff --git a/plugins/experimental/esi/test/TestHttpDataFetcher.h b/plugins/experimental/esi/test/TestHttpDataFetcher.h
index c2a6e7e..2663fc6 100644
--- a/plugins/experimental/esi/test/TestHttpDataFetcher.h
+++ b/plugins/experimental/esi/test/TestHttpDataFetcher.h
@@ -32,7 +32,6 @@ class TestHttpDataFetcher : public HttpDataFetcher
{
public:
TestHttpDataFetcher() : _n_pending_requests(0), _return_data(true) {}
-
bool
addFetchRequest(const std::string &url, FetchedDataProcessor *callback_obj = 0)
{
diff --git a/plugins/experimental/esi/test/parser_test.cc b/plugins/experimental/esi/test/parser_test.cc
index 49301f6..a3bfd33 100644
--- a/plugins/experimental/esi/test/parser_test.cc
+++ b/plugins/experimental/esi/test/parser_test.cc
@@ -885,11 +885,17 @@ main()
{
cout << endl << "==================== Test 38: html comment tag - partial chunks " << endl;
EsiParser parser("parser_test", &Debug, &Error);
- const char *lines[] = {"foo ", "<es", "i:comment text=\"blah\"/><esi:include src=url1/>", "<!--",
- "esi <p><esi:vars>Hello, $(HTTP_COOKIE{name})!</esi:vars></p>-->", "<esi:include src=url2 /><!--e",
- "si foo--><!--esi bar-->", "<!--esi blah--><esi:com",
+ const char *lines[] = {"foo ",
+ "<es",
+ "i:comment text=\"blah\"/><esi:include src=url1/>",
+ "<!--",
+ "esi <p><esi:vars>Hello, $(HTTP_COOKIE{name})!</esi:vars></p>-->",
+ "<esi:include src=url2 /><!--e",
+ "si foo--><!--esi bar-->",
+ "<!--esi blah--><esi:com",
"ment text=\"bleh\" /> <esi:remove> </esi:remove><!--esi bleh -->",
- "<!--esi blooh--><esi:include src=url3/>", 0};
+ "<!--esi blooh--><esi:include src=url3/>",
+ 0};
DocNodeList node_list;
for (int i = 0; lines[i]; ++i) {
diff --git a/plugins/experimental/esi/test/processor_test.cc b/plugins/experimental/esi/test/processor_test.cc
index 918a7de..24dc9d6 100644
--- a/plugins/experimental/esi/test/processor_test.cc
+++ b/plugins/experimental/esi/test/processor_test.cc
@@ -980,7 +980,6 @@ main()
string packedNodeList = node_list.pack();
-
const char *output_data;
int output_data_len = 0;
diff --git a/plugins/experimental/esi/test/sampleProb.cc b/plugins/experimental/esi/test/sampleProb.cc
index 31c53c8..aaaa3d5 100644
--- a/plugins/experimental/esi/test/sampleProb.cc
+++ b/plugins/experimental/esi/test/sampleProb.cc
@@ -51,7 +51,6 @@ public:
};
~FailureInfo() {}
-
// Whenever the window time expires u start filling the count
// by taking a mod
// so what u get is over a window of 200 ms and 10 rounds
@@ -61,7 +60,7 @@ public:
// according to which the probability of serving the
// data from cache or contacting the origin server
// will be decided
- std::vector<std::pair<double, double> > _passFail;
+ std::vector<std::pair<double, double>> _passFail;
int _marker;
@@ -74,7 +73,6 @@ public:
int _windowPassed;
};
-
typedef std::map<std::string, class FailureInfo *> FailureData;
void
@@ -84,17 +82,15 @@ registerSuccFail(string URL, FailureData &data, bool isSuccess)
int marker;
FailureData::iterator it;
it = data.find(URL);
- vector<pair<double, double> > &passFail = it->second->_passFail;
+ vector<pair<double, double>> &passFail = it->second->_passFail;
marker = it->second->_marker;
-
startTime = it->second->_start;
gettimeofday(&currTime, NULL);
timersub(&currTime, &startTime, &result);
-
if ((result.tv_sec * 1000000 + result.tv_usec) > (windowSize * 1000)) {
marker = ++marker % it->second->_totalSlot;
if (marker == it->second->_totalSlot - 1) {
@@ -111,7 +107,6 @@ registerSuccFail(string URL, FailureData &data, bool isSuccess)
gettimeofday(&it->second->_start, NULL);
}
-
if (isSuccess) {
passFail[marker].second++;
}
@@ -121,7 +116,6 @@ registerSuccFail(string URL, FailureData &data, bool isSuccess)
}
}
-
bool
isAttemptReq(string URL, FailureData &data)
{
@@ -129,7 +123,7 @@ isAttemptReq(string URL, FailureData &data)
it = data.find(URL);
if (it != data.end()) {
double avg = 0;
- vector<pair<double, double> > &passFail = it->second->_passFail;
+ vector<pair<double, double>> &passFail = it->second->_passFail;
for (int i = 0; i < it->second->_totalSlot; i++) {
// cout<<"Failure:"<<passFail[i].first<< "Total"<< (passFail[i].first+passFail[i].second )<<endl;
@@ -143,12 +137,10 @@ isAttemptReq(string URL, FailureData &data)
avg = avg / it->second->_totalSlot;
double prob;
-
if (avg * 1000 < lowerCutOff) {
prob = avg;
}
-
else {
double mapFactor = (((avg * 1000 - lowerCutOff) * (avg * 1000 - lowerCutOff)) / (higherCutOff - lowerCutOff)) + lowerCutOff;
prob = mapFactor / 1000;
@@ -162,7 +154,6 @@ isAttemptReq(string URL, FailureData &data)
int decision = rand() % 100;
-
if (decision < prob * 100)
return false;
@@ -177,7 +168,6 @@ isAttemptReq(string URL, FailureData &data)
}
}
-
const std::string fetchURL = "www.example.com";
int
main(int argc, char **argv)
diff --git a/plugins/experimental/esi/test/vars_test.cc b/plugins/experimental/esi/test/vars_test.cc
index a17023b..0f81112 100644
--- a/plugins/experimental/esi/test/vars_test.cc
+++ b/plugins/experimental/esi/test/vars_test.cc
@@ -76,8 +76,19 @@ main()
{
cout << endl << "===================== Test 1" << endl;
Variables esi_vars("vars_test", &Debug, &Error);
- const char *strings[] = {"Cookie", "; c1=v1; c2=v2; ; c3; c4=; c5=v5 ", "Host", "example.com", "Referer", "google.com",
- "Blah", "Blah", "Accept-Language", "en-gb , en-us , ,", "Accept-Language", "ka-in", 0};
+ const char *strings[] = {"Cookie",
+ "; c1=v1; c2=v2; ; c3; c4=; c5=v5 ",
+ "Host",
+ "example.com",
+ "Referer",
+ "google.com",
+ "Blah",
+ "Blah",
+ "Accept-Language",
+ "en-gb , en-us , ,",
+ "Accept-Language",
+ "ka-in",
+ 0};
HttpHeaderList headers;
addToHeaderList(strings, headers);
diff --git a/plugins/experimental/generator/generator.cc b/plugins/experimental/generator/generator.cc
index 466ffc8..a4e9537 100644
--- a/plugins/experimental/generator/generator.cc
+++ b/plugins/experimental/generator/generator.cc
@@ -105,7 +105,6 @@ struct IOChannel {
TSIOBufferReader reader;
IOChannel() : vio(NULL), iobuf(TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_32K)), reader(TSIOBufferReaderAlloc(iobuf)) {}
-
~IOChannel()
{
if (this->reader) {
@@ -167,7 +166,6 @@ struct GeneratorRequest {
};
GeneratorRequest() : nbytes(0), flags(0) {}
-
~GeneratorRequest() {}
};
diff --git a/plugins/experimental/geoip_acl/acl.cc b/plugins/experimental/geoip_acl/acl.cc
index 904811f..9b30679 100644
--- a/plugins/experimental/geoip_acl/acl.cc
+++ b/plugins/experimental/geoip_acl/acl.cc
@@ -24,7 +24,6 @@
#include "acl.h"
#include "lulu.h"
-
// Implementation of the ACL base class. This wraps the underlying Geo library
// that we've found and used.
GeoDBHandle Acl::_geoip;
@@ -103,7 +102,6 @@ Acl::country_id_by_addr(const sockaddr *addr) const
}
#endif /* HAVE_GEOIP_H */
-
// This is the rest of the ACL baseclass, which is the same for all underlying Geo libraries.
void
Acl::read_html(const char *fn)
@@ -120,7 +118,6 @@ Acl::read_html(const char *fn)
}
}
-
// Implementations for the RegexAcl class
bool
RegexAcl::parse_line(const char *filename, const std::string &line, int lineno)
@@ -207,7 +204,6 @@ RegexAcl::append(RegexAcl *ra)
}
}
-
// Implementation of the Country ACL class.
void
CountryAcl::add_token(const std::string &str)
@@ -285,7 +281,6 @@ CountryAcl::eval(TSRemapRequestInfo *rri, TSHttpTxn txnp) const
return _allow;
}
-
int
CountryAcl::process_args(int argc, char *argv[])
{
diff --git a/plugins/experimental/geoip_acl/acl.h b/plugins/experimental/geoip_acl/acl.h
index 0020c0e..5067a75 100644
--- a/plugins/experimental/geoip_acl/acl.h
+++ b/plugins/experimental/geoip_acl/acl.h
@@ -44,15 +44,12 @@ typedef void *GeoDBHandle;
// Maxmind allocates 253 country codes,even though there are only 248 according to the above
static const int NUM_ISO_CODES = 253;
-
// Base class for all ACLs
class Acl
{
public:
Acl() : _allow(true), _added_tokens(0) {}
-
virtual ~Acl() {}
-
// These have to be implemented for each ACL type
virtual void read_regex(const char *fn) = 0;
virtual int process_args(int argc, char *argv[]) = 0;
@@ -90,13 +87,11 @@ protected:
static GeoDBHandle _geoip6;
};
-
// Base class for all Regex ACLs (which contain Acl() subclassed instances)
class RegexAcl
{
public:
RegexAcl(Acl *acl) : _extra(NULL), _next(NULL), _acl(acl) {}
-
const std::string &
get_regex() const
{
@@ -135,13 +130,11 @@ private:
Acl *_acl;
};
-
// ACLs based on ISO country codes.
class CountryAcl : public Acl
{
public:
CountryAcl() : _regexes(NULL) { memset(_iso_country_codes, 0, sizeof(_iso_country_codes)); }
-
void read_regex(const char *fn);
int process_args(int argc, char *argv[]);
bool eval(TSRemapRequestInfo *rri, TSHttpTxn txnp) const;
diff --git a/plugins/experimental/geoip_acl/geoip_acl.cc b/plugins/experimental/geoip_acl/geoip_acl.cc
index 1106559..63072b0 100644
--- a/plugins/experimental/geoip_acl/geoip_acl.cc
+++ b/plugins/experimental/geoip_acl/geoip_acl.cc
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
//////////////////////////////////////////////////////////////////////////////////////////////
//
// Main entry points for the plugin hooks etc.
@@ -29,7 +28,6 @@
#include "lulu.h"
#include "acl.h"
-
///////////////////////////////////////////////////////////////////////////////
// Initialize the plugin as a remap plugin.
//
@@ -55,7 +53,6 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
}
}
-
TSReturnCode
TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf */, int /* errbuf_size */)
{
@@ -96,7 +93,6 @@ TSRemapDeleteInstance(void *ih)
delete a;
}
-
///////////////////////////////////////////////////////////////////////////////
// Main entry point when used as a remap plugin.
//
diff --git a/plugins/experimental/geoip_acl/lulu.h b/plugins/experimental/geoip_acl/lulu.h
index bae273d..ef97cce 100644
--- a/plugins/experimental/geoip_acl/lulu.h
+++ b/plugins/experimental/geoip_acl/lulu.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
//////////////////////////////////////////////////////////////////////////////////////////////
//
// Implement the classes for the various types of hash keys we support.
diff --git a/plugins/experimental/header_normalize/header_normalize.cc b/plugins/experimental/header_normalize/header_normalize.cc
index 97e6bbf..1ca6e3c 100644
--- a/plugins/experimental/header_normalize/header_normalize.cc
+++ b/plugins/experimental/header_normalize/header_normalize.cc
@@ -40,7 +40,6 @@
static char UNUSED rcsId__header_normalize_cc[] =
"@(#) $Id: header_normalize.cc 218 2014-11-11 01:29:16Z sudheerv $ built on " __DATE__ " " __TIME__;
-
#include <sys/time.h>
#include <ts/ts.h>
#include <ts/remap.h>
@@ -59,7 +58,7 @@ using namespace std;
//
const char *PLUGIN_NAME = "header_normalize";
-std::map<std::string, std::string, std::less<std::string> > hdrMap;
+std::map<std::string, std::string, std::less<std::string>> hdrMap;
static void
buildHdrMap()
diff --git a/plugins/experimental/hipes/gen_escape.c b/plugins/experimental/hipes/gen_escape.c
index a53c26d..3f1b346 100644
--- a/plugins/experimental/hipes/gen_escape.c
+++ b/plugins/experimental/hipes/gen_escape.c
@@ -21,7 +21,6 @@
#include <stdio.h>
#include <string.h>
-
int
main()
{
diff --git a/plugins/experimental/hipes/hipes.cc b/plugins/experimental/hipes/hipes.cc
index 935a804..32a3ca5 100644
--- a/plugins/experimental/hipes/hipes.cc
+++ b/plugins/experimental/hipes/hipes.cc
@@ -76,7 +76,6 @@ escapify_url(const char *src, int src_len, char *dst, int dst_len)
return len;
}
-
///////////////////////////////////////////////////////////////////////////////
// Unescape a string. Have to make sure the destination buffer is at least as
// long as the source buffer.
@@ -120,7 +119,6 @@ unescapify(const char *src, char *dst, int len)
return dst;
}
-
///////////////////////////////////////////////////////////////////////////////
// Class encapsulating one service configuration
//
@@ -145,7 +143,6 @@ struct HIPESService {
int dns_timeout;
};
-
///////////////////////////////////////////////////////////////////////////////
// Initialize the plugin.
//
@@ -167,7 +164,6 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
return TS_SUCCESS;
}
-
///////////////////////////////////////////////////////////////////////////////
// One instance per remap.config invocation.
//
@@ -245,7 +241,6 @@ TSRemapDeleteInstance(void *ih)
delete ri;
}
-
///////////////////////////////////////////////////////////////////////////////
// This is the main "entry" point for the plugin, called for every request.
//
@@ -534,7 +529,6 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
return TSREMAP_DID_REMAP;
}
-
/*
local variables:
mode: C++
diff --git a/plugins/experimental/inliner/ts.cc b/plugins/experimental/inliner/ts.cc
index 18d4d59..a741626 100644
--- a/plugins/experimental/inliner/ts.cc
+++ b/plugins/experimental/inliner/ts.cc
@@ -211,35 +211,40 @@ namespace io
return WriteOperationWeakPointer(*pointer);
}
- WriteOperation &WriteOperation::operator<<(const TSIOBufferReader r)
+ WriteOperation &
+ WriteOperation::operator<<(const TSIOBufferReader r)
{
assert(r != NULL);
process(TSIOBufferCopy(buffer_, r, TSIOBufferReaderAvail(r), 0));
return *this;
}
- WriteOperation &WriteOperation::operator<<(const ReaderSize &r)
+ WriteOperation &
+ WriteOperation::operator<<(const ReaderSize &r)
{
assert(r.reader != NULL);
process(TSIOBufferCopy(buffer_, r.reader, r.size, r.offset));
return *this;
}
- WriteOperation &WriteOperation::operator<<(const ReaderOffset &r)
+ WriteOperation &
+ WriteOperation::operator<<(const ReaderOffset &r)
{
assert(r.reader != NULL);
process(TSIOBufferCopy(buffer_, r.reader, TSIOBufferReaderAvail(r.reader), r.offset));
return *this;
}
- WriteOperation &WriteOperation::operator<<(const char *const s)
+ WriteOperation &
+ WriteOperation::operator<<(const char *const s)
{
assert(s != NULL);
process(TSIOBufferWrite(buffer_, s, strlen(s)));
return *this;
}
- WriteOperation &WriteOperation::operator<<(const std::string &s)
+ WriteOperation &
+ WriteOperation::operator<<(const std::string &s)
{
process(TSIOBufferWrite(buffer_, s.data(), s.size()));
return *this;
@@ -320,35 +325,40 @@ namespace io
}
}
- BufferNode &BufferNode::operator<<(const TSIOBufferReader r)
+ BufferNode &
+ BufferNode::operator<<(const TSIOBufferReader r)
{
assert(r != NULL);
TSIOBufferCopy(buffer_, r, TSIOBufferReaderAvail(r), 0);
return *this;
}
- BufferNode &BufferNode::operator<<(const ReaderSize &r)
+ BufferNode &
+ BufferNode::operator<<(const ReaderSize &r)
{
assert(r.reader != NULL);
TSIOBufferCopy(buffer_, r.reader, r.size, r.offset);
return *this;
}
- BufferNode &BufferNode::operator<<(const ReaderOffset &r)
+ BufferNode &
+ BufferNode::operator<<(const ReaderOffset &r)
{
assert(r.reader != NULL);
TSIOBufferCopy(buffer_, r.reader, TSIOBufferReaderAvail(r.reader), r.offset);
return *this;
}
- BufferNode &BufferNode::operator<<(const char *const s)
+ BufferNode &
+ BufferNode::operator<<(const char *const s)
{
assert(s != NULL);
TSIOBufferWrite(buffer_, s, strlen(s));
return *this;
}
- BufferNode &BufferNode::operator<<(const std::string &s)
+ BufferNode &
+ BufferNode::operator<<(const std::string &s)
{
TSIOBufferWrite(buffer_, s.data(), s.size());
return *this;
@@ -458,7 +468,8 @@ namespace io
return Node::Result(length, nodes_.empty());
}
- Sink &Sink::operator<<(std::string &&s)
+ Sink &
+ Sink::operator<<(std::string &&s)
{
if (data_) {
data_->nodes_.emplace_back(new StringNode(std::move(s)));
diff --git a/plugins/experimental/inliner/ts.h b/plugins/experimental/inliner/ts.h
index 468eddf..9116f07 100644
--- a/plugins/experimental/inliner/ts.h
+++ b/plugins/experimental/inliner/ts.h
@@ -193,7 +193,9 @@ namespace io
IOSink &operator=(const IOSink &) = delete;
- template <class T> IOSink &operator<<(T &&t)
+ template <class T>
+ IOSink &
+ operator<<(T &&t)
{
const WriteOperationPointer operation = operation_.lock();
if (operation) {
@@ -285,7 +287,9 @@ namespace io
Sink &operator<<(std::string &&);
- template <class T> Sink &operator<<(T &&t)
+ template <class T>
+ Sink &
+ operator<<(T &&t)
{
if (data_) {
const Lock lock = data_->root_->lock();
diff --git a/plugins/experimental/memcache/protocol_binary.h b/plugins/experimental/memcache/protocol_binary.h
index bee7aab..7307e02 100644
--- a/plugins/experimental/memcache/protocol_binary.h
+++ b/plugins/experimental/memcache/protocol_binary.h
@@ -362,7 +362,6 @@ typedef protocol_binary_request_no_extras protocol_binary_request_version;
*/
typedef protocol_binary_response_no_extras protocol_binary_response_version;
-
/**
* Definition of the packet used by the stats command.
* See section 4
diff --git a/plugins/experimental/memcache/tsmemcache.cc b/plugins/experimental/memcache/tsmemcache.cc
index d63f524..30c4102 100644
--- a/plugins/experimental/memcache/tsmemcache.cc
+++ b/plugins/experimental/memcache/tsmemcache.cc
@@ -386,7 +386,6 @@ MC::write_binary_response(const void *d, int hlen, int keylen, int dlen)
} \
} while (0)
-
static char *
get_pointer(MC *mc, int start, int len)
{
diff --git a/plugins/experimental/memcached_remap/memcached_remap.cc b/plugins/experimental/memcached_remap/memcached_remap.cc
index 05046ff..a6c9a8f 100644
--- a/plugins/experimental/memcached_remap/memcached_remap.cc
+++ b/plugins/experimental/memcached_remap/memcached_remap.cc
@@ -60,7 +60,6 @@ do_memcached_remap(TSCont contp, TSHttpTxn txnp)
goto release_hdr;
}
-
field_loc = TSMimeHdrFieldFind(reqp, hdr_loc, TS_MIME_FIELD_HOST, TS_MIME_LEN_HOST);
if (!field_loc) {
diff --git a/plugins/experimental/mp4/mp4.cc b/plugins/experimental/mp4/mp4.cc
index 9988ae0..a63261b 100644
--- a/plugins/experimental/mp4/mp4.cc
+++ b/plugins/experimental/mp4/mp4.cc
@@ -18,7 +18,6 @@
#include "mp4_common.h"
-
static char *ts_arg(const char *param, size_t param_len, const char *key, size_t key_len, size_t *val_len);
static int mp4_handler(TSCont contp, TSEvent event, void *edata);
static void mp4_cache_lookup_complete(Mp4Context *mc, TSHttpTxn txnp);
@@ -28,7 +27,6 @@ static int mp4_transform_entry(TSCont contp, TSEvent event, void *edata);
static int mp4_transform_handler(TSCont contp, Mp4Context *mc);
static int mp4_parse_meta(Mp4TransformContext *mtc, bool body_complete);
-
TSReturnCode
TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
{
diff --git a/plugins/experimental/mp4/mp4_common.h b/plugins/experimental/mp4/mp4_common.h
index 5977e2b..cb824ab 100644
--- a/plugins/experimental/mp4/mp4_common.h
+++ b/plugins/experimental/mp4/mp4_common.h
@@ -30,7 +30,6 @@
#include <ts/remap.h>
#include "mp4_meta.h"
-
class IOHandle
{
public:
diff --git a/plugins/experimental/mp4/mp4_meta.cc b/plugins/experimental/mp4/mp4_meta.cc
index c8b925a..152444a 100644
--- a/plugins/experimental/mp4/mp4_meta.cc
+++ b/plugins/experimental/mp4/mp4_meta.cc
@@ -18,7 +18,6 @@
#include "mp4_meta.h"
-
static mp4_atom_handler mp4_atoms[] = {{"ftyp", &Mp4Meta::mp4_read_ftyp_atom},
{"moov", &Mp4Meta::mp4_read_moov_atom},
{"mdat", &Mp4Meta::mp4_read_mdat_atom},
@@ -44,16 +43,10 @@ static mp4_atom_handler mp4_minf_atoms[] = {{"vmhd", &Mp4Meta::mp4_read_vmhd_ato
{"stbl", &Mp4Meta::mp4_read_stbl_atom},
{NULL, NULL}};
-static mp4_atom_handler mp4_stbl_atoms[] = {{"stsd", &Mp4Meta::mp4_read_stsd_atom},
- {"stts", &Mp4Meta::mp4_read_stts_atom},
- {"stss", &Mp4Meta::mp4_read_stss_atom},
- {"ctts", &Mp4Meta::mp4_read_ctts_atom},
- {"stsc", &Mp4Meta::mp4_read_stsc_atom},
- {"stsz", &Mp4Meta::mp4_read_stsz_atom},
- {"stco", &Mp4Meta::mp4_read_stco_atom},
- {"co64", &Mp4Meta::mp4_read_co64_atom},
- {NULL, NULL}};
-
+static mp4_atom_handler mp4_stbl_atoms[] = {
+ {"stsd", &Mp4Meta::mp4_read_stsd_atom}, {"stts", &Mp4Meta::mp4_read_stts_atom}, {"stss", &Mp4Meta::mp4_read_stss_atom},
+ {"ctts", &Mp4Meta::mp4_read_ctts_atom}, {"stsc", &Mp4Meta::mp4_read_stsc_atom}, {"stsz", &Mp4Meta::mp4_read_stsz_atom},
+ {"stco", &Mp4Meta::mp4_read_stco_atom}, {"co64", &Mp4Meta::mp4_read_co64_atom}, {NULL, NULL}};
static void mp4_reader_set_32value(TSIOBufferReader readerp, int64_t offset, uint32_t n);
static void mp4_reader_set_64value(TSIOBufferReader readerp, int64_t offset, uint64_t n);
@@ -61,7 +54,6 @@ static uint32_t mp4_reader_get_32value(TSIOBufferReader readerp, int64_t offset)
static uint64_t mp4_reader_get_64value(TSIOBufferReader readerp, int64_t offset);
static int64_t IOBufferReaderCopy(TSIOBufferReader readerp, void *buf, int64_t length);
-
int
Mp4Meta::parse_meta(bool body_complete)
{
@@ -108,7 +100,6 @@ Mp4Meta::mp4_meta_consume(int64_t size)
passed += size;
}
-
int
Mp4Meta::post_process_meta()
{
@@ -203,7 +194,6 @@ Mp4Meta::post_process_meta()
adjustment = this->ftyp_size + this->moov_size + mp4_update_mdat_atom(start_offset) - start_offset;
-
TSIOBufferCopy(out_handle.buffer, mdat_atom.reader, TSIOBufferReaderAvail(mdat_atom.reader), 0);
for (i = 0; i < trak_num; i++) {
@@ -321,7 +311,6 @@ Mp4Meta::mp4_atom_next(int64_t atom_size, bool wait)
return -1;
}
-
/*
* -1: error
* 1: success
@@ -1520,7 +1509,6 @@ Mp4Meta::mp4_update_mdat_atom(int64_t start_offset)
return atom_header_size;
}
-
uint32_t
Mp4Meta::mp4_find_key_sample(uint32_t start_sample, Mp4Trak *trak)
{
@@ -1657,7 +1645,6 @@ Mp4Meta::mp4_update_mdhd_duration(Mp4Trak *trak)
}
}
-
static void
mp4_reader_set_32value(TSIOBufferReader readerp, int64_t offset, uint32_t n)
{
diff --git a/plugins/experimental/mp4/mp4_meta.h b/plugins/experimental/mp4/mp4_meta.h
index 3dac78d..0631851 100644
--- a/plugins/experimental/mp4/mp4_meta.h
+++ b/plugins/experimental/mp4/mp4_meta.h
@@ -65,7 +65,6 @@
((u_char *)(p))[6] = (u_char)((n) >> 8); \
((u_char *)(p))[7] = (u_char)(n)
-
typedef enum {
MP4_TRAK_ATOM = 0,
MP4_TKHD_ATOM,
@@ -96,7 +95,6 @@ typedef enum {
MP4_LAST_ATOM = MP4_CO64_DATA
} TSMp4AtomID;
-
typedef struct {
u_char size[4];
u_char name[4];
@@ -310,7 +308,6 @@ typedef struct {
Mp4AtomHandler handler;
} mp4_atom_handler;
-
class BufferHandle
{
public:
@@ -347,7 +344,6 @@ public:
}
~Mp4Trak() {}
-
public:
uint32_t timescale;
int64_t duration;
diff --git a/plugins/experimental/multiplexer/dispatch.cc b/plugins/experimental/multiplexer/dispatch.cc
index 911bb1a..bd4c56c 100644
--- a/plugins/experimental/multiplexer/dispatch.cc
+++ b/plugins/experimental/multiplexer/dispatch.cc
@@ -60,7 +60,8 @@ Request::Request(const Request &r) : host(r.host), length(r.length), io(const_ca
assert(r.io.get() != NULL);
}
-Request &Request::operator=(const Request &r)
+Request &
+Request::operator=(const Request &r)
{
host = r.host;
length = r.length;
diff --git a/plugins/experimental/mysql_remap/lib/dictionary.c b/plugins/experimental/mysql_remap/lib/dictionary.c
index 82e7636..5cb60e4 100644
--- a/plugins/experimental/mysql_remap/lib/dictionary.c
+++ b/plugins/experimental/mysql_remap/lib/dictionary.c
@@ -393,7 +393,6 @@ dictionary_dump(dictionary *d, FILE *out)
return;
}
-
/* Test code */
#ifdef TESTDIC
#define NVALS 20000
diff --git a/plugins/experimental/mysql_remap/lib/dictionary.h b/plugins/experimental/mysql_remap/lib/dictionary.h
index 50af5d5..a480b20 100644
--- a/plugins/experimental/mysql_remap/lib/dictionary.h
+++ b/plugins/experimental/mysql_remap/lib/dictionary.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/*-------------------------------------------------------------------------*/
/**
@file dictionary.h
@@ -59,7 +58,6 @@
New types
---------------------------------------------------------------------------*/
-
/*-------------------------------------------------------------------------*/
/**
@brief Dictionary object
@@ -78,7 +76,6 @@ typedef struct _dictionary_ {
unsigned *hash; /** List of hash values for keys */
} dictionary;
-
/*---------------------------------------------------------------------------
Function prototypes
---------------------------------------------------------------------------*/
@@ -137,7 +134,6 @@ void dictionary_del(dictionary *vd);
/*--------------------------------------------------------------------------*/
char *dictionary_get(dictionary *d, char *key, char *def);
-
/*-------------------------------------------------------------------------*/
/**
@brief Set a value in a dictionary.
@@ -179,7 +175,6 @@ int dictionary_set(dictionary *vd, char *key, char *val);
/*--------------------------------------------------------------------------*/
void dictionary_unset(dictionary *d, char *key);
-
/*-------------------------------------------------------------------------*/
/**
@brief Dump a dictionary to an opened file pointer.
diff --git a/plugins/experimental/mysql_remap/lib/iniparser.c b/plugins/experimental/mysql_remap/lib/iniparser.c
index 012bd68..f47e1ef 100644
--- a/plugins/experimental/mysql_remap/lib/iniparser.c
+++ b/plugins/experimental/mysql_remap/lib/iniparser.c
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/*-------------------------------------------------------------------------*/
/**
@file iniparser.c
diff --git a/plugins/experimental/mysql_remap/lib/iniparser.h b/plugins/experimental/mysql_remap/lib/iniparser.h
index 97c0e78..aa4e08b 100644
--- a/plugins/experimental/mysql_remap/lib/iniparser.h
+++ b/plugins/experimental/mysql_remap/lib/iniparser.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/*-------------------------------------------------------------------------*/
/**
@file iniparser.h
@@ -85,7 +84,6 @@
int iniparser_getnsec(dictionary *d);
-
/*-------------------------------------------------------------------------*/
/**
@brief Get name for section n in a dictionary.
@@ -103,7 +101,6 @@ int iniparser_getnsec(dictionary *d);
char *iniparser_getsecname(dictionary *d, int n);
-
/*-------------------------------------------------------------------------*/
/**
@brief Save a dictionary to a loadable ini file
@@ -228,7 +225,6 @@ double iniparser_getdouble(dictionary *d, char *key, double notfound);
/*--------------------------------------------------------------------------*/
int iniparser_getboolean(dictionary *d, const char *key, int notfound);
-
/*-------------------------------------------------------------------------*/
/**
@brief Set an entry in a dictionary.
@@ -244,7 +240,6 @@ int iniparser_getboolean(dictionary *d, const char *key, int notfound);
/*--------------------------------------------------------------------------*/
int iniparser_setstring(dictionary *ini, char *entry, char *val);
-
/*-------------------------------------------------------------------------*/
/**
@brief Delete an entry in a dictionary
diff --git a/plugins/experimental/remap_stats/remap_stats.c b/plugins/experimental/remap_stats/remap_stats.c
index 74e1750..9e9a0b1 100644
--- a/plugins/experimental/remap_stats/remap_stats.c
+++ b/plugins/experimental/remap_stats/remap_stats.c
@@ -42,7 +42,6 @@ typedef struct {
TSMutex stat_creation_mutex;
} config_t;
-
static void
stat_add(char *name, TSMgmtInt amount, TSStatPersistence persist_type, TSMutex create_mutex)
{
@@ -90,7 +89,6 @@ stat_add(char *name, TSMgmtInt amount, TSStatPersistence persist_type, TSMutex c
TSDebug(DEBUG_TAG, "stat error! stat_name: %s stat_id: %d", name, stat_id);
}
-
static char *
get_effective_host(TSHttpTxn txn)
{
@@ -113,7 +111,6 @@ get_effective_host(TSHttpTxn txn)
return tmp;
}
-
static int
handle_read_req_hdr(TSCont cont, TSEvent event ATS_UNUSED, void *edata)
{
@@ -130,7 +127,6 @@ handle_read_req_hdr(TSCont cont, TSEvent event ATS_UNUSED, void *edata)
return 0;
}
-
static int
handle_post_remap(TSCont cont, TSEvent event ATS_UNUSED, void *edata)
{
@@ -152,10 +148,8 @@ handle_post_remap(TSCont cont, TSEvent event ATS_UNUSED, void *edata)
return 0;
}
-
#define CREATE_STAT_NAME(s, h, b) snprintf(s, MAX_STAT_LENGTH, "plugin.%s.%s.%s", PLUGIN_NAME, h, b)
-
static int
handle_txn_close(TSCont cont, TSEvent event ATS_UNUSED, void *edata)
{
diff --git a/plugins/experimental/s3_auth/s3_auth.cc b/plugins/experimental/s3_auth/s3_auth.cc
index 7ccffc8..a6b9e3b 100644
--- a/plugins/experimental/s3_auth/s3_auth.cc
+++ b/plugins/experimental/s3_auth/s3_auth.cc
@@ -40,7 +40,6 @@
static const char PLUGIN_NAME[] = "s3_auth";
static const char DATE_FMT[] = "%a, %d %b %Y %H:%M:%S %z";
-
///////////////////////////////////////////////////////////////////////////////
// One configuration setup
//
@@ -144,7 +143,6 @@ private:
TSCont _cont;
};
-
bool
S3Config::parse_config(const char *config)
{
@@ -207,7 +205,6 @@ S3Config::parse_config(const char *config)
return true;
}
-
///////////////////////////////////////////////////////////////////////////////
// This class is used to perform the S3 auth generation.
//
@@ -243,7 +240,6 @@ private:
TSMLoc _hdr_loc, _url_loc;
};
-
///////////////////////////////////////////////////////////////////////////
// Set a header to a specific value. This will avoid going to through a
// remove / add sequence in case of an existing header.
@@ -490,7 +486,6 @@ event_handler(TSCont cont, TSEvent /* event */, void *edata)
return 0;
}
-
///////////////////////////////////////////////////////////////////////////////
// Initialize the plugin.
//
@@ -512,19 +507,16 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
return TS_SUCCESS;
}
-
///////////////////////////////////////////////////////////////////////////////
// One instance per remap.config invocation.
//
TSReturnCode
TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSED */, int /* errbuf_size ATS_UNUSED */)
{
- static const struct option longopt[] = {{const_cast<char *>("access_key"), required_argument, NULL, 'a'},
- {const_cast<char *>("config"), required_argument, NULL, 'c'},
- {const_cast<char *>("secret_key"), required_argument, NULL, 's'},
- {const_cast<char *>("version"), required_argument, NULL, 'v'},
- {const_cast<char *>("virtual_host"), no_argument, NULL, 'h'},
- {NULL, no_argument, NULL, '\0'}};
+ static const struct option longopt[] = {
+ {const_cast<char *>("access_key"), required_argument, NULL, 'a'}, {const_cast<char *>("config"), required_argument, NULL, 'c'},
+ {const_cast<char *>("secret_key"), required_argument, NULL, 's'}, {const_cast<char *>("version"), required_argument, NULL, 'v'},
+ {const_cast<char *>("virtual_host"), no_argument, NULL, 'h'}, {NULL, no_argument, NULL, '\0'}};
S3Config *s3 = new S3Config();
@@ -583,7 +575,6 @@ TSRemapDeleteInstance(void *ih)
delete s3;
}
-
///////////////////////////////////////////////////////////////////////////////
// This is the main "entry" point for the plugin, called for every request.
//
diff --git a/plugins/experimental/ssl_cert_loader/domain-tree.h b/plugins/experimental/ssl_cert_loader/domain-tree.h
index 7561a7c..417a5df 100644
--- a/plugins/experimental/ssl_cert_loader/domain-tree.h
+++ b/plugins/experimental/ssl_cert_loader/domain-tree.h
@@ -32,7 +32,6 @@ public:
{
public:
DomainNameNode() : order(-1), payload(NULL), parent(NULL), is_wild(false) {}
-
DomainNameNode(std::string key, void *payload, int order, bool is_wild)
: key(key), order(order), payload(payload), parent(NULL), is_wild(is_wild)
{
@@ -72,7 +71,6 @@ public:
}
~DomainNameTree() { delete root; }
-
DomainNameNode *
findBestMatch(std::string key)
{
diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
index 278da70..02b572b 100644
--- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
+++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
@@ -58,9 +58,7 @@ class SslEntry
{
public:
SslEntry() : ctx(NULL), op(TS_SSL_HOOK_OP_DEFAULT) { this->mutex = TSMutexCreate(); }
-
~SslEntry() {}
-
SSL_CTX *ctx;
TSSslVConnOp op;
// If the CTX is not already created, use these
@@ -124,7 +122,6 @@ struct ParsedSslValues {
IpRangeQueue server_ips;
};
-
void Parse_Config_Rules(Value &parent, ParsedSslValues &orig_values);
int
@@ -207,7 +204,6 @@ Load_Certificate(SslEntry const *entry, std::deque<std::string> &names)
return retval;
}
-
/*
* Load the config information about the terminal config.
* Only load the certificate if no server name or ip is specified
@@ -485,7 +481,6 @@ TSPluginInit(int argc, const char *argv[])
static const struct option longopt[] = {{const_cast<char *>("config"), required_argument, NULL, 'c'},
{NULL, no_argument, NULL, '\0'}};
-
info.plugin_name = const_cast<char *>("SSL Certificate Loader");
info.vendor_name = const_cast<char *>("Network Geographics");
info.support_email = const_cast<char *>("shinrich@network-geographics.com");
diff --git a/plugins/experimental/sslheaders/sslheaders.h b/plugins/experimental/sslheaders/sslheaders.h
index 57f9b98..6d43011 100644
--- a/plugins/experimental/sslheaders/sslheaders.h
+++ b/plugins/experimental/sslheaders/sslheaders.h
@@ -63,7 +63,6 @@ enum ExpansionField {
struct SslHdrExpansion {
SslHdrExpansion() : name(), scope(SSL_HEADERS_SCOPE_NONE), field(SSL_HEADERS_FIELD_NONE) {}
-
std::string name; // HTTP header name
ExpansionScope scope;
ExpansionField field;
diff --git a/plugins/experimental/sslheaders/util.cc b/plugins/experimental/sslheaders/util.cc
index 5d9b066..e417b73 100644
--- a/plugins/experimental/sslheaders/util.cc
+++ b/plugins/experimental/sslheaders/util.cc
@@ -27,12 +27,9 @@ static const struct _f {
const char *name;
ExpansionField field;
} fields[] = {
- {"certificate", SSL_HEADERS_FIELD_CERTIFICATE},
- {"subject", SSL_HEADERS_FIELD_SUBJECT},
- {"issuer", SSL_HEADERS_FIELD_ISSUER},
- {"serial", SSL_HEADERS_FIELD_SERIAL},
- {"signature", SSL_HEADERS_FIELD_SIGNATURE},
- {"notbefore", SSL_HEADERS_FIELD_NOTBEFORE},
+ {"certificate", SSL_HEADERS_FIELD_CERTIFICATE}, {"subject", SSL_HEADERS_FIELD_SUBJECT},
+ {"issuer", SSL_HEADERS_FIELD_ISSUER}, {"serial", SSL_HEADERS_FIELD_SERIAL},
+ {"signature", SSL_HEADERS_FIELD_SIGNATURE}, {"notbefore", SSL_HEADERS_FIELD_NOTBEFORE},
{"notafter", SSL_HEADERS_FIELD_NOTAFTER},
};
diff --git a/plugins/experimental/stream_editor/stream_editor.cc b/plugins/experimental/stream_editor/stream_editor.cc
index d828218..78d8911 100644
--- a/plugins/experimental/stream_editor/stream_editor.cc
+++ b/plugins/experimental/stream_editor/stream_editor.cc
@@ -110,13 +110,14 @@ struct edit_t {
const std::string repl;
const int priority;
edit_t(size_t s, size_t b, const std::string &r, int p) : start(s), bytes(b), repl(r), priority(p) { ; }
-
- bool operator!=(const edit_t &x) const
+ bool
+ operator!=(const edit_t &x) const
{
return start != x.start || bytes != x.bytes || repl != x.repl || priority != x.priority;
}
- bool operator<(const edit_t &x) const
+ bool
+ operator<(const edit_t &x) const
{
if ((start == x.start) || (start < x.start && start + bytes > x.start) || (x.start < start && x.start + x.bytes > start)) {
/* conflicting edits. Throw back to resolve conflict */
@@ -153,7 +154,6 @@ struct edit_t {
}
};
-
class scope_t
{
virtual bool match(const char *) const = 0;
@@ -199,11 +199,9 @@ public:
}
scope_t(const bool u) : uri(u) { ; }
-
virtual ~scope_t() {}
};
-
class rxscope : public scope_t
{
private:
@@ -232,7 +230,6 @@ public:
virtual ~rxscope() { regfree(&rx); }
};
-
class strscope : public scope_t
{
private:
@@ -247,7 +244,6 @@ private:
public:
strscope(const bool u, const bool i, const char *pattern, int len) : scope_t(u), icase(i) { str = TSstrndup(pattern, len); }
-
virtual ~strscope()
{
if (str)
@@ -255,7 +251,6 @@ public:
}
};
-
class match_t
{
public:
@@ -264,7 +259,6 @@ public:
virtual ~match_t() {}
};
-
class strmatch : public match_t
{
const bool icase;
@@ -300,7 +294,6 @@ public:
}
};
-
class rxmatch : public match_t
{
size_t match_len;
@@ -376,7 +369,6 @@ public:
else \
break
-
class rule_t
{
private:
diff --git a/plugins/experimental/ts_lua/ts_lua.c b/plugins/experimental/ts_lua/ts_lua.c
index 1c1a770..8f4de32 100644
--- a/plugins/experimental/ts_lua/ts_lua.c
+++ b/plugins/experimental/ts_lua/ts_lua.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include <string.h>
#include <errno.h>
#include <pthread.h>
@@ -31,7 +30,6 @@ static uint64_t ts_lua_g_http_next_id = 0;
static ts_lua_main_ctx *ts_lua_main_ctx_array;
static ts_lua_main_ctx *ts_lua_g_main_ctx_array;
-
TSReturnCode
TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
{
@@ -392,7 +390,6 @@ TSPluginInit(int argc, const char *argv[])
ts_lua_init_instance(conf);
-
char errbuf[TS_LUA_MAX_STR_LENGTH];
int errbuf_len = sizeof(errbuf);
ret = ts_lua_add_module(conf, ts_lua_g_main_ctx_array, TS_LUA_MAX_STATE_COUNT, argc - 1, (char **)&argv[1], errbuf, errbuf_len);
diff --git a/plugins/experimental/ts_lua/ts_lua_cached_response.c b/plugins/experimental/ts_lua/ts_lua_cached_response.c
index 2c52e8f..672b116 100644
--- a/plugins/experimental/ts_lua/ts_lua_cached_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_cached_response.c
@@ -16,10 +16,8 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
-
#define TS_LUA_CHECK_CACHED_RESPONSE_HDR(http_ctx) \
do { \
TSMBuffer bufp; \
@@ -35,7 +33,6 @@
} \
} while (0)
-
static void ts_lua_inject_cached_response_misc_api(lua_State *L);
static void ts_lua_inject_cached_response_header_api(lua_State *L);
static void ts_lua_inject_cached_response_headers_api(lua_State *L);
@@ -47,7 +44,6 @@ static int ts_lua_cached_response_get_headers(lua_State *L);
static int ts_lua_cached_response_get_status(lua_State *L);
static int ts_lua_cached_response_get_version(lua_State *L);
-
void
ts_lua_inject_cached_response_api(lua_State *L)
{
@@ -57,7 +53,6 @@ ts_lua_inject_cached_response_api(lua_State *L)
ts_lua_inject_cached_response_headers_api(L);
ts_lua_inject_cached_response_misc_api(L);
-
lua_setfield(L, -2, "cached_response");
}
diff --git a/plugins/experimental/ts_lua/ts_lua_cached_response.h b/plugins/experimental/ts_lua/ts_lua_cached_response.h
index f070945..82102fc 100644
--- a/plugins/experimental/ts_lua/ts_lua_cached_response.h
+++ b/plugins/experimental/ts_lua/ts_lua_cached_response.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_CACHED_RESPONSE_H
#define _TS_LUA_CACHED_RESPONSE_H
diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.c b/plugins/experimental/ts_lua/ts_lua_client_request.c
index a90fb71..b829a8c 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_request.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts/ink_platform.h"
#include <netinet/in.h>
#include "ts_lua_util.h"
@@ -62,7 +61,6 @@ static void ts_lua_inject_client_request_version_api(lua_State *L);
static void ts_lua_inject_client_request_body_size_api(lua_State *L);
static void ts_lua_inject_client_request_header_size_api(lua_State *L);
-
static int ts_lua_client_request_client_addr_get_ip(lua_State *L);
static int ts_lua_client_request_client_addr_get_port(lua_State *L);
static int ts_lua_client_request_client_addr_get_addr(lua_State *L);
@@ -372,7 +370,6 @@ ts_lua_client_request_get_url_host(lua_State *L)
char *l_key = "host";
int key_len = 4;
-
TSMLoc field_loc;
field_loc = TSMimeHdrFieldFind(http_ctx->client_request_bufp, http_ctx->client_request_hdrp, key, key_len);
@@ -524,7 +521,6 @@ ts_lua_client_request_set_uri(lua_State *L)
return 0;
}
-
static void
ts_lua_inject_client_request_args_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.h b/plugins/experimental/ts_lua/ts_lua_client_request.h
index 7f91e9e..bd5ac19 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_request.h
+++ b/plugins/experimental/ts_lua/ts_lua_client_request.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_CLIENT_REQUEST_H
#define _TS_LUA_CLIENT_REQUEST_H
diff --git a/plugins/experimental/ts_lua/ts_lua_client_response.c b/plugins/experimental/ts_lua/ts_lua_client_response.c
index 7e7d7f4..baae036 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_response.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
#define TS_LUA_CHECK_CLIENT_RESPONSE_HDR(http_ctx) \
@@ -29,7 +28,6 @@
} \
} while (0)
-
static int ts_lua_client_response_header_get(lua_State *L);
static int ts_lua_client_response_header_set(lua_State *L);
@@ -47,7 +45,6 @@ static void ts_lua_inject_client_response_header_api(lua_State *L);
static void ts_lua_inject_client_response_headers_api(lua_State *L);
static void ts_lua_inject_client_response_misc_api(lua_State *L);
-
void
ts_lua_inject_client_response_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_client_response.h b/plugins/experimental/ts_lua/ts_lua_client_response.h
index 033a2be..b239cee 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_response.h
+++ b/plugins/experimental/ts_lua/ts_lua_client_response.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_CLIENT_RESPONSE_H
#define _TS_LUA_CLIENT_RESPONSE_H
diff --git a/plugins/experimental/ts_lua/ts_lua_common.h b/plugins/experimental/ts_lua/ts_lua_common.h
index 04c95d0..3927eef 100644
--- a/plugins/experimental/ts_lua/ts_lua_common.h
+++ b/plugins/experimental/ts_lua/ts_lua_common.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_COMMON_H
#define _TS_LUA_COMMON_H
@@ -61,7 +60,6 @@
#define TS_LUA_FUNCTION_G_READ_CACHE "do_global_read_cache"
#define TS_LUA_FUNCTION_G_TXN_CLOSE "do_global_txn_close"
-
#define TS_LUA_DEBUG_TAG "ts_lua"
#define TS_LUA_EVENT_COROUTINE_CONT 20000
@@ -101,7 +99,6 @@ typedef struct {
int remap;
} ts_lua_instance_conf;
-
/* lua state for http request */
typedef struct {
ts_lua_cont_info cinfo;
@@ -133,7 +130,6 @@ typedef struct {
} ts_lua_http_ctx;
-
typedef struct {
TSVIO vio;
TSIOBuffer buffer;
diff --git a/plugins/experimental/ts_lua/ts_lua_constant.c b/plugins/experimental/ts_lua/ts_lua_constant.c
index 8a981ea..6c0514c 100644
--- a/plugins/experimental/ts_lua/ts_lua_constant.c
+++ b/plugins/experimental/ts_lua/ts_lua_constant.c
@@ -16,14 +16,12 @@
limitations under the License.
*/
-
#include <stdint.h>
#include <stdio.h>
#include <lua.h>
static void ts_lua_inject_number_variables(lua_State *L);
-
void
ts_lua_inject_constant_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_constant.h b/plugins/experimental/ts_lua/ts_lua_constant.h
index a345f84..c0dcb27 100644
--- a/plugins/experimental/ts_lua/ts_lua_constant.h
+++ b/plugins/experimental/ts_lua/ts_lua_constant.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_CONSTANT_H
#define _TS_LUA_CONSTANT_H
diff --git a/plugins/experimental/ts_lua/ts_lua_context.c b/plugins/experimental/ts_lua/ts_lua_context.c
index 9993b6a..fcf21a0 100644
--- a/plugins/experimental/ts_lua/ts_lua_context.c
+++ b/plugins/experimental/ts_lua/ts_lua_context.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
static char ts_http_context_key;
@@ -24,7 +23,6 @@ static char ts_http_context_key;
static int ts_lua_context_get(lua_State *L);
static int ts_lua_context_set(lua_State *L);
-
void
ts_lua_inject_context_api(lua_State *L)
{
@@ -50,7 +48,6 @@ ts_lua_create_context_table(lua_State *L)
lua_rawset(L, LUA_GLOBALSINDEX);
}
-
static int
ts_lua_context_get(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_context.h b/plugins/experimental/ts_lua/ts_lua_context.h
index 1a98245..332d50b 100644
--- a/plugins/experimental/ts_lua/ts_lua_context.h
+++ b/plugins/experimental/ts_lua/ts_lua_context.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_CONTEXT_H
#define _TS_LUA_CONTEXT_H
diff --git a/plugins/experimental/ts_lua/ts_lua_coroutine.h b/plugins/experimental/ts_lua/ts_lua_coroutine.h
index 78a657c..074c5a2 100644
--- a/plugins/experimental/ts_lua/ts_lua_coroutine.h
+++ b/plugins/experimental/ts_lua/ts_lua_coroutine.h
@@ -25,7 +25,6 @@
#include <lauxlib.h>
#include <ts/ts.h>
-
struct async_item;
typedef int (*async_clean)(struct async_item *item);
@@ -51,7 +50,6 @@ typedef struct {
struct async_item *async_chain; // async_item list
} ts_lua_cont_info;
-
/* asynchronous item */
typedef struct async_item {
struct async_item *next;
@@ -64,7 +62,6 @@ typedef struct async_item {
int deleted : 1;
} ts_lua_async_item;
-
ts_lua_async_item *ts_lua_async_create_item(TSCont cont, async_clean func, void *d, ts_lua_cont_info *ci);
void ts_lua_release_cont_info(ts_lua_cont_info *ci);
diff --git a/plugins/experimental/ts_lua/ts_lua_crypto.c b/plugins/experimental/ts_lua/ts_lua_crypto.c
index 760a0bb..d2b578f 100644
--- a/plugins/experimental/ts_lua/ts_lua_crypto.c
+++ b/plugins/experimental/ts_lua/ts_lua_crypto.c
@@ -21,7 +21,6 @@
#include "ts_lua_string.h"
#include "ts_lua_util.h"
-
#define TS_LUA_MD5_DIGEST_LENGTH 16
#define TS_LUA_SHA_DIGEST_LENGTH 20
diff --git a/plugins/experimental/ts_lua/ts_lua_crypto.h b/plugins/experimental/ts_lua/ts_lua_crypto.h
index 506593a..a797974 100644
--- a/plugins/experimental/ts_lua/ts_lua_crypto.h
+++ b/plugins/experimental/ts_lua/ts_lua_crypto.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_CRYPTO_H
#define _TS_LUA_CRYPTO_H
diff --git a/plugins/experimental/ts_lua/ts_lua_fetch.c b/plugins/experimental/ts_lua/ts_lua_fetch.c
index 6f9f314..f21a81c 100644
--- a/plugins/experimental/ts_lua/ts_lua_fetch.c
+++ b/plugins/experimental/ts_lua/ts_lua_fetch.c
@@ -37,7 +37,6 @@ static int ts_lua_fetch_multi_handler(TSCont contp, TSEvent event, void *edata);
static int ts_lua_fetch_one_item(lua_State *L, const char *url, size_t url_len, ts_lua_fetch_info *fi);
static inline void ts_lua_destroy_fetch_multi_info(ts_lua_fetch_multi_info *fmi);
-
void
ts_lua_inject_fetch_api(lua_State *L)
{
@@ -551,7 +550,6 @@ ts_lua_fetch_multi_handler(TSCont contp, TSEvent event ATS_UNUSED, void *edata)
return 0;
}
-
static inline void
ts_lua_destroy_fetch_multi_info(ts_lua_fetch_multi_info *fmi)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_hook.c b/plugins/experimental/ts_lua/ts_lua_hook.c
index 8ec9ca5..8a6e7b4 100644
--- a/plugins/experimental/ts_lua/ts_lua_hook.c
+++ b/plugins/experimental/ts_lua/ts_lua_hook.c
@@ -16,12 +16,10 @@
limitations under the License.
*/
-
#include "ts_lua_hook.h"
#include "ts_lua_transform.h"
#include "ts_lua_util.h"
-
typedef enum {
TS_LUA_HOOK_DUMMY = 0,
TS_LUA_HOOK_CACHE_LOOKUP_COMPLETE,
@@ -41,18 +39,26 @@ typedef enum {
TS_LUA_HOOK_LAST
} TSLuaHookID;
-
-char *ts_lua_hook_id_string[] = {"TS_LUA_HOOK_DUMMY", "TS_LUA_HOOK_CACHE_LOOKUP_COMPLETE", "TS_LUA_HOOK_SEND_REQUEST_HDR",
- "TS_LUA_HOOK_READ_RESPONSE_HDR", "TS_LUA_HOOK_SEND_RESPONSE_HDR", "TS_LUA_HOOK_READ_REQUEST_HDR",
- "TS_LUA_HOOK_TXN_START", "TS_LUA_HOOK_PRE_REMAP", "TS_LUA_HOOK_POST_REMAP", "TS_LUA_HOOK_OS_DNS",
- "TS_LUA_HOOK_SELECT_ALT", "TS_LUA_HOOK_READ_CACHE_HDR", "TS_LUA_HOOK_TXN_CLOSE",
- "TS_LUA_REQUEST_TRANSFORM", "TS_LUA_RESPONSE_TRANSFORM", "TS_LUA_HOOK_LAST"};
-
+char *ts_lua_hook_id_string[] = {"TS_LUA_HOOK_DUMMY",
+ "TS_LUA_HOOK_CACHE_LOOKUP_COMPLETE",
+ "TS_LUA_HOOK_SEND_REQUEST_HDR",
+ "TS_LUA_HOOK_READ_RESPONSE_HDR",
+ "TS_LUA_HOOK_SEND_RESPONSE_HDR",
+ "TS_LUA_HOOK_READ_REQUEST_HDR",
+ "TS_LUA_HOOK_TXN_START",
+ "TS_LUA_HOOK_PRE_REMAP",
+ "TS_LUA_HOOK_POST_REMAP",
+ "TS_LUA_HOOK_OS_DNS",
+ "TS_LUA_HOOK_SELECT_ALT",
+ "TS_LUA_HOOK_READ_CACHE_HDR",
+ "TS_LUA_HOOK_TXN_CLOSE",
+ "TS_LUA_REQUEST_TRANSFORM",
+ "TS_LUA_RESPONSE_TRANSFORM",
+ "TS_LUA_HOOK_LAST"};
static int ts_lua_add_hook(lua_State *L);
static void ts_lua_inject_hook_variables(lua_State *L);
-
void
ts_lua_inject_hook_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_hook.h b/plugins/experimental/ts_lua/ts_lua_hook.h
index 24aeb21..c6cd74c 100644
--- a/plugins/experimental/ts_lua/ts_lua_hook.h
+++ b/plugins/experimental/ts_lua/ts_lua_hook.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_HOOK_H
#define _TS_LUA_HOOK_H
diff --git a/plugins/experimental/ts_lua/ts_lua_http.c b/plugins/experimental/ts_lua/ts_lua_http.c
index c887d2a..a995a40 100644
--- a/plugins/experimental/ts_lua/ts_lua_http.c
+++ b/plugins/experimental/ts_lua/ts_lua_http.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
#include "ts_lua_http_intercept.h"
#include "ts_lua_http_config.h"
diff --git a/plugins/experimental/ts_lua/ts_lua_http.h b/plugins/experimental/ts_lua/ts_lua_http.h
index 021487b..5e72286 100644
--- a/plugins/experimental/ts_lua/ts_lua_http.h
+++ b/plugins/experimental/ts_lua/ts_lua_http.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_HTTP_H
#define _TS_LUA_HTTP_H
diff --git a/plugins/experimental/ts_lua/ts_lua_http_cntl.c b/plugins/experimental/ts_lua/ts_lua_http_cntl.c
index b12da71..5f9b80e 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_cntl.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_cntl.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
typedef enum {
@@ -26,18 +25,15 @@ typedef enum {
TS_LUA_HTTP_CNTL_SET_INTERCEPT_RETRY_MODE = TS_HTTP_CNTL_SET_INTERCEPT_RETRY_MODE
} TSLuaHttpCntlType;
-
ts_lua_var_item ts_lua_http_cntl_type_vars[] = {
TS_LUA_MAKE_VAR_ITEM(TS_LUA_HTTP_CNTL_GET_LOGGING_MODE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_HTTP_CNTL_SET_LOGGING_MODE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_HTTP_CNTL_GET_INTERCEPT_RETRY_MODE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_HTTP_CNTL_SET_INTERCEPT_RETRY_MODE)};
-
static void ts_lua_inject_http_cntl_variables(lua_State *L);
static int ts_lua_http_cntl_set(lua_State *L);
static int ts_lua_http_cntl_get(lua_State *L);
-
void
ts_lua_inject_http_cntl_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_http_cntl.h b/plugins/experimental/ts_lua/ts_lua_http_cntl.h
index ebab1a7..e4d813b 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_cntl.h
+++ b/plugins/experimental/ts_lua/ts_lua_http_cntl.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_HTTP_CNTL_H
#define _TS_LUA_HTTP_CNTL_H
diff --git a/plugins/experimental/ts_lua/ts_lua_http_config.c b/plugins/experimental/ts_lua/ts_lua_http_config.c
index ea1dc18..8b0ddf4 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_config.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_config.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
typedef enum {
@@ -126,24 +125,31 @@ typedef enum {
} TSLuaTimeoutKey;
ts_lua_var_item ts_lua_http_config_vars[] = {
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_URL_REMAP_PRISTINE_HOST_HDR), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CHUNKING_ENABLED),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_URL_REMAP_PRISTINE_HOST_HDR),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CHUNKING_ENABLED),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_NEGATIVE_CACHING_ENABLED),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_NEGATIVE_CACHING_LIFETIME),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_POST_OUT),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_KEEP_ALIVE_POST_OUT),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_OPTION_FLAG_OUT),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_OPTION_FLAG_OUT),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_FORWARD_PROXY_AUTH_TO_PARENT),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_USER_AGENT),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_ENABLED),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SERVER_TCP_INIT_CWND), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SEND_HTTP11_REQUESTS),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_HTTP), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_CLUSTER_CACHE_LOCAL),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SERVER_TCP_INIT_CWND),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SEND_HTTP11_REQUESTS),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_HTTP),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_CLUSTER_CACHE_LOCAL),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_IGNORE_CLIENT_NO_CACHE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_IGNORE_CLIENT_CC_MAX_AGE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_IMS_ON_CLIENT_NO_CACHE),
@@ -151,7 +157,8 @@ ts_lua_var_item ts_lua_http_config_vars[] = {
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_CACHE_RESPONSES_TO_COOKIES),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_IGNORE_AUTHENTICATION),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_CACHE_URLS_THAT_LOOK_DYNAMIC),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_REQUIRED_HEADERS), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_INSERT_REQUEST_VIA_STR),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_REQUIRED_HEADERS),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_INSERT_REQUEST_VIA_STR),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_INSERT_RESPONSE_VIA_STR),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_MIN_LIFETIME),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_MAX_LIFETIME),
@@ -170,37 +177,50 @@ ts_lua_var_item ts_lua_http_config_vars[] = {
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CONNECT_ATTEMPTS_TIMEOUT),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_POST_CONNECT_ATTEMPTS_TIMEOUT),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DOWN_SERVER_CACHE_TIME),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DOWN_SERVER_ABORT_THRESHOLD), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_FUZZ_TIME),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DOWN_SERVER_ABORT_THRESHOLD),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_FUZZ_TIME),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_BACKGROUND_FILL_ACTIVE_TIMEOUT),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_STR), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_STR),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_FUZZ_PROBABILITY),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_BACKGROUND_FILL_COMPLETED_THRESHOLD),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_PACKET_MARK_OUT), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_PACKET_TOS_OUT),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_INSERT_AGE_IN_RESPONSE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CHUNKING_SIZE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_PACKET_MARK_OUT),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_NET_SOCK_PACKET_TOS_OUT),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_INSERT_AGE_IN_RESPONSE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CHUNKING_SIZE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_FLOW_CONTROL_ENABLED),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_FLOW_CONTROL_LOW_WATER_MARK),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER_MARK),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_RANGE_LOOKUP), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_NORMALIZE_AE_GZIP),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DEFAULT_BUFFER_SIZE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DEFAULT_BUFFER_WATER_MARK),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_RANGE_LOOKUP),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_NORMALIZE_AE_GZIP),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DEFAULT_BUFFER_SIZE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_DEFAULT_BUFFER_WATER_MARK),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_RESPONSE_HEADER_MAX_SIZE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_NEGATIVE_REVALIDATING_ENABLED),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_NEGATIVE_REVALIDATING_LIFETIME),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_SSL_HSTS_MAX_AGE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_SSL_HSTS_MAX_AGE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_RANGE_WRITE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_RANGE_WRITE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_POST_CHECK_CONTENT_LENGTH_ENABLED),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SLOW_LOG_THRESHOLD),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_GENERATION), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_BODY_FACTORY_TEMPLATE_BASE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_SLOW_LOG_THRESHOLD),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_GENERATION),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_BODY_FACTORY_TEMPLATE_BASE),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_OPEN_WRITE_FAIL_ACTION),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ENABLE_REDIRECTION), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_NUMBER_OF_REDIRECTIONS),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ENABLE_REDIRECTION),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_NUMBER_OF_REDIRECTIONS),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY),
TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_LAST_ENTRY),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_LAST_ENTRY),
};
// Needed to make sure we have the latest list of overridable http config vars when compiling
diff --git a/plugins/experimental/ts_lua/ts_lua_http_config.h b/plugins/experimental/ts_lua/ts_lua_http_config.h
index f8e71ef..6df634d 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_config.h
+++ b/plugins/experimental/ts_lua/ts_lua_http_config.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_HTTP_CONFIG_H
#define _TS_LUA_HTTP_CONFIG_H
diff --git a/plugins/experimental/ts_lua/ts_lua_http_intercept.c b/plugins/experimental/ts_lua/ts_lua_http_intercept.c
index 58467ca..b84ab51 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_intercept.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_intercept.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
#include "ts_lua_http_intercept.h"
@@ -37,7 +36,6 @@ static int ts_lua_flush_wakeup(ts_lua_http_intercept_ctx *ictx);
static int ts_lua_flush_wakeup_handler(TSCont contp, TSEvent event, void *edata);
static int ts_lua_flush_cleanup(ts_lua_async_item *ai);
-
void
ts_lua_inject_http_intercept_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_http_intercept.h b/plugins/experimental/ts_lua/ts_lua_http_intercept.h
index 27804f0..00f0e1b 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_intercept.h
+++ b/plugins/experimental/ts_lua/ts_lua_http_intercept.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_HTTP_INTERCEPT_H
#define _TS_LUA_HTTP_INTERCEPT_H
diff --git a/plugins/experimental/ts_lua/ts_lua_http_milestone.c b/plugins/experimental/ts_lua/ts_lua_http_milestone.c
index 82bf25e..8930fe2 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_milestone.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_milestone.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
typedef enum {
@@ -44,26 +43,33 @@ typedef enum {
TS_LUA_MILESTONE_PLUGIN_TOTAL = TS_MILESTONE_PLUGIN_TOTAL
} TSLuaMilestoneType;
-
-ts_lua_var_item ts_lua_milestone_type_vars[] = {
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_BEGIN), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_FIRST_READ),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_READ_HEADER_DONE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_BEGIN_WRITE),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_CLOSE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_FIRST_CONNECT),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_CONNECT), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_CONNECT_END),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_BEGIN_WRITE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_FIRST_READ),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_READ_HEADER_DONE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_CLOSE),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_CACHE_OPEN_READ_BEGIN), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_CACHE_OPEN_READ_END),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_CACHE_OPEN_WRITE_BEGIN), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_CACHE_OPEN_WRITE_END),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_DNS_LOOKUP_BEGIN), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_DNS_LOOKUP_END),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SM_START), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SM_FINISH),
- TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_PLUGIN_ACTIVE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_PLUGIN_TOTAL)};
-
+ts_lua_var_item ts_lua_milestone_type_vars[] = {TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_BEGIN),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_FIRST_READ),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_READ_HEADER_DONE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_BEGIN_WRITE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_CLOSE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_FIRST_CONNECT),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_CONNECT),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_CONNECT_END),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_BEGIN_WRITE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_FIRST_READ),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_READ_HEADER_DONE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SERVER_CLOSE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_CACHE_OPEN_READ_BEGIN),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_CACHE_OPEN_READ_END),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_CACHE_OPEN_WRITE_BEGIN),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_CACHE_OPEN_WRITE_END),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_DNS_LOOKUP_BEGIN),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_DNS_LOOKUP_END),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SM_START),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_SM_FINISH),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_PLUGIN_ACTIVE),
+ TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_PLUGIN_TOTAL)};
static void ts_lua_inject_http_milestone_variables(lua_State *L);
static int ts_lua_http_milestone_get(lua_State *L);
-
void
ts_lua_inject_http_milestone_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_http_milestone.h b/plugins/experimental/ts_lua/ts_lua_http_milestone.h
index 0b178d2..5ebe40b 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_milestone.h
+++ b/plugins/experimental/ts_lua/ts_lua_http_milestone.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_HTTP_MILESTONE_H
#define _TS_LUA_HTTP_MILESTONE_H
diff --git a/plugins/experimental/ts_lua/ts_lua_log.c b/plugins/experimental/ts_lua/ts_lua_log.c
index 5337641..e96472b 100644
--- a/plugins/experimental/ts_lua/ts_lua_log.c
+++ b/plugins/experimental/ts_lua/ts_lua_log.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
static TSTextLogObject log;
@@ -25,7 +24,6 @@ static int ts_lua_log_object_creat(lua_State *L);
static int ts_lua_log_object_write(lua_State *L);
static int ts_lua_log_object_destroy(lua_State *L);
-
static void ts_lua_inject_log_object_creat_api(lua_State *L);
static void ts_lua_inject_log_object_write_api(lua_State *L);
static void ts_lua_inject_log_object_destroy_api(lua_State *L);
diff --git a/plugins/experimental/ts_lua/ts_lua_log.h b/plugins/experimental/ts_lua/ts_lua_log.h
index 6b386ba..327f3b2 100644
--- a/plugins/experimental/ts_lua/ts_lua_log.h
+++ b/plugins/experimental/ts_lua/ts_lua_log.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_LOG_H
#define _TS_LUA_LOG_H
diff --git a/plugins/experimental/ts_lua/ts_lua_mgmt.c b/plugins/experimental/ts_lua/ts_lua_mgmt.c
index d15008f..c322529 100644
--- a/plugins/experimental/ts_lua/ts_lua_mgmt.c
+++ b/plugins/experimental/ts_lua/ts_lua_mgmt.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
static int ts_lua_mgmt_get_int(lua_State *L);
@@ -24,7 +23,6 @@ static int ts_lua_mgmt_get_counter(lua_State *L);
static int ts_lua_mgmt_get_float(lua_State *L);
static int ts_lua_mgmt_get_string(lua_State *L);
-
void
ts_lua_inject_mgmt_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_mgmt.h b/plugins/experimental/ts_lua/ts_lua_mgmt.h
index 6ddee05..6ee9cb6 100644
--- a/plugins/experimental/ts_lua/ts_lua_mgmt.h
+++ b/plugins/experimental/ts_lua/ts_lua_mgmt.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_MGMT_H
#define _TS_LUA_MGMT_H
diff --git a/plugins/experimental/ts_lua/ts_lua_misc.c b/plugins/experimental/ts_lua/ts_lua_misc.c
index c562a58..13206cb 100644
--- a/plugins/experimental/ts_lua/ts_lua_misc.c
+++ b/plugins/experimental/ts_lua/ts_lua_misc.c
@@ -16,10 +16,8 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
-
static int ts_lua_get_now_time(lua_State *L);
static int ts_lua_debug(lua_State *L);
static int ts_lua_error(lua_State *L);
diff --git a/plugins/experimental/ts_lua/ts_lua_misc.h b/plugins/experimental/ts_lua/ts_lua_misc.h
index 58c2bec..04b4f75 100644
--- a/plugins/experimental/ts_lua/ts_lua_misc.h
+++ b/plugins/experimental/ts_lua/ts_lua_misc.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_MISC_H
#define _TS_LUA_MISC_H
diff --git a/plugins/experimental/ts_lua/ts_lua_package.c b/plugins/experimental/ts_lua/ts_lua_package.c
index 2f9bbdb..f7c383c 100644
--- a/plugins/experimental/ts_lua/ts_lua_package.c
+++ b/plugins/experimental/ts_lua/ts_lua_package.c
@@ -16,19 +16,16 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
#define TS_LUA_MAX_PACKAGE_PATH_LEN 256
#define TS_LUA_MAX_PACKAGE_NUM 64
-
typedef struct {
size_t len;
char *name;
} ts_lua_package_path;
-
static int path_cnt = 0;
static ts_lua_package_path path[TS_LUA_MAX_PACKAGE_NUM];
@@ -41,13 +38,11 @@ static ts_lua_package_path g_path[TS_LUA_MAX_PACKAGE_NUM];
static int g_cpath_cnt = 0;
static ts_lua_package_path g_cpath[TS_LUA_MAX_PACKAGE_NUM];
-
static int ts_lua_add_package_path(lua_State *L);
static int ts_lua_add_package_cpath(lua_State *L);
static int ts_lua_add_package_path_items(lua_State *L, ts_lua_package_path *pp, int n);
static int ts_lua_add_package_cpath_items(lua_State *L, ts_lua_package_path *pp, int n);
-
void
ts_lua_inject_package_api(lua_State *L)
{
@@ -205,7 +200,6 @@ ts_lua_add_package_path_items(lua_State *L, ts_lua_package_path *pp, int n)
return 0;
}
-
static int
ts_lua_add_package_cpath(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_package.h b/plugins/experimental/ts_lua/ts_lua_package.h
index 234dfda..4eabbdf 100644
--- a/plugins/experimental/ts_lua/ts_lua_package.h
+++ b/plugins/experimental/ts_lua/ts_lua_package.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_PACKAGE_H
#define _TS_LUA_PACKAGE_H
diff --git a/plugins/experimental/ts_lua/ts_lua_remap.c b/plugins/experimental/ts_lua/ts_lua_remap.c
index 1b53788..fd3e66e 100644
--- a/plugins/experimental/ts_lua/ts_lua_remap.c
+++ b/plugins/experimental/ts_lua/ts_lua_remap.c
@@ -16,11 +16,9 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
#include "ts_lua_remap.h"
-
typedef enum {
TS_LUA_REMAP_NO_REMAP = TSREMAP_NO_REMAP,
TS_LUA_REMAP_DID_REMAP = TSREMAP_DID_REMAP,
@@ -48,7 +46,6 @@ static int ts_lua_remap_get_to_url(lua_State *L);
static void ts_lua_inject_remap_variables(lua_State *L);
-
void
ts_lua_inject_remap_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_remap.h b/plugins/experimental/ts_lua/ts_lua_remap.h
index dcc3c6a..2d2952a 100644
--- a/plugins/experimental/ts_lua/ts_lua_remap.h
+++ b/plugins/experimental/ts_lua/ts_lua_remap.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_REMAP_H
#define _TS_LUA_REMAP_H
diff --git a/plugins/experimental/ts_lua/ts_lua_server_request.c b/plugins/experimental/ts_lua/ts_lua_server_request.c
index 83d05a4..fbbe737 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_server_request.c
@@ -29,7 +29,6 @@
} \
} while (0)
-
#define TS_LUA_CHECK_SERVER_REQUEST_URL(http_ctx) \
do { \
if (!http_ctx->server_request_url) { \
diff --git a/plugins/experimental/ts_lua/ts_lua_server_request.h b/plugins/experimental/ts_lua/ts_lua_server_request.h
index c98b011..e2df6db 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_request.h
+++ b/plugins/experimental/ts_lua/ts_lua_server_request.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_SERVER_REQUEST_H
#define _TS_LUA_SERVER_REQUEST_H
diff --git a/plugins/experimental/ts_lua/ts_lua_server_response.c b/plugins/experimental/ts_lua/ts_lua_server_response.c
index caa35d2..dbf1fbb 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_server_response.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
#define TS_LUA_CHECK_SERVER_RESPONSE_HDR(http_ctx) \
@@ -29,7 +28,6 @@
} \
} while (0)
-
static void ts_lua_inject_server_response_header_api(lua_State *L);
static void ts_lua_inject_server_response_headers_api(lua_State *L);
static void ts_lua_inject_server_response_misc_api(lua_State *L);
@@ -45,7 +43,6 @@ static int ts_lua_server_response_set_status(lua_State *L);
static int ts_lua_server_response_get_version(lua_State *L);
static int ts_lua_server_response_set_version(lua_State *L);
-
void
ts_lua_inject_server_response_api(lua_State *L)
{
@@ -58,7 +55,6 @@ ts_lua_inject_server_response_api(lua_State *L)
lua_setfield(L, -2, "server_response");
}
-
static void
ts_lua_inject_server_response_header_api(lua_State *L)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_server_response.h b/plugins/experimental/ts_lua/ts_lua_server_response.h
index 8541dfb..57eddac 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_response.h
+++ b/plugins/experimental/ts_lua/ts_lua_server_response.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_SERVER_RESPONSE_H
#define _TS_LUA_SERVER_RESPONSE_H
diff --git a/plugins/experimental/ts_lua/ts_lua_stat.c b/plugins/experimental/ts_lua/ts_lua_stat.c
index cda400d..d74bf38 100644
--- a/plugins/experimental/ts_lua/ts_lua_stat.c
+++ b/plugins/experimental/ts_lua/ts_lua_stat.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
typedef enum {
diff --git a/plugins/experimental/ts_lua/ts_lua_stat.h b/plugins/experimental/ts_lua/ts_lua_stat.h
index 79efa43..c2541d2 100644
--- a/plugins/experimental/ts_lua/ts_lua_stat.h
+++ b/plugins/experimental/ts_lua/ts_lua_stat.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_STAT_H
#define _TS_LUA_STAT_H
diff --git a/plugins/experimental/ts_lua/ts_lua_string.h b/plugins/experimental/ts_lua/ts_lua_string.h
index 41a34b9..02b5feb 100644
--- a/plugins/experimental/ts_lua/ts_lua_string.h
+++ b/plugins/experimental/ts_lua/ts_lua_string.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_STRING_H
#define _TS_LUA_STRING_H
diff --git a/plugins/experimental/ts_lua/ts_lua_transform.c b/plugins/experimental/ts_lua/ts_lua_transform.c
index f7e2175..3136155 100644
--- a/plugins/experimental/ts_lua/ts_lua_transform.c
+++ b/plugins/experimental/ts_lua/ts_lua_transform.c
@@ -16,13 +16,10 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
-
static int ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx, TSEvent event, int n);
-
int
ts_lua_transform_entry(TSCont contp, TSEvent ev, void *edata)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_transform.h b/plugins/experimental/ts_lua/ts_lua_transform.h
index 8c9bb22..44070bb 100644
--- a/plugins/experimental/ts_lua/ts_lua_transform.h
+++ b/plugins/experimental/ts_lua/ts_lua_transform.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_TRANSFORM_H
#define _TS_LUA_TRANSFORM_H
diff --git a/plugins/experimental/ts_lua/ts_lua_util.c b/plugins/experimental/ts_lua/ts_lua_util.c
index b212f35..a9f33e9 100644
--- a/plugins/experimental/ts_lua/ts_lua_util.c
+++ b/plugins/experimental/ts_lua/ts_lua_util.c
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#include "ts_lua_util.h"
#include "ts_lua_remap.h"
#include "ts_lua_constant.h"
@@ -42,7 +41,6 @@ static void ts_lua_init_registry(lua_State *L);
static void ts_lua_init_globals(lua_State *L);
static void ts_lua_inject_ts_api(lua_State *L);
-
int
ts_lua_create_vm(ts_lua_main_ctx *arr, int n)
{
@@ -449,7 +447,6 @@ ts_lua_create_http_ctx(ts_lua_main_ctx *main_ctx, ts_lua_instance_conf *conf)
return http_ctx;
}
-
void
ts_lua_destroy_http_ctx(ts_lua_http_ctx *http_ctx)
{
diff --git a/plugins/experimental/ts_lua/ts_lua_util.h b/plugins/experimental/ts_lua/ts_lua_util.h
index e3dc9a9..f0f3347 100644
--- a/plugins/experimental/ts_lua/ts_lua_util.h
+++ b/plugins/experimental/ts_lua/ts_lua_util.h
@@ -16,7 +16,6 @@
limitations under the License.
*/
-
#ifndef _TS_LUA_UTIL_H
#define _TS_LUA_UTIL_H
diff --git a/plugins/experimental/webp_transform/ImageTransform.cc b/plugins/experimental/webp_transform/ImageTransform.cc
index b5d22bb..2a839e2 100644
--- a/plugins/experimental/webp_transform/ImageTransform.cc
+++ b/plugins/experimental/webp_transform/ImageTransform.cc
@@ -76,12 +76,10 @@ public:
}
virtual ~ImageTransform() {}
-
private:
std::stringstream _img;
};
-
class GlobalHookPlugin : public GlobalPlugin
{
public:
diff --git a/plugins/experimental/xdebug/xdebug.cc b/plugins/experimental/xdebug/xdebug.cc
index f970880..2a0a94b 100644
--- a/plugins/experimental/xdebug/xdebug.cc
+++ b/plugins/experimental/xdebug/xdebug.cc
@@ -30,7 +30,6 @@ static struct {
int len;
} xDebugHeader = {NULL, 0};
-
#define XHEADER_X_CACHE_KEY 0x0004u
#define XHEADER_X_MILESTONES 0x0008u
#define XHEADER_X_CACHE 0x0010u
@@ -42,7 +41,7 @@ static TSCont XInjectHeadersCont = NULL;
// Return the length of a string literal.
template <int N>
unsigned
-lengthof(const char(&)[N])
+lengthof(const char (&)[N])
{
return N - 1;
}
@@ -392,7 +391,6 @@ TSPluginInit(int argc, const char *argv[])
}
xDebugHeader.len = strlen(xDebugHeader.str);
-
// Setup the global hook
TSReleaseAssert(TSHttpArgIndexReserve("xdebug", "xdebug header requests", &XArgIndex) == TS_SUCCESS);
TSReleaseAssert(XInjectHeadersCont = TSContCreate(XInjectResponseHeaders, NULL));
diff --git a/plugins/gzip/configuration.h b/plugins/gzip/configuration.h
index 86863a9..04ff023 100644
--- a/plugins/gzip/configuration.h
+++ b/plugins/gzip/configuration.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef GZIP_CONFIGURATION_H_
#define GZIP_CONFIGURATION_H_
@@ -140,7 +139,6 @@ public:
private:
explicit Configuration() {}
-
void add_host_configuration(HostConfiguration *hc);
HostContainer host_configurations_;
diff --git a/plugins/gzip/gzip.cc b/plugins/gzip/gzip.cc
index 2d345a6..8c978b7 100644
--- a/plugins/gzip/gzip.cc
+++ b/plugins/gzip/gzip.cc
@@ -55,7 +55,6 @@ const char *dictionary = NULL;
Configuration *cur_config = NULL;
Configuration *prev_config = NULL;
-
static GzipData *
gzip_data_alloc(int compression_type)
{
@@ -98,7 +97,6 @@ gzip_data_alloc(int compression_type)
return data;
}
-
static void
gzip_data_destroy(GzipData *data)
{
@@ -247,7 +245,6 @@ gzip_transform_init(TSCont contp, GzipData *data)
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
}
-
static void
gzip_transform_one(GzipData *data, TSIOBufferReader upstream_reader, int amount)
{
@@ -355,7 +352,6 @@ gzip_transform_finish(GzipData *data)
}
}
-
static void
gzip_transform_do(TSCont contp)
{
@@ -418,7 +414,6 @@ gzip_transform_do(TSCont contp)
}
}
-
static int
gzip_transform(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
{
@@ -452,7 +447,6 @@ gzip_transform(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
return 0;
}
-
static int
gzip_transformable(TSHttpTxn txnp, bool server, HostConfiguration *host_configuration, int *compress_type)
{
@@ -576,7 +570,6 @@ gzip_transformable(TSHttpTxn txnp, bool server, HostConfiguration *host_configur
return rv;
}
-
static void
gzip_transform_add(TSHttpTxn txnp, HostConfiguration *hc, int compress_type)
{
@@ -600,7 +593,6 @@ gzip_transform_add(TSHttpTxn txnp, HostConfiguration *hc, int compress_type)
TSHttpTxnHookAdd(txnp, TS_HTTP_RESPONSE_TRANSFORM_HOOK, connp);
}
-
HostConfiguration *
find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc locp)
{
@@ -693,7 +685,6 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
static int
transform_global_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
@@ -774,7 +765,6 @@ management_update(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
return 0;
}
-
void
TSPluginInit(int argc, const char *argv[])
{
diff --git a/plugins/gzip/misc.h b/plugins/gzip/misc.h
index 3c943c6..85ad218 100644
--- a/plugins/gzip/misc.h
+++ b/plugins/gzip/misc.h
@@ -65,7 +65,6 @@ typedef struct {
int compression_type;
} GzipData;
-
voidpf gzip_alloc(voidpf opaque, uInt items, uInt size);
void gzip_free(voidpf opaque, voidpf address);
void normalize_accept_encoding(TSHttpTxn txnp, TSMBuffer reqp, TSMLoc hdr_loc);
diff --git a/plugins/header_rewrite/condition.cc b/plugins/header_rewrite/condition.cc
index 834d6bd..f407778 100644
--- a/plugins/header_rewrite/condition.cc
+++ b/plugins/header_rewrite/condition.cc
@@ -25,7 +25,6 @@
#include "condition.h"
-
static MatcherOps
parse_matcher_op(std::string &arg)
{
@@ -53,7 +52,6 @@ parse_matcher_op(std::string &arg)
}
}
-
void
Condition::initialize(Parser &p)
{
diff --git a/plugins/header_rewrite/condition.h b/plugins/header_rewrite/condition.h
index 47cb244..b703930 100644
--- a/plugins/header_rewrite/condition.h
+++ b/plugins/header_rewrite/condition.h
@@ -31,7 +31,6 @@
#include "matcher.h"
#include "parser.h"
-
// Condition modifiers
enum CondModifiers {
COND_NONE = 0,
@@ -43,7 +42,6 @@ enum CondModifiers {
COND_CHAIN = 32 // Not implemented
};
-
///////////////////////////////////////////////////////////////////////////////
// Base class for all Conditions (this is also the interface)
//
@@ -129,5 +127,4 @@ private:
CondModifiers _mods;
};
-
#endif // __CONDITION_H
diff --git a/plugins/header_rewrite/conditions.cc b/plugins/header_rewrite/conditions.cc
index e197183..8298d7a 100644
--- a/plugins/header_rewrite/conditions.cc
+++ b/plugins/header_rewrite/conditions.cc
@@ -45,7 +45,6 @@ ConditionStatus::initialize(Parser &p)
require_resources(RSRC_RESPONSE_STATUS);
}
-
void
ConditionStatus::initialize_hooks()
{
@@ -53,7 +52,6 @@ ConditionStatus::initialize_hooks()
add_allowed_hook(TS_HTTP_SEND_RESPONSE_HDR_HOOK);
}
-
bool
ConditionStatus::eval(const Resources &res)
{
@@ -61,7 +59,6 @@ ConditionStatus::eval(const Resources &res)
return static_cast<const Matchers<TSHttpStatus> *>(_matcher)->test(res.resp_status);
}
-
void
ConditionStatus::append_value(std::string &s, const Resources &res)
{
@@ -71,7 +68,6 @@ ConditionStatus::append_value(std::string &s, const Resources &res)
TSDebug(PLUGIN_NAME, "Appending STATUS(%d) to evaluation value -> %s", res.resp_status, s.c_str());
}
-
// ConditionMethod
void
ConditionMethod::initialize(Parser &p)
@@ -95,7 +91,6 @@ ConditionMethod::eval(const Resources &res)
return rval;
}
-
void
ConditionMethod::append_value(std::string &s, const Resources &res)
{
@@ -114,7 +109,6 @@ ConditionMethod::append_value(std::string &s, const Resources &res)
}
}
-
// ConditionRandom: random 0 to (N-1)
void
ConditionRandom::initialize(Parser &p)
@@ -131,7 +125,6 @@ ConditionRandom::initialize(Parser &p)
_matcher = match;
}
-
bool
ConditionRandom::eval(const Resources & /* res ATS_UNUSED */)
{
@@ -139,7 +132,6 @@ ConditionRandom::eval(const Resources & /* res ATS_UNUSED */)
return static_cast<const Matchers<unsigned int> *>(_matcher)->test(rand_r(&_seed) % _max);
}
-
void
ConditionRandom::append_value(std::string &s, const Resources & /* res ATS_UNUSED */)
{
@@ -150,7 +142,6 @@ ConditionRandom::append_value(std::string &s, const Resources & /* res ATS_UNUSE
TSDebug(PLUGIN_NAME, "Appending RANDOM(%d) to evaluation value -> %s", _max, s.c_str());
}
-
// ConditionAccess: access(file)
void
ConditionAccess::initialize(Parser &p)
@@ -164,7 +155,6 @@ ConditionAccess::initialize(Parser &p)
_last = !access(_qualifier.c_str(), R_OK);
}
-
void
ConditionAccess::append_value(std::string &s, const Resources &res)
{
@@ -175,7 +165,6 @@ ConditionAccess::append_value(std::string &s, const Resources &res)
}
}
-
bool
ConditionAccess::eval(const Resources & /* res ATS_UNUSED */)
{
@@ -198,7 +187,6 @@ ConditionAccess::eval(const Resources & /* res ATS_UNUSED */)
return _last;
}
-
// ConditionHeader: request or response header
void
ConditionHeader::initialize(Parser &p)
@@ -215,7 +203,6 @@ ConditionHeader::initialize(Parser &p)
require_resources(RSRC_SERVER_RESPONSE_HEADERS);
}
-
void
ConditionHeader::append_value(std::string &s, const Resources &res)
{
@@ -264,7 +251,6 @@ ConditionHeader::eval(const Resources &res)
return rval;
}
-
// ConditionPath
void
ConditionPath::initialize(Parser &p)
@@ -304,7 +290,6 @@ ConditionPath::eval(const Resources &res)
return static_cast<const Matchers<std::string> *>(_matcher)->test(s);
}
-
// ConditionQuery
void
ConditionQuery::initialize(Parser &p)
@@ -340,7 +325,6 @@ ConditionQuery::eval(const Resources &res)
return static_cast<const Matchers<std::string> *>(_matcher)->test(s);
}
-
// ConditionUrl: request or response header. TODO: This is not finished, at all!!!
void
ConditionUrl::initialize(Parser &p)
@@ -352,7 +336,6 @@ ConditionUrl::initialize(Parser &p)
_matcher = match;
}
-
void
ConditionUrl::set_qualifier(const std::string &q)
{
@@ -362,13 +345,11 @@ ConditionUrl::set_qualifier(const std::string &q)
_url_qual = parse_url_qualifier(q);
}
-
void
ConditionUrl::append_value(std::string & /* s ATS_UNUSED */, const Resources & /* res ATS_UNUSED */)
{
}
-
bool
ConditionUrl::eval(const Resources &res)
{
@@ -422,7 +403,6 @@ ConditionUrl::eval(const Resources &res)
return static_cast<const Matchers<std::string> *>(_matcher)->test(s);
}
-
// ConditionDBM: do a lookup against a DBM
void
ConditionDBM::initialize(Parser &p)
@@ -449,7 +429,6 @@ ConditionDBM::initialize(Parser &p)
}
}
-
void
ConditionDBM::append_value(std::string & /* s ATS_UNUSED */, const Resources & /* res ATS_UNUSED */)
{
@@ -476,7 +455,6 @@ ConditionDBM::append_value(std::string & /* s ATS_UNUSED */, const Resources & /
// }
}
-
bool
ConditionDBM::eval(const Resources &res)
{
@@ -488,7 +466,6 @@ ConditionDBM::eval(const Resources &res)
return static_cast<const Matchers<std::string> *>(_matcher)->test(s);
}
-
// ConditionCookie: request or response header
void
ConditionCookie::initialize(Parser &p)
@@ -622,7 +599,6 @@ ConditionIncomingPort::append_value(std::string &s, const Resources &res)
TSDebug(PLUGIN_NAME, "Appending %d to evaluation value -> %s", port, s.c_str());
}
-
// ConditionTransactCount
void
ConditionTransactCount::initialize(Parser &p)
@@ -667,7 +643,6 @@ ConditionTransactCount::append_value(std::string &s, Resources const &res)
}
}
-
// ConditionNow: time related conditions, such as time since epoch (default), hour, day etc.
// Time related functionality for statements. We return an int64_t here, to assure that
// gettimeofday() / Epoch does not lose bits.
@@ -772,7 +747,6 @@ ConditionNow::eval(const Resources &res)
return static_cast<const Matchers<int64_t> *>(_matcher)->test(now);
}
-
// ConditionGeo: Geo-based information (integer). See ConditionGeoCountry for the string version.
#if HAVE_GEOIP_H
const char *
@@ -927,7 +901,6 @@ ConditionGeo::get_geo_int(const sockaddr *addr) const
#endif
-
void
ConditionGeo::initialize(Parser &p)
{
diff --git a/plugins/header_rewrite/conditions.h b/plugins/header_rewrite/conditions.h
index 6e39fad..7a04b13 100644
--- a/plugins/header_rewrite/conditions.h
+++ b/plugins/header_rewrite/conditions.h
@@ -34,7 +34,6 @@
#include "lulu.h"
//#include <mdbm.h>
-
///////////////////////////////////////////////////////////////////////////////
// Condition declarations.
//
@@ -44,7 +43,6 @@ class ConditionTrue : public Condition
{
public:
ConditionTrue() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for ConditionTrue"); }
-
void
append_value(std::string &s, const Resources & /* res ATS_UNUSED */)
{
@@ -63,7 +61,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(ConditionTrue);
};
-
// Always false
class ConditionFalse : public Condition
{
@@ -87,7 +84,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(ConditionFalse);
};
-
// Check the HTTP return status
class ConditionStatus : public Condition
{
@@ -104,7 +100,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(ConditionStatus);
};
-
// Check the HTTP method
class ConditionMethod : public Condition
{
@@ -120,7 +115,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(ConditionMethod);
};
-
// Random 0 to (N-1)
class ConditionRandom : public Condition
{
@@ -139,7 +133,6 @@ private:
unsigned int _max;
};
-
// access(file)
class ConditionAccess : public Condition
{
@@ -158,7 +151,6 @@ private:
bool _last;
};
-
// cookie(name)
class ConditionCookie : public Condition
{
@@ -220,7 +212,6 @@ private:
};
};
-
// header
class ConditionHeader : public Condition
{
@@ -242,13 +233,11 @@ private:
bool _client;
};
-
// path
class ConditionPath : public Condition
{
public:
explicit ConditionPath() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for ConditionPath"); };
-
void initialize(Parser &p);
void append_value(std::string &s, const Resources &res);
@@ -259,13 +248,11 @@ private:
DISALLOW_COPY_AND_ASSIGN(ConditionPath);
};
-
// query
class ConditionQuery : public Condition
{
public:
explicit ConditionQuery() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for ConditionQuery"); };
-
void initialize(Parser &p);
void append_value(std::string &s, const Resources &res);
@@ -276,14 +263,12 @@ private:
DISALLOW_COPY_AND_ASSIGN(ConditionQuery);
};
-
// url
class ConditionUrl : public Condition
{
public:
enum UrlType { CLIENT, URL, FROM, TO };
-
explicit ConditionUrl(const UrlType type) : _url_qual(URL_QUAL_NONE), _type(type)
{
TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for ConditionUrl");
@@ -303,7 +288,6 @@ private:
UrlType _type;
};
-
// DBM lookups
class ConditionDBM : public Condition
{
@@ -365,7 +349,6 @@ class ConditionIncomingPort : public Condition
{
public:
ConditionIncomingPort() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for ConditionIncomingPort"); }
-
void initialize(Parser &p);
void append_value(std::string &s, const Resources &res);
@@ -376,7 +359,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(ConditionIncomingPort);
};
-
// Transact Count
class ConditionTransactCount : public Condition
{
@@ -384,7 +366,6 @@ class ConditionTransactCount : public Condition
public:
ConditionTransactCount() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for ConditionTransactCount"); }
-
void initialize(Parser &p);
void append_value(std::string &s, const Resources &res);
@@ -395,13 +376,11 @@ private:
DISALLOW_COPY_AND_ASSIGN(ConditionTransactCount);
};
-
// now: Keeping track of current time / day / hour etc.
class ConditionNow : public Condition
{
public:
explicit ConditionNow() : _now_qual(NOW_QUAL_EPOCH) { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for ConditionNow"); };
-
void initialize(Parser &p);
void set_qualifier(const std::string &q);
void append_value(std::string &s, const Resources &res);
@@ -454,5 +433,4 @@ private:
bool _int_type;
};
-
#endif // __CONDITIONS_H
diff --git a/plugins/header_rewrite/expander.h b/plugins/header_rewrite/expander.h
index eacab00..d3a5d25 100644
--- a/plugins/header_rewrite/expander.h
+++ b/plugins/header_rewrite/expander.h
@@ -31,12 +31,10 @@ class VariableExpander
{
public:
VariableExpander(const std::string &source) : _source(source) {}
-
std::string expand(const Resources &res);
private:
std::string _source;
};
-
#endif // __EXPANDER_H
diff --git a/plugins/header_rewrite/factory.cc b/plugins/header_rewrite/factory.cc
index c4a2aa4..1bfddf7 100644
--- a/plugins/header_rewrite/factory.cc
+++ b/plugins/header_rewrite/factory.cc
@@ -24,7 +24,6 @@
#include "operators.h"
#include "conditions.h"
-
///////////////////////////////////////////////////////////////////////////////
// "Factory" functions, processing the parsed lines
//
@@ -69,7 +68,6 @@ operator_factory(const std::string &op)
return o;
}
-
Condition *
condition_factory(const std::string &cond)
{
diff --git a/plugins/header_rewrite/factory.h b/plugins/header_rewrite/factory.h
index db2dca0..2dc7b8a 100644
--- a/plugins/header_rewrite/factory.h
+++ b/plugins/header_rewrite/factory.h
@@ -30,5 +30,4 @@
Operator *operator_factory(const std::string &op);
Condition *condition_factory(const std::string &cond);
-
#endif
diff --git a/plugins/header_rewrite/header_rewrite.cc b/plugins/header_rewrite/header_rewrite.cc
index 7ebf5b4..6b15288 100644
--- a/plugins/header_rewrite/header_rewrite.cc
+++ b/plugins/header_rewrite/header_rewrite.cc
@@ -31,7 +31,6 @@
const char PLUGIN_NAME[] = "header_rewrite";
const char PLUGIN_NAME_DBG[] = "dbg_header_rewrite";
-
// Geo information, currently only Maxmind. These have to be initialized when the plugin loads.
#if HAVE_GEOIP_H
#include <GeoIP.h>
@@ -60,11 +59,9 @@ initGeoIP()
}
#endif
-
// Forward declaration for the main continuation.
static int cont_rewrite_headers(TSCont, TSEvent, void *);
-
// Simple wrapper around a configuration file / set. This is useful such that
// we can reuse most of the code for both global and per-remap rule sets.
class RulesConfig
@@ -144,7 +141,6 @@ RulesConfig::add_rule(RuleSet *rule)
return false;
}
-
///////////////////////////////////////////////////////////////////////////////
// Config parser, use to parse both the global, and per-remap, configurations.
//
@@ -253,7 +249,6 @@ RulesConfig::parse_config(const std::string fname, TSHttpHookID default_hook)
return true;
}
-
///////////////////////////////////////////////////////////////////////////////
// Continuation
//
@@ -313,7 +308,6 @@ cont_rewrite_headers(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
///////////////////////////////////////////////////////////////////////////////
// Initialize the InkAPI plugin for the global hooks we support.
//
@@ -367,7 +361,6 @@ TSPluginInit(int argc, const char *argv[])
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Initialize the plugin as a remap plugin.
//
@@ -396,7 +389,6 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
return TS_SUCCESS;
}
-
TSReturnCode
TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSED */, int /* errbuf_size ATS_UNUSED */)
{
@@ -441,7 +433,6 @@ TSRemapDeleteInstance(void *ih)
static_cast<RulesConfig *>(ih)->release();
}
-
///////////////////////////////////////////////////////////////////////////////
// This is the main "entry" point for the plugin, called for every request.
//
diff --git a/plugins/header_rewrite/header_rewrite_test.cc b/plugins/header_rewrite/header_rewrite_test.cc
index ff78beb..ed61801 100644
--- a/plugins/header_rewrite/header_rewrite_test.cc
+++ b/plugins/header_rewrite/header_rewrite_test.cc
@@ -65,7 +65,6 @@ class ParserTest : public Parser
{
public:
ParserTest(std::string line) : Parser(line) {}
-
std::vector<std::string>
getTokens()
{
diff --git a/plugins/header_rewrite/lulu.h b/plugins/header_rewrite/lulu.h
index 7f1d943..4693552 100644
--- a/plugins/header_rewrite/lulu.h
+++ b/plugins/header_rewrite/lulu.h
@@ -68,11 +68,9 @@ uint16_t getPort(sockaddr const *s_sockaddr);
extern const char PLUGIN_NAME[];
extern const char PLUGIN_NAME_DBG[];
-
// From google styleguide: http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName &); \
void operator=(const TypeName &)
-
#endif // __LULU_H__
diff --git a/plugins/header_rewrite/matcher.h b/plugins/header_rewrite/matcher.h
index 823131f..4340a88 100644
--- a/plugins/header_rewrite/matcher.h
+++ b/plugins/header_rewrite/matcher.h
@@ -30,7 +30,6 @@
#include "regex_helper.h"
#include "lulu.h"
-
// Possible operators that we support (at least partially)
enum MatcherOps {
MATCH_EQUAL,
@@ -39,7 +38,6 @@ enum MatcherOps {
MATCH_REGULAR_EXPRESSION,
};
-
///////////////////////////////////////////////////////////////////////////////
// Base class for all Matchers (this is also the interface)
//
@@ -47,7 +45,6 @@ class Matcher
{
public:
explicit Matcher(const MatcherOps op) : _pdata(NULL), _op(op) { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for Matcher"); }
-
virtual ~Matcher()
{
TSDebug(PLUGIN_NAME_DBG, "Calling DTOR for Matcher");
@@ -84,7 +81,6 @@ template <class T> class Matchers : public Matcher
{
public:
explicit Matchers<T>(const MatcherOps op) : Matcher(op), _data() {}
-
// Getters / setters
const T
get() const
diff --git a/plugins/header_rewrite/operator.h b/plugins/header_rewrite/operator.h
index f17ab06..846e5a7 100644
--- a/plugins/header_rewrite/operator.h
+++ b/plugins/header_rewrite/operator.h
@@ -30,7 +30,6 @@
#include "statement.h"
#include "parser.h"
-
// Operator modifiers
enum OperModifiers {
OPER_NONE = 0,
@@ -39,7 +38,6 @@ enum OperModifiers {
OPER_QSA = 4,
};
-
///////////////////////////////////////////////////////////////////////////////
// Base class for all Operators (this is also the interface)
//
@@ -47,7 +45,6 @@ class Operator : public Statement
{
public:
Operator() : _mods(OPER_NONE) { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for Operator"); }
-
void
do_exec(const Resources &res) const
{
@@ -69,7 +66,6 @@ private:
OperModifiers _mods;
};
-
///////////////////////////////////////////////////////////////////////////////
// Base class for all Header based Operators, this is obviously also an
// Operator interface.
@@ -78,7 +74,6 @@ class OperatorHeaders : public Operator
{
public:
OperatorHeaders() : _header("") { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for OperatorHeaders"); }
-
void initialize(Parser &p);
protected:
diff --git a/plugins/header_rewrite/operators.cc b/plugins/header_rewrite/operators.cc
index 4c3d795..b316879 100644
--- a/plugins/header_rewrite/operators.cc
+++ b/plugins/header_rewrite/operators.cc
@@ -42,7 +42,6 @@ OperatorSetConfig::initialize(Parser &p)
}
}
-
void
OperatorSetConfig::exec(const Resources &res) const
{
@@ -70,7 +69,6 @@ OperatorSetConfig::exec(const Resources &res) const
}
}
-
// OperatorSetStatus
void
OperatorSetStatus::initialize(Parser &p)
@@ -91,7 +89,6 @@ OperatorSetStatus::initialize(Parser &p)
require_resources(RSRC_RESPONSE_STATUS);
}
-
void
OperatorSetStatus::initialize_hooks()
{
@@ -102,7 +99,6 @@ OperatorSetStatus::initialize_hooks()
add_allowed_hook(TS_REMAP_PSEUDO_HOOK);
}
-
void
OperatorSetStatus::exec(const Resources &res) const
{
@@ -124,7 +120,6 @@ OperatorSetStatus::exec(const Resources &res) const
TSDebug(PLUGIN_NAME, "OperatorSetStatus::exec() invoked with status=%d", _status.get_int_value());
}
-
// OperatorSetStatusReason
void
OperatorSetStatusReason::initialize(Parser &p)
@@ -136,7 +131,6 @@ OperatorSetStatusReason::initialize(Parser &p)
require_resources(RSRC_SERVER_RESPONSE_HEADERS);
}
-
void
OperatorSetStatusReason::initialize_hooks()
{
@@ -158,7 +152,6 @@ OperatorSetStatusReason::exec(const Resources &res) const
}
}
-
// OperatorSetDestination
void
OperatorSetDestination::initialize(Parser &p)
@@ -171,7 +164,6 @@ OperatorSetDestination::initialize(Parser &p)
require_resources(RSRC_SERVER_REQUEST_HEADERS);
}
-
void
OperatorSetDestination::exec(const Resources &res) const
{
@@ -279,7 +271,6 @@ OperatorSetDestination::exec(const Resources &res) const
}
}
-
// OperatorSetRedirect
void
OperatorSetRedirect::initialize(Parser &p)
@@ -300,7 +291,6 @@ OperatorSetRedirect::initialize(Parser &p)
require_resources(RSRC_RESPONSE_STATUS);
}
-
void
OperatorSetRedirect::exec(const Resources &res) const
{
@@ -404,7 +394,6 @@ OperatorSetRedirect::exec(const Resources &res) const
}
}
-
// OperatorSetTimeoutOut
void
OperatorSetTimeoutOut::initialize(Parser &p)
@@ -427,7 +416,6 @@ OperatorSetTimeoutOut::initialize(Parser &p)
_timeout.set_value(p.get_value());
}
-
void
OperatorSetTimeoutOut::exec(const Resources &res) const
{
@@ -475,7 +463,6 @@ OperatorSkipRemap::exec(const Resources &res) const
TSSkipRemappingSet(res.txnp, _skip_remap ? 1 : 0);
}
-
// OperatorRMHeader
void
OperatorRMHeader::exec(const Resources &res) const
@@ -495,7 +482,6 @@ OperatorRMHeader::exec(const Resources &res) const
}
}
-
// OperatorAddHeader
void
OperatorAddHeader::initialize(Parser &p)
@@ -538,7 +524,6 @@ OperatorAddHeader::exec(const Resources &res) const
}
}
-
// OperatorSetHeader
void
OperatorSetHeader::initialize(Parser &p)
diff --git a/plugins/header_rewrite/operators.h b/plugins/header_rewrite/operators.h
index 95a9a38..b6ec68c 100644
--- a/plugins/header_rewrite/operators.h
+++ b/plugins/header_rewrite/operators.h
@@ -30,7 +30,6 @@
#include "resources.h"
#include "value.h"
-
///////////////////////////////////////////////////////////////////////////////
// Operator declarations.
//
@@ -56,7 +55,6 @@ private:
Value _value;
};
-
class OperatorSetStatus : public Operator
{
public:
@@ -75,7 +73,6 @@ private:
int _reason_len;
};
-
class OperatorSetStatusReason : public Operator
{
public:
@@ -92,7 +89,6 @@ private:
Value _reason;
};
-
class OperatorSetDestination : public Operator
{
public:
@@ -109,7 +105,6 @@ private:
Value _value;
};
-
class OperatorSetRedirect : public Operator
{
public:
@@ -126,12 +121,10 @@ private:
Value _location;
};
-
class OperatorNoOp : public Operator
{
public:
OperatorNoOp() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for OperatorNoOp"); }
-
protected:
void exec(const Resources & /* res ATS_UNUSED */) const {};
@@ -139,7 +132,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(OperatorNoOp);
};
-
class OperatorSetTimeoutOut : public Operator
{
public:
@@ -179,13 +171,11 @@ private:
bool _skip_remap;
};
-
// All the header operators share a base class
class OperatorRMHeader : public OperatorHeaders
{
public:
OperatorRMHeader() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for OperatorRMHeader"); }
-
protected:
void exec(const Resources &res) const;
@@ -193,7 +183,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(OperatorRMHeader);
};
-
class OperatorAddHeader : public OperatorHeaders
{
public:
@@ -209,7 +198,6 @@ private:
Value _value;
};
-
class OperatorSetHeader : public OperatorHeaders
{
public:
diff --git a/plugins/header_rewrite/parser.h b/plugins/header_rewrite/parser.h
index 687321d..7f1d1a7 100644
--- a/plugins/header_rewrite/parser.h
+++ b/plugins/header_rewrite/parser.h
@@ -28,7 +28,6 @@
#include "lulu.h"
-
///////////////////////////////////////////////////////////////////////////////
//
class Parser
@@ -95,5 +94,4 @@ 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 6be153a..0307c5f 100644
--- a/plugins/header_rewrite/regex_helper.h
+++ b/plugins/header_rewrite/regex_helper.h
@@ -28,14 +28,12 @@
#include <string>
-
const int OVECCOUNT = 30; // We support $1 - $9 only, and this needs to be 3x that
class regexHelper
{
public:
regexHelper() : regex(NULL), regexExtra(NULL), regexCcount(0) {}
-
~regexHelper()
{
if (regex)
@@ -45,7 +43,6 @@ public:
pcre_free(regexExtra);
}
-
bool setRegexMatch(const std::string &s);
const std::string &getRegexString() const;
int getRegexCcount() const;
@@ -58,5 +55,4 @@ private:
int regexCcount;
};
-
#endif
diff --git a/plugins/header_rewrite/resources.cc b/plugins/header_rewrite/resources.cc
index 2d40391..d13d341 100644
--- a/plugins/header_rewrite/resources.cc
+++ b/plugins/header_rewrite/resources.cc
@@ -24,7 +24,6 @@
#include "resources.h"
#include "lulu.h"
-
// Collect all resources
void
Resources::gather(const ResourceIDs ids, TSHttpHookID hook)
@@ -100,7 +99,6 @@ Resources::gather(const ResourceIDs ids, TSHttpHookID hook)
}
break;
-
default:
break;
}
diff --git a/plugins/header_rewrite/resources.h b/plugins/header_rewrite/resources.h
index 8ad9cd7..3ed6250 100644
--- a/plugins/header_rewrite/resources.h
+++ b/plugins/header_rewrite/resources.h
@@ -45,7 +45,6 @@ enum ResourceIDs {
RSRC_RESPONSE_STATUS = 16,
};
-
///////////////////////////////////////////////////////////////////////////////
// Resources holds the minimum resources required to process a request.
//
@@ -67,7 +66,6 @@ public:
}
~Resources() { destroy(); }
-
void gather(const ResourceIDs ids, TSHttpHookID hook);
bool
ready() const
@@ -92,5 +90,4 @@ private:
bool _ready;
};
-
#endif // __RESOURCES_H
diff --git a/plugins/header_rewrite/ruleset.cc b/plugins/header_rewrite/ruleset.cc
index b2c3bc7..378a944 100644
--- a/plugins/header_rewrite/ruleset.cc
+++ b/plugins/header_rewrite/ruleset.cc
@@ -24,7 +24,6 @@
#include "ruleset.h"
#include "factory.h"
-
///////////////////////////////////////////////////////////////////////////////
// Class implementation (no reason to have these inline)
//
@@ -40,7 +39,6 @@ RuleSet::append(RuleSet *rule)
tmp->next = rule;
}
-
void
RuleSet::add_condition(Parser &p)
{
@@ -65,7 +63,6 @@ RuleSet::add_condition(Parser &p)
}
}
-
void
RuleSet::add_operator(Parser &p)
{
diff --git a/plugins/header_rewrite/ruleset.h b/plugins/header_rewrite/ruleset.h
index 7dc3413..1a716de 100644
--- a/plugins/header_rewrite/ruleset.h
+++ b/plugins/header_rewrite/ruleset.h
@@ -29,7 +29,6 @@
#include "resources.h"
#include "parser.h"
-
///////////////////////////////////////////////////////////////////////////////
// Class holding one ruleset. A ruleset is one (or more) pre-conditions, and
// one (or more) operators.
@@ -113,5 +112,4 @@ private:
bool _last;
};
-
#endif // __RULESET_H
diff --git a/plugins/header_rewrite/statement.cc b/plugins/header_rewrite/statement.cc
index 6ead25f..a84d061 100644
--- a/plugins/header_rewrite/statement.cc
+++ b/plugins/header_rewrite/statement.cc
@@ -32,7 +32,6 @@ Statement::append(Statement *stmt)
tmp->_next = stmt;
}
-
const ResourceIDs
Statement::get_resource_ids() const
{
@@ -47,7 +46,6 @@ Statement::get_resource_ids() const
return ids;
}
-
bool
Statement::set_hook(TSHttpHookID hook)
{
@@ -60,7 +58,6 @@ Statement::set_hook(TSHttpHookID hook)
return ret;
}
-
// This should be overridden for any Statement which only supports some hooks
void
Statement::initialize_hooks()
@@ -73,7 +70,6 @@ Statement::initialize_hooks()
add_allowed_hook(TS_REMAP_PSEUDO_HOOK);
}
-
// Parse URL qualifiers, this one is special since it's used in a few places.
UrlQualifiers
Statement::parse_url_qualifier(const std::string &q) const
diff --git a/plugins/header_rewrite/statement.h b/plugins/header_rewrite/statement.h
index dad4ddb..b8dda6c 100644
--- a/plugins/header_rewrite/statement.h
+++ b/plugins/header_rewrite/statement.h
@@ -33,7 +33,6 @@
#include "parser.h"
#include "lulu.h"
-
// URL data (both client and server)
enum UrlQualifiers {
URL_QUAL_NONE,
@@ -65,7 +64,6 @@ enum GeoQualifiers {
GEO_QUAL_ASN_NAME,
};
-
class Statement
{
public:
@@ -154,5 +152,4 @@ private:
TSHttpHookID _hook;
};
-
#endif // __STATEMENT_H
diff --git a/plugins/header_rewrite/value.h b/plugins/header_rewrite/value.h
index cc3891c..59eaaf2 100644
--- a/plugins/header_rewrite/value.h
+++ b/plugins/header_rewrite/value.h
@@ -32,7 +32,6 @@
#include "factory.h"
#include "parser.h"
-
///////////////////////////////////////////////////////////////////////////////
// Base class for all Values (this is also the interface).
//
@@ -120,5 +119,4 @@ private:
Condition *_cond_val;
};
-
#endif // __VALUE_H
diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc
index ad973ce..afceab5 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -67,7 +67,6 @@ enum ExtraSubstitutions {
SUB_LOWER_PATH = 20,
};
-
///////////////////////////////////////////////////////////////////////////////
// Class holding one request URL's component, to simplify the code and
// length calculations (we need all of them).
@@ -108,7 +107,6 @@ struct UrlComponents {
int url_len; // Full length, of all components
};
-
///////////////////////////////////////////////////////////////////////////////
// Class encapsulating one regular expression (and the linked list).
//
@@ -635,7 +633,6 @@ RemapRegex::substitute(char dest[], const char *src, const int ovector[], const
return 0; // Shouldn't happen.
}
-
// Hold one remap instance
struct RemapInstance {
RemapInstance()
@@ -677,7 +674,6 @@ setup_memory_allocation()
pcre_free = &ts_free;
}
-
///////////////////////////////////////////////////////////////////////////////
// Initialize the plugin.
//
@@ -700,7 +696,6 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
return TS_SUCCESS;
}
-
///////////////////////////////////////////////////////////////////////////////
// We don't have any specific "instances" here, at least not yet.
//
@@ -851,7 +846,6 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSE
return TS_SUCCESS;
}
-
void
TSRemapDeleteInstance(void *ih)
{
@@ -888,7 +882,7 @@ TSRemapDeleteInstance(void *ih)
re = ri->first;
while (re) {
- RemapRegex::Override *override = re->get_overrides();
+ RemapRegex::Override * override = re->get_overrides();
while (override) {
RemapRegex::Override *tmp = override;
@@ -907,7 +901,6 @@ TSRemapDeleteInstance(void *ih)
delete ri;
}
-
///////////////////////////////////////////////////////////////////////////////
// This is the main "entry" point for the plugin, called for every request.
//
@@ -1001,7 +994,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
lowercase_substitutions = true;
}
- RemapRegex::Override *override = re->get_overrides();
+ RemapRegex::Override * override = re->get_overrides();
while (override) {
switch (override->type) {
diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc
index 9e0c564..b13093f 100644
--- a/plugins/tcpinfo/tcpinfo.cc
+++ b/plugins/tcpinfo/tcpinfo.cc
@@ -63,7 +63,6 @@ struct Config {
TSTextLogObject log;
Config() : sample(1000), log_level(1), log(NULL) {}
-
~Config()
{
if (log) {
@@ -271,12 +270,8 @@ parse_hook_list(const char *hook_list)
const struct hookmask {
const char *name;
unsigned mask;
- } hooks[] = {{"ssn_start", TCPI_HOOK_SSN_START},
- {"txn_start", TCPI_HOOK_TXN_START},
- {"send_resp_hdr", TCPI_HOOK_SEND_RESPONSE},
- {"ssn_close", TCPI_HOOK_SSN_CLOSE},
- {"txn_close", TCPI_HOOK_TXN_CLOSE},
- {NULL, 0u}};
+ } hooks[] = {{"ssn_start", TCPI_HOOK_SSN_START}, {"txn_start", TCPI_HOOK_TXN_START}, {"send_resp_hdr", TCPI_HOOK_SEND_RESPONSE},
+ {"ssn_close", TCPI_HOOK_SSN_CLOSE}, {"txn_close", TCPI_HOOK_TXN_CLOSE}, {NULL, 0u}};
str = TSstrdup(hook_list);
diff --git a/proxy/AbstractBuffer.cc b/proxy/AbstractBuffer.cc
index bd8bab9..6ecb90f 100644
--- a/proxy/AbstractBuffer.cc
+++ b/proxy/AbstractBuffer.cc
@@ -28,7 +28,6 @@
/* #include "CacheAtomic.h" */
#include "ts/ink_align.h"
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
diff --git a/proxy/AbstractBuffer.h b/proxy/AbstractBuffer.h
index 1b4ffb3..14baa67 100644
--- a/proxy/AbstractBuffer.h
+++ b/proxy/AbstractBuffer.h
@@ -24,7 +24,6 @@
#ifndef __ABSTRACT_BUFFER_H__
#define __ABSTRACT_BUFFER_H__
-
#include "ts/ink_platform.h"
#include "ts/ink_atomic.h"
#include "ts/ink_assert.h"
@@ -37,7 +36,6 @@ enum ABError {
AB_ERROR_OFFSET,
};
-
class AbstractBuffer
{
public:
@@ -53,10 +51,9 @@ public:
protected:
union VolatileState {
VolatileState() { ival = 0; }
-
VolatileState(volatile VolatileState &vs) { ival = vs.ival; }
-
- VolatileState &operator=(volatile VolatileState &vs)
+ VolatileState &
+ operator=(volatile VolatileState &vs)
{
ival = vs.ival;
return *this;
@@ -74,7 +71,6 @@ protected:
public:
AbstractBuffer(int xsize, int xalignment) : buffer(NULL), unaligned_buffer(NULL), size(xsize), alignment(xalignment) { clear(); }
virtual ~AbstractBuffer() { clear(); }
-
char *
data()
{
@@ -117,27 +113,21 @@ public:
VolatileState vs_history[AB_STATE_FLUSH_COMPLETE + 1];
};
-
class AbstractBufferReader
{
public:
AbstractBufferReader(AbstractBuffer *xbuffer, int xoffset) : buffer(xbuffer), offset(xoffset) {}
-
~AbstractBufferReader() { buffer->checkin_read(offset); }
-
private:
AbstractBuffer *buffer;
int offset;
};
-
class AbstractBufferWriter
{
public:
AbstractBufferWriter(AbstractBuffer *xbuffer, int xoffset) : buffer(xbuffer), offset(xoffset) {}
-
~AbstractBufferWriter() { buffer->checkin_write(offset); }
-
private:
AbstractBuffer *buffer;
int offset;
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index 842f316..d344979 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -86,7 +86,6 @@ struct CC_FreerContinuation : public Continuation {
}
};
-
// struct CC_UpdateContinuation
//
// Used to read the cache.conf file after the manager signals
@@ -194,7 +193,6 @@ getClusterCacheLocal(URL *url)
// End API functions
//
-
// void CacheControlResult::Print()
//
// Debugging Method
diff --git a/proxy/ControlBase.h b/proxy/ControlBase.h
index 7fa979f..2076e36 100644
--- a/proxy/ControlBase.h
+++ b/proxy/ControlBase.h
@@ -29,7 +29,6 @@
*
****************************************************************************/
-
#ifndef _CONTROL_BASE_H_
#define _CONTROL_BASE_H_
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 75c101c..7f0fd60 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -680,7 +680,6 @@ IpMatcher<Data, Result>::Match(sockaddr const *addr, RequestData *rdata, Result
}
}
-
template <class Data, class Result>
void
IpMatcher<Data, Result>::Print()
@@ -760,7 +759,6 @@ ControlMatcher<Data, Result>::Print()
}
}
-
// void ControlMatcher<Data, Result>::Match(RequestData* rdata
// Result* result)
//
@@ -973,7 +971,6 @@ ControlMatcher<Data, Result>::BuildTable()
return ret;
}
-
/****************************************************************
* TEMPLATE INSTANTIATIONS GO HERE
*
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 16b0338..4682fb1 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -153,7 +153,6 @@ public:
bool internal_txn;
};
-
template <class Data, class Result> class UrlMatcher
{
public:
@@ -186,7 +185,6 @@ protected:
const char *file_name; // Used for Debug/Warning/Error messages
};
-
template <class Data, class Result> class RegexMatcher
{
public:
@@ -291,7 +289,6 @@ public:
const char *file_name; // Used for Debug/Warning/Error messages
};
-
#define ALLOW_HOST_TABLE 1 << 0
#define ALLOW_IP_TABLE 1 << 1
#define ALLOW_REGEX_TABLE 1 << 2
diff --git a/proxy/CoreUtils.cc b/proxy/CoreUtils.cc
index 128bce9..3267bb7 100644
--- a/proxy/CoreUtils.cc
+++ b/proxy/CoreUtils.cc
@@ -28,7 +28,6 @@
Description: Automated processing of core files on Linux
****************************************************************************/
-
/*
Stack Unwinding procedure on ix86 architecture on Linux :
Get the first frame pointer in $ebp.
@@ -128,7 +127,6 @@ char netvc_ptr_str[256] = "";
HdrHeap *swizzle_heap;
char *ptr_data;
-
// returns the index of the vaddr or the index after where it should be
intptr_t
CoreUtils::find_vaddr(intptr_t vaddr, intptr_t upper, intptr_t lower)
@@ -208,7 +206,6 @@ CoreUtils::insert_table(intptr_t vaddr1, intptr_t offset1, intptr_t fsize1)
}
}
-
// returns -1 on failure otherwise fills the buffer and
// returns the number of bytes read
intptr_t
@@ -244,7 +241,6 @@ CoreUtils::read_from_core(intptr_t vaddr, intptr_t bytes, char *buf)
return -1;
}
-
/* Linux Specific functions */
#if defined(linux)
@@ -362,7 +358,6 @@ CoreUtils::find_stuff(StuffTest_f f)
}
#endif // linux check
-
// test whether a given register is an HttpSM
// if it is, call process_HttpSM on it
void
@@ -468,7 +463,6 @@ CoreUtils::process_HttpSM(HttpSM *core_ptr)
printf("process_HttpSM : last_seen_http_sm == core_ptr\n");
}
-
void
CoreUtils::print_http_hdr(HTTPHdr *h, const char *name)
{
@@ -780,7 +774,6 @@ CoreUtils::process_NetVC(UnixNetVConnection *nvc_test)
ats_free(buf);
}
-
char *
CoreUtils::load_string(const char *addr)
{
diff --git a/proxy/CoreUtils.h b/proxy/CoreUtils.h
index ba7b03a..b9987b8 100644
--- a/proxy/CoreUtils.h
+++ b/proxy/CoreUtils.h
@@ -196,7 +196,6 @@ public:
static void test_HdrHeap(void *arg);
};
-
// parses the core file
void process_core(char *fname);
diff --git a/proxy/EventName.cc b/proxy/EventName.cc
index f55272e..784ff48 100644
--- a/proxy/EventName.cc
+++ b/proxy/EventName.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "ts/ink_config.h"
#include <stdio.h>
#include <string.h>
@@ -76,7 +75,6 @@ event_int_to_string(int event, int blen, char *buffer)
case NET_EVENT_ACCEPT_FAILED:
return "NET_EVENT_ACCEPT_FAILED";
-
#ifdef CLUSTER_CACHE
case CLUSTER_EVENT_CHANGE:
return "CLUSTER_EVENT_CHANGE";
@@ -97,7 +95,6 @@ event_int_to_string(int event, int blen, char *buffer)
case DNS_EVENT_EVENTS_START:
return "DNS_EVENT_EVENTS_START";
-
case MULTI_CACHE_EVENT_SYNC:
return "MULTI_CACHE_EVENT_SYNC";
@@ -134,7 +131,6 @@ event_int_to_string(int event, int blen, char *buffer)
case CACHE_EVENT_RESPONSE_MSG:
return "CACHE_EVENT_RESPONSE_MSG";
-
case MGMT_EVENT_SHUTDOWN:
return "MGMT_EVENT_SHUTDOWN";
case MGMT_EVENT_RESTART:
diff --git a/proxy/FetchSM.h b/proxy/FetchSM.h
index 12ca627..b51cb21 100644
--- a/proxy/FetchSM.h
+++ b/proxy/FetchSM.h
@@ -41,7 +41,6 @@ class FetchSM : public Continuation
{
public:
FetchSM() {}
-
void
init_comm()
{
diff --git a/proxy/ICP.cc b/proxy/ICP.cc
index ead0f0d..172ce02 100644
--- a/proxy/ICP.cc
+++ b/proxy/ICP.cc
@@ -165,7 +165,6 @@ static ClassAllocator<ICPPeerReadCont> ICPPeerReadContAllocator("ICPPeerReadCont
static Action *default_action = NULL;
-
ICPHandlerCont::ICPHandlerCont(ICPProcessor *icpP) : PeriodicCont(icpP)
{
}
@@ -1745,7 +1744,6 @@ ICPProcessor::start()
_mcastCB_handler = new ICPHandlerCont(this);
SET_CONTINUATION_HANDLER(_mcastCB_handler, (ICPHandlerContHandler)&ICPHandlerCont::TossEvent);
-
//
// Build ICP peer list and setup listen sockets
//
diff --git a/proxy/ICP.h b/proxy/ICP.h
index 08e4700..29a4be4 100644
--- a/proxy/ICP.h
+++ b/proxy/ICP.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ICP.h
@@ -40,13 +39,11 @@
#include "ICPProcessor.h"
#include "ts/DynArray.h"
-
//*********************************************************************
// ICP Configurables
//*********************************************************************
#define ICP_DEBUG 1
-
//*********************************************************************
// ICP.h -- Internet Cache Protocol (ICP) related data structures.
//
@@ -1276,18 +1273,19 @@ private:
ICPstate_t _next_state;
};
-
extern ClassAllocator<ICPRequestCont> ICPRequestCont_allocator;
typedef int (*PluginFreshnessCalcFunc)(void *contp);
extern PluginFreshnessCalcFunc pluginFreshnessCalcFunc;
-inline void *ICPRequestCont::operator new(size_t /* size ATS_UNUSED */, void *mem)
+inline void *
+ICPRequestCont::operator new(size_t /* size ATS_UNUSED */, void *mem)
{
return mem;
}
-inline void ICPRequestCont::operator delete(void *mem)
+inline void
+ICPRequestCont::operator delete(void *mem)
{
ICPRequestCont_allocator.free((ICPRequestCont *)mem);
}
@@ -1346,7 +1344,6 @@ enum {
#define ICP_ReadConfigString REC_ReadConfigString
#define ICP_RegisterConfigUpdateFunc REC_RegisterConfigUpdateFunc
-
// End of ICP.h
#endif // _ICP_H_
diff --git a/proxy/ICPConfig.cc b/proxy/ICPConfig.cc
index c642e0c..f668ac7 100644
--- a/proxy/ICPConfig.cc
+++ b/proxy/ICPConfig.cc
@@ -251,7 +251,8 @@ BitMap::IsBitSet(int bit)
// Manage global ICP configuration data from the TS configuration.
// Support class for ICPConfiguration.
//-----------------------------------------------------------------------
-int ICPConfigData::operator==(ICPConfigData &ICPData)
+int
+ICPConfigData::operator==(ICPConfigData &ICPData)
{
if (ICPData._icp_enabled != _icp_enabled)
return 0;
@@ -331,7 +332,8 @@ PeerConfigData::GetHostIPByName(char *hostname, IpAddr &rip)
return best ? 0 : 1;
}
-bool PeerConfigData::operator==(PeerConfigData &PeerData)
+bool
+PeerConfigData::operator==(PeerConfigData &PeerData)
{
if (strncmp(PeerData._hostname, _hostname, PeerConfigData::HOSTNAME_SIZE) != 0)
return false;
@@ -851,7 +853,6 @@ ParentSiblingPeer::GetICPPort()
return _pconfig->GetICPPort();
}
-
sockaddr *
ParentSiblingPeer::GetIP()
{
@@ -1354,16 +1355,42 @@ ICPlog::GetContentType()
// ICP Debug support.
//*****************************************************************************
//
-static const char *ICPstatNames[] = {
- "icp_stat_def", "config_mgmt_callouts_stat", "reconfig_polls_stat", "reconfig_events_stat", "invalid_poll_data_stat",
- "no_data_read_stat", "short_read_stat", "invalid_sender_stat", "read_not_v2_icp_stat", "icp_remote_query_requests_stat",
- "icp_remote_responses_stat", "icp_cache_lookup_success_stat", "icp_cache_lookup_fail_stat", "query_response_write_stat",
- "query_response_partial_write_stat", "no_icp_request_for_response_stat", "icp_response_request_nolock_stat",
- "icp_start_icpoff_stat", "send_query_partial_write_stat", "icp_queries_no_expected_replies_stat", "icp_query_hits_stat",
- "icp_query_misses_stat", "invalid_icp_query_response_stat", "icp_query_requests_stat", "total_icp_response_time_stat",
- "total_udp_send_queries_stat", "total_icp_request_time_stat", "icp_total_reloads", "icp_pending_reloads",
- "icp_reload_start_aborts", "icp_reload_connect_aborts", "icp_reload_read_aborts", "icp_reload_write_aborts",
- "icp_reload_successes", "icp_stat_count", ""};
+static const char *ICPstatNames[] = {"icp_stat_def",
+ "config_mgmt_callouts_stat",
+ "reconfig_polls_stat",
+ "reconfig_events_stat",
+ "invalid_poll_data_stat",
+ "no_data_read_stat",
+ "short_read_stat",
+ "invalid_sender_stat",
+ "read_not_v2_icp_stat",
+ "icp_remote_query_requests_stat",
+ "icp_remote_responses_stat",
+ "icp_cache_lookup_success_stat",
+ "icp_cache_lookup_fail_stat",
+ "query_response_write_stat",
+ "query_response_partial_write_stat",
+ "no_icp_request_for_response_stat",
+ "icp_response_request_nolock_stat",
+ "icp_start_icpoff_stat",
+ "send_query_partial_write_stat",
+ "icp_queries_no_expected_replies_stat",
+ "icp_query_hits_stat",
+ "icp_query_misses_stat",
+ "invalid_icp_query_response_stat",
+ "icp_query_requests_stat",
+ "total_icp_response_time_stat",
+ "total_udp_send_queries_stat",
+ "total_icp_request_time_stat",
+ "icp_total_reloads",
+ "icp_pending_reloads",
+ "icp_reload_start_aborts",
+ "icp_reload_connect_aborts",
+ "icp_reload_read_aborts",
+ "icp_reload_write_aborts",
+ "icp_reload_successes",
+ "icp_stat_count",
+ ""};
void
dumpICPstatEntry(int i, const char *name)
@@ -1389,7 +1416,6 @@ dumpICPstats()
}
}
-
void
ICPProcessor::DumpICPConfig()
{
diff --git a/proxy/ICPProcessor.cc b/proxy/ICPProcessor.cc
index 7978bf9..2cd53a1 100644
--- a/proxy/ICPProcessor.cc
+++ b/proxy/ICPProcessor.cc
@@ -49,7 +49,6 @@ ICPProcessorExt::start()
_ICPpr->start();
}
-
Action *
ICPProcessorExt::ICPQuery(Continuation *c, URL *url)
{
diff --git a/proxy/ICPProcessor.h b/proxy/ICPProcessor.h
index 08f1945..1039dde 100644
--- a/proxy/ICPProcessor.h
+++ b/proxy/ICPProcessor.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ICPProcessor.h
diff --git a/proxy/ICPStats.cc b/proxy/ICPStats.cc
index 5e986f4..f4224c1 100644
--- a/proxy/ICPStats.cc
+++ b/proxy/ICPStats.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ICPStats.cc
diff --git a/proxy/ICPlog.h b/proxy/ICPlog.h
index bf11d8f..cb74449 100644
--- a/proxy/ICPlog.h
+++ b/proxy/ICPlog.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
ICPlog.h
diff --git a/proxy/IPAllow.cc b/proxy/IPAllow.cc
index 4e94029..078e9ff 100644
--- a/proxy/IPAllow.cc
+++ b/proxy/IPAllow.cc
@@ -93,7 +93,6 @@ IpAllow::release(IpAllow *lookup)
// End API functions
//
-
IpAllow::IpAllow(const char *config_var, const char *name, const char *action_val) : module_name(name), action(action_val)
{
ats_scoped_str config_path(RecConfigReadConfigPath(config_var));
diff --git a/proxy/IPAllow.h b/proxy/IPAllow.h
index a9fa1cf..fdb9037 100644
--- a/proxy/IPAllow.h
+++ b/proxy/IPAllow.h
@@ -64,9 +64,7 @@ struct AclRecord {
/// Default constructor.
/// Present only to make Vec<> happy, do not use.
AclRecord() : _method_mask(0), _src_line(0), _deny_nonstandard_methods(false) {}
-
AclRecord(uint32_t method_mask) : _method_mask(method_mask), _src_line(0), _deny_nonstandard_methods(false) {}
-
AclRecord(uint32_t method_mask, int ln, const MethodSet &nonstandard_methods, bool deny_nonstandard_methods)
: _method_mask(method_mask), _src_line(ln), _nonstandard_methods(nonstandard_methods),
_deny_nonstandard_methods(deny_nonstandard_methods)
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 025201f..693aa62 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -61,7 +61,6 @@
#include "I_RecCore.h"
#include "HttpProxyServerMain.h"
-
/****************************************************************
* IMPORTANT - READ ME
* Any plugin using the IO Core must enter
@@ -93,7 +92,6 @@ static struct _STATE_ARG_TABLE {
char *description;
} state_arg_table[HTTP_SSN_TXN_MAX_USER_ARG];
-
/* URL schemes */
tsapi const char *TS_URL_SCHEME_FILE;
tsapi const char *TS_URL_SCHEME_FTP;
@@ -282,7 +280,6 @@ tsapi int TS_MIME_LEN_WWW_AUTHENTICATE;
tsapi int TS_MIME_LEN_XREF;
tsapi int TS_MIME_LEN_X_FORWARDED_FOR;
-
/* HTTP miscellaneous values */
tsapi const char *TS_HTTP_VALUE_BYTES;
tsapi const char *TS_HTTP_VALUE_CHUNKED;
@@ -373,7 +370,6 @@ static ClassAllocator<INKContInternal> INKContAllocator("INKContAllocator");
static ClassAllocator<INKVConnInternal> INKVConnAllocator("INKVConnAllocator");
static ClassAllocator<MIMEFieldSDKHandle> mHandleAllocator("MIMEFieldSDKHandle");
-
////////////////////////////////////////////////////////////////////
//
// API error logging
@@ -471,7 +467,6 @@ _TSAssert(const char *, const char *, int)
//
////////////////////////////////////////////////////////////////////
-
/*****************************************************************/
/* Handles to headers are impls, but need to handle MIME or HTTP */
/*****************************************************************/
@@ -665,7 +660,6 @@ isWriteable(TSMBuffer bufp)
return false;
}
-
/******************************************************/
/* Allocators for field handles and standalone fields */
/******************************************************/
@@ -691,7 +685,6 @@ sdk_free_field_handle(TSMBuffer bufp, MIMEFieldSDKHandle *field_handle)
}
}
-
////////////////////////////////////////////////////////////////////
//
// FileImpl
@@ -998,12 +991,11 @@ INKContInternal::handle_event(int event, void *edata)
Warning("INKCont Deletable but not deleted %d", m_event_count);
}
} else {
- return m_event_func((TSCont) this, (TSEvent)event, edata);
+ return m_event_func((TSCont)this, (TSEvent)event, edata);
}
return EVENT_DONE;
}
-
////////////////////////////////////////////////////////////////////
//
// INKVConnInternal
@@ -1053,7 +1045,7 @@ INKVConnInternal::handle_event(int event, void *edata)
INKVConnAllocator.free(this);
}
} else {
- return m_event_func((TSCont) this, (TSEvent)event, edata);
+ return m_event_func((TSCont)this, (TSEvent)event, edata);
}
return EVENT_DONE;
}
@@ -1225,7 +1217,6 @@ APIHook::next() const
return m_link.next;
}
-
void
APIHooks::prepend(INKContInternal *cont)
{
@@ -1440,7 +1431,6 @@ api_init()
TS_MIME_FIELD_XREF = MIME_FIELD_XREF;
TS_MIME_FIELD_X_FORWARDED_FOR = MIME_FIELD_X_FORWARDED_FOR;
-
TS_MIME_LEN_ACCEPT = MIME_LEN_ACCEPT;
TS_MIME_LEN_ACCEPT_CHARSET = MIME_LEN_ACCEPT_CHARSET;
TS_MIME_LEN_ACCEPT_ENCODING = MIME_LEN_ACCEPT_ENCODING;
@@ -1514,7 +1504,6 @@ api_init()
TS_MIME_LEN_XREF = MIME_LEN_XREF;
TS_MIME_LEN_X_FORWARDED_FOR = MIME_LEN_X_FORWARDED_FOR;
-
/* HTTP methods */
TS_HTTP_METHOD_CONNECT = HTTP_METHOD_CONNECT;
TS_HTTP_METHOD_DELETE = HTTP_METHOD_DELETE;
@@ -1889,7 +1878,6 @@ TSHandleMLocRelease(TSMBuffer bufp, TSMLoc parent, TSMLoc mloc)
}
}
-
////////////////////////////////////////////////////////////////////
//
// HdrHeaps (previously known as "Marshal Buffers")
@@ -2232,7 +2220,6 @@ TSUrlFtpTypeSet(TSMBuffer bufp, TSMLoc obj, int type)
sdk_assert(sdk_sanity_check_mbuffer(bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_url_handle(obj) == TS_SUCCESS);
-
if ((type == 0 || type == 'A' || type == 'E' || type == 'I' || type == 'a' || type == 'i' || type == 'e') && isWriteable(bufp)) {
URL u;
@@ -2352,7 +2339,6 @@ TSUrlPercentEncode(TSMBuffer bufp, TSMLoc obj, char *dst, size_t dst_size, size_
return ret;
}
-
////////////////////////////////////////////////////////////////////
//
// MIME Headers
@@ -2613,7 +2599,6 @@ TSMimeFieldValueInsert(TSMBuffer bufp, TSMLoc field_obj, const char *value, int
mime_field_value_insert_comma_val(heap, handle->mh, handle->field_ptr, idx, value, length);
}
-
/****************/
/* MimeHdrField */
/****************/
@@ -3430,7 +3415,6 @@ TSHttpParserDestroy(TSHttpParser parser)
/* HttpHdr */
/***********/
-
TSMLoc
TSHttpHdrCreate(TSMBuffer bufp)
{
@@ -3863,7 +3847,6 @@ TSHttpHdrReasonLookup(TSHttpStatus status)
return http_hdr_reason_lookup((HTTPStatus)status);
}
-
////////////////////////////////////////////////////////////////////
//
// Cache
@@ -4006,7 +3989,6 @@ TSCacheHttpInfoReqGet(TSCacheHttpInfo infop, TSMBuffer *bufp, TSMLoc *obj)
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
}
-
void
TSCacheHttpInfoRespGet(TSCacheHttpInfo infop, TSMBuffer *bufp, TSMLoc *obj)
{
@@ -4049,7 +4031,6 @@ TSCacheHttpInfoReqSet(TSCacheHttpInfo infop, TSMBuffer bufp, TSMLoc obj)
info->request_set(&h);
}
-
void
TSCacheHttpInfoRespSet(TSCacheHttpInfo infop, TSMBuffer bufp, TSMLoc obj)
{
@@ -4061,7 +4042,6 @@ TSCacheHttpInfoRespSet(TSCacheHttpInfo infop, TSMBuffer bufp, TSMLoc obj)
info->response_set(&h);
}
-
int
TSCacheHttpInfoVector(TSCacheHttpInfo infop, void *data, int length)
{
@@ -4079,7 +4059,6 @@ TSCacheHttpInfoVector(TSCacheHttpInfo infop, void *data, int length)
return vector.marshal((char *)data, length);
}
-
void
TSCacheHttpInfoDestroy(TSCacheHttpInfo infop)
{
@@ -4095,7 +4074,6 @@ TSCacheHttpInfoCreate(void)
return reinterpret_cast<TSCacheHttpInfo>(info);
}
-
////////////////////////////////////////////////////////////////////
//
// Configuration
@@ -4355,7 +4333,6 @@ TSContMutexGet(TSCont contp)
return (TSMutex)((ProxyMutex *)c->mutex);
}
-
/* HTTP hooks */
void
@@ -4440,7 +4417,6 @@ private:
TSEvent m_event;
};
-
void
TSHttpSsnReenable(TSHttpSsn ssnp, TSEvent event)
{
@@ -4464,7 +4440,6 @@ TSHttpSsnReenable(TSHttpSsn ssnp, TSEvent event)
}
}
-
/* HTTP transactions */
void
TSHttpTxnHookAdd(TSHttpTxn txnp, TSHttpHookID id, TSCont contp)
@@ -4477,7 +4452,6 @@ TSHttpTxnHookAdd(TSHttpTxn txnp, TSHttpHookID id, TSCont contp)
sm->txn_hook_append(id, (INKContInternal *)contp);
}
-
// Private api function for gzip plugin.
// This function should only appear in TsapiPrivate.h
TSReturnCode
@@ -4595,7 +4569,6 @@ TSHttpTxnClientRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
return TS_ERROR;
}
-
TSReturnCode
TSHttpTxnServerReqGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
{
@@ -4712,7 +4685,6 @@ TSHttpTxnCachedRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
return TS_SUCCESS;
}
-
TSReturnCode
TSHttpTxnCachedRespModifiableGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
{
@@ -4787,7 +4759,6 @@ TSHttpTxnCacheLookupCountGet(TSHttpTxn txnp, int *lookup_count)
return TS_SUCCESS;
}
-
/* two hooks this function may gets called:
TS_HTTP_READ_CACHE_HDR_HOOK &
TS_HTTP_CACHE_LOOKUP_COMPLETE_HOOK
@@ -5078,7 +5049,6 @@ TSHttpTxnDNSTimeoutSet(TSHttpTxn txnp, int timeout)
s->api_txn_dns_timeout_value = timeout;
}
-
/**
* timeout is in msec
* overrides as proxy.config.http.transaction_no_activity_timeout_out
@@ -5610,7 +5580,6 @@ TSHttpTxnTransformedRespCache(TSHttpTxn txnp, int on)
sm->t_state.api_info.cache_transformed = (on ? true : false);
}
-
class TSHttpSMCallback : public Continuation
{
public:
@@ -5632,7 +5601,6 @@ private:
TSEvent m_event;
};
-
//----------------------------------------------------------------------------
void
TSHttpTxnReenable(TSHttpTxn txnp, TSEvent event)
@@ -6052,7 +6020,6 @@ TSHttpCurrentServerConnectionsGet(void)
return (int)S;
}
-
/* HTTP alternate selection */
TSReturnCode
TSHttpAltInfoClientReqGet(TSHttpAltInfo infop, TSMBuffer *bufp, TSMLoc *obj)
@@ -6226,7 +6193,6 @@ TSVConnCreate(TSEventFunc event_funcp, TSMutex mutexp)
struct ActionSink : public Continuation {
ActionSink() : Continuation(NULL) { SET_HANDLER(&ActionSink::mainEvent); }
-
int
mainEvent(int event, void *edata)
{
@@ -6501,7 +6467,6 @@ TSNetVConnLocalAddrGet(TSVConn connp)
return vc->get_local_addr();
}
-
sockaddr const *
TSNetVConnRemoteAddrGet(TSVConn connp)
{
@@ -6723,7 +6688,6 @@ TSCacheScan(TSCont contp, TSCacheKey key, int KB_per_second)
return reinterpret_cast<TSAction>(cacheProcessor.scan(i, 0, 0, KB_per_second));
}
-
/************************ REC Stats API **************************/
int
TSStatCreate(const char *the_name, TSRecordDataType the_type, TSStatPersistence persist, TSStatSync sync)
@@ -6805,7 +6769,6 @@ TSStatFindName(const char *name, int *idp)
return TS_ERROR;
}
-
/************************** Stats API ****************************/
// THESE APIS ARE DEPRECATED, USE THE REC APIs INSTEAD
// #define ink_sanity_check_stat_structure(_x) TS_SUCCESS
@@ -7547,7 +7510,6 @@ TSAIORead(int fd, off_t offset, char *buf, size_t buffSize, TSCont contp)
pAIO->aiocb.aio_offset = offset;
pAIO->aiocb.aio_nbytes = buffSize;
-
pAIO->aiocb.aio_buf = buf;
pAIO->action = pCont;
pAIO->thread = ((ProxyMutex *)pCont->mutex)->thread_holding;
@@ -8138,7 +8100,6 @@ TSHttpTxnConfigStringSet(TSHttpTxn txnp, TSOverridableConfigKey conf, const char
return TS_SUCCESS;
}
-
TSReturnCode
TSHttpTxnConfigStringGet(TSHttpTxn txnp, TSOverridableConfigKey conf, const char **value, int *length)
{
@@ -8169,7 +8130,6 @@ TSHttpTxnConfigStringGet(TSHttpTxn txnp, TSOverridableConfigKey conf, const char
return TS_SUCCESS;
}
-
// This is pretty suboptimal, and should only be used outside the critical path.
TSReturnCode
TSHttpTxnConfigFind(const char *name, int length, TSOverridableConfigKey *conf, TSRecordDataType *type)
@@ -8738,7 +8698,6 @@ TSPluginDescriptorAccept(TSCont contp)
return action ? TS_SUCCESS : TS_ERROR;
}
-
int
TSHttpTxnBackgroundFillStarted(TSHttpTxn txnp)
{
@@ -8774,7 +8733,6 @@ TSHttpTxnIsCacheable(TSHttpTxn txnp, TSMBuffer request, TSMBuffer response)
return (req->valid() && resp->valid() && HttpTransact::is_response_cacheable(&(sm->t_state), req, resp)) ? 1 : 0;
}
-
// Lookup various debug names for common HTTP types.
const char *
TSHttpServerStateNameLookup(TSServerState state)
@@ -8799,7 +8757,6 @@ class TSSslCallback : public Continuation
{
public:
TSSslCallback(SSLNetVConnection *vc) : Continuation(vc->mutex), m_vc(vc) { SET_HANDLER(&TSSslCallback::event_handler); }
-
int
event_handler(int, void *)
{
@@ -8812,7 +8769,6 @@ private:
SSLNetVConnection *m_vc;
};
-
/// SSL Hooks
TSReturnCode
TSVConnTunnel(TSVConn sslp)
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index faa2ea3..9c42436 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -102,7 +102,6 @@ public:
int m_bufpos;
};
-
struct INKConfigImpl : public ConfigInfo {
void *mdata;
TSConfigDestroyFunc m_destroy_func;
@@ -297,7 +296,6 @@ class LifecycleAPIHooks : public FeatureAPIHooks<TSLifecycleHookID, TS_LIFECYCLE
{
};
-
class ConfigUpdateCallback : public Continuation
{
public:
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index ce77902..17d0140 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -74,7 +74,6 @@ SDK_RPRINT(RegressionTest *t, const char *api_name, const char *testcase_name, i
return (l);
}
-
/*
REGRESSION_TEST(SDK_<test_name>)(RegressionTest *t, int atype, int *pstatus)
@@ -135,7 +134,6 @@ REGRESSION_TEST(SDK_API_TSTrafficServerVersionGet)(RegressionTest *test, int /*
return;
}
-
////////////////////////////////////////////////
// SDK_API_TSPluginDirGet
//
@@ -180,7 +178,6 @@ REGRESSION_TEST(SDK_API_TSPluginDirGet)(RegressionTest *test, int /* atype ATS_U
return;
}
-
/* TSConfig */
////////////////////////////////////////////////
// SDK_API_TSConfig
@@ -473,10 +470,8 @@ REGRESSION_TEST(SDK_API_TSPortDescriptor)(RegressionTest *test, int /* atype ATS
// - remove it from the cache
// - try to read it (should faild)
-
#define OBJECT_SIZE 100000 // size of the object we'll write/read/remove in cache
-
RegressionTest *SDK_Cache_test;
int *SDK_Cache_pstatus;
static char content[OBJECT_SIZE];
@@ -645,7 +640,6 @@ cache_handler(TSCont contp, TSEvent event, void *data)
}
Debug(UTDBG_TAG "_cache_write", "finishing up [d]");
-
if (TSVIOBufferGet(cache_vconn->write_vio) != cache_vconn->bufp) {
SDK_RPRINT(SDK_Cache_test, "TSVIOBufferGet", "TestCase1", TC_FAIL, "write_vio corrupted");
*SDK_Cache_pstatus = REGRESSION_TEST_FAILED;
@@ -696,14 +690,12 @@ cache_handler(TSCont contp, TSEvent event, void *data)
Debug(UTDBG_TAG "_cache_write", "finishing up [h]");
-
// start to read data out of cache
read_counter++;
TSCacheRead(contp, cache_vconn->key);
Debug(UTDBG_TAG "_cache_read", "starting read [i]");
return 1;
-
case TS_EVENT_VCONN_WRITE_READY:
Debug(UTDBG_TAG "_cache_event", "TS_EVENT_VCONN_WRITE_READY %d %p", event, data);
if ((TSVIO)data != cache_vconn->write_vio) {
@@ -1209,7 +1201,6 @@ REGRESSION_TEST(SDK_API_TSThread)(RegressionTest *test, int /* atype ATS_UNUSED
}
}
-
//////////////////////////////////////////////
// SDK_API_TSThread
//
@@ -1356,7 +1347,6 @@ cont_handler(TSCont /* contp ATS_UNUSED */, TSEvent /* event ATS_UNUSED */, void
return 0;
}
-
REGRESSION_TEST(SDK_API_TSContCreate)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -1381,7 +1371,6 @@ REGRESSION_TEST(SDK_API_TSContCreate)(RegressionTest *test, int /* atype ATS_UNU
TSContDestroy(contp);
}
-
//////////////////////////////////////////////
// SDK_API_TSCont
//
@@ -1422,7 +1411,6 @@ cont_data_handler(TSCont contp, TSEvent /* event ATS_UNUSED */, void * /* edata
return 0;
}
-
REGRESSION_TEST(SDK_API_TSContDataGet)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -1442,7 +1430,6 @@ REGRESSION_TEST(SDK_API_TSContDataGet)(RegressionTest *test, int /* atype ATS_UN
TSContSchedule(contp, 0, TS_THREAD_POOL_DEFAULT);
}
-
//////////////////////////////////////////////
// SDK_API_TSCont
//
@@ -1611,7 +1598,6 @@ REGRESSION_TEST(SDK_API_TSIOBufferCreate)(RegressionTest *test, int /* atype ATS
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSIOBuffer
//
@@ -1649,7 +1635,6 @@ REGRESSION_TEST(SDK_API_TSIOBufferProduce)(RegressionTest *test, int /* atype AT
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSIOBuffer
//
@@ -1743,7 +1728,6 @@ REGRESSION_TEST(SDK_API_TSIOBufferStart)(RegressionTest *test, int /* atype ATS_
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSIOBuffer
//
@@ -1870,7 +1854,6 @@ REGRESSION_TEST(SDK_API_TSIOBufferBlockNext)(RegressionTest *test, int /* atype
return;
}
-
REGRESSION_TEST(SDK_API_TSContSchedule)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -1926,7 +1909,6 @@ typedef struct {
unsigned int magic;
} SocketTest;
-
// This func is called by us from mytest_handler to test TSHttpTxnClientIPGet
static int
checkHttpTxnClientIPGet(SocketTest *test, void *data)
@@ -1984,7 +1966,6 @@ checkHttpTxnNextHopIPGet(SocketTest *test, void *data)
return TS_EVENT_CONTINUE;
}
-
// This func is called by us from mytest_handler to test TSHttpTxnServerIPGet
static int
checkHttpTxnServerIPGet(SocketTest *test, void *data)
@@ -2010,7 +1991,6 @@ checkHttpTxnServerIPGet(SocketTest *test, void *data)
SDK_RPRINT(test->regtest, "TSHttpTxnServerIPGet", "TestCase1", TC_FAIL, "Value's Mismatch");
}
-
return TS_EVENT_CONTINUE;
}
@@ -2184,7 +2164,6 @@ checkHttpTxnServerRespGet(SocketTest *test, void *data)
return TS_EVENT_CONTINUE;
}
-
// This func is called both by us when scheduling EVENT_IMMEDIATE
// And by HTTP SM for registered hooks
// Depending on the timing of the DNS response, OS_DNS can happen before or after CACHE_LOOKUP.
@@ -2340,7 +2319,6 @@ mytest_handler(TSCont contp, TSEvent event, void *data)
return TS_EVENT_IMMEDIATE;
}
-
EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpHookAdd)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -2391,7 +2369,6 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpHookAdd)(RegressionTest *test, int /* atyp
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSUrl
//
@@ -2583,7 +2560,6 @@ REGRESSION_TEST(SDK_API_TSUrl)(RegressionTest *test, int /* atype ATS_UNUSED */,
((query == NULL) ? "" : "?"), ((query == NULL) ? "" : query), ((fragment == NULL) ? "" : "#"),
((fragment == NULL) ? "" : fragment));
-
// Set Functions
bufp1 = TSMBufferCreate();
@@ -2746,7 +2722,6 @@ REGRESSION_TEST(SDK_API_TSUrl)(RegressionTest *test, int /* atype ATS_UNUSED */,
SDK_RPRINT(test, "TSUrlCopy", "TestCase1", TC_FAIL, "Values don't match");
}
-
// String Test Case 2
url_string_from_2 = TSUrlStringGet(bufp2, url_loc2, &tmp_len);
if (strcmp(url_string_from_2, url_expected_string) == 0) {
@@ -2950,7 +2925,6 @@ REGRESSION_TEST(SDK_API_TSHttpHdr)(RegressionTest *test, int /* atype ATS_UNUSED
bool try_print_function = true;
bool test_buffer_created = true;
-
*pstatus = REGRESSION_TEST_INPROGRESS;
bufp1 = TSMBufferCreate();
@@ -2969,7 +2943,6 @@ REGRESSION_TEST(SDK_API_TSHttpHdr)(RegressionTest *test, int /* atype ATS_UNUSED
SDK_RPRINT(test, "TSHttpHdrCreate", "All Test Cases", TC_FAIL, "Cannot run test as unable to allocate MBuffers");
}
-
// Type
if (test_passed_Http_Hdr_Create == true) {
if ((TSHttpHdrTypeSet(bufp1, hdr_loc1, TS_HTTP_TYPE_REQUEST) == TS_ERROR) ||
@@ -3376,7 +3349,6 @@ REGRESSION_TEST(SDK_API_TSHttpHdr)(RegressionTest *test, int /* atype ATS_UNUSED
SDK_RPRINT(test, "TSHttpHdrClone", "All Test Cases", TC_PASS, "Cannot run test as TSHttpHdrCreate has failed");
}
-
// LengthGet
if (test_passed_Http_Hdr_Create == true) {
actual_length = TSHttpHdrLengthGet(bufp1, hdr_loc1);
@@ -3496,7 +3468,6 @@ REGRESSION_TEST(SDK_API_TSHttpHdr)(RegressionTest *test, int /* atype ATS_UNUSED
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSMimeHdrField
//
@@ -3565,7 +3536,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
TSMLoc field_loc14 = (TSMLoc)NULL;
TSMLoc field_loc15 = (TSMLoc)NULL;
-
const char *field1Name = "field1";
const char *field2Name = "field2";
const char *field3Name = "field3";
@@ -3733,7 +3703,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldCreate", "All Test Case", TC_FAIL, "Cannot run test as Test for TSMimeHdrCreate Failed");
}
-
// TSMimeHdrFieldNameGet&Set
if (test_passed_Mime_Hdr_Field_Create == true) {
if ((TSMimeHdrFieldNameSet(bufp1, mime_loc1, field_loc11, field1Name, -1) == TS_ERROR) ||
@@ -3764,7 +3733,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
"Cannot run test as Test for TSMBufferFieldCreate Failed");
}
-
// TSMimeHdrFieldAppend, TSMimeHdrFieldGet, TSMimeHdrFieldNext
if (test_passed_Mime_Hdr_Field_Name == true) {
if ((TSMimeHdrFieldAppend(bufp1, mime_loc1, field_loc11) != TS_SUCCESS) ||
@@ -3869,7 +3837,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
"Cannot run test as Test for TSMimeHdrFieldNameGet&Set Failed");
}
-
// TSMimeHdrFieldsCount
if (test_passed_Mime_Hdr_Field_Create == true) {
if ((numberOfFields = TSMimeHdrFieldsCount(bufp1, mime_loc1)) < 0) {
@@ -3961,7 +3928,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldValueStringInsert&Set&Get", "All", TC_FAIL, "Cannot run Test as TSMimeHdrFieldCreate failed");
}
-
// TSMimeHdrFieldValueDateInsert, TSMimeHdrFieldValueDateGet, TSMimeHdrFieldValueDateSet
if (test_passed_Mime_Hdr_Field_Create == true) {
if (TSMimeHdrFieldValueDateInsert(bufp1, mime_loc1, field_loc12, field2Value1) == TS_ERROR) {
@@ -4001,7 +3967,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
"Cannot run Test as TSMimeHdrFieldCreate failed");
}
-
// TSMimeHdrFieldValueIntInsert, TSMimeHdrFieldValueIntGet, TSMimeHdrFieldValueIntSet
if (test_passed_Mime_Hdr_Field_Create == true) {
if ((TSMimeHdrFieldValueIntInsert(bufp1, mime_loc1, field_loc13, -1, field3Value2) == TS_ERROR) ||
@@ -4109,7 +4074,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
test_passed_Mime_Hdr_Field_Length_Get = true;
}
-
// TSMimeHdrFieldValueAppend, TSMimeHdrFieldValueDelete, TSMimeHdrFieldValuesCount, TSMimeHdrFieldValuesClear
if (test_passed_Mime_Hdr_Field_Create == true) {
@@ -4265,7 +4229,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrDestroy", "TestCase1", TC_FAIL, "Cannot run test as TSMimeHdrCreate failed");
}
-
if ((test_passed_MBuffer_Create == true) && (test_passed_Mime_Hdr_Create == true) &&
(test_passed_Mime_Hdr_Field_Create == true) && (test_passed_Mime_Hdr_Field_Name == true) &&
(test_passed_Mime_Hdr_Field_Append == true) && (test_passed_Mime_Hdr_Field_Get == true) &&
@@ -4288,7 +4251,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSHttpHdrParse
//
@@ -4487,7 +4449,6 @@ REGRESSION_TEST(SDK_API_TSHttpHdrParse)(RegressionTest *test, int /* atype ATS_U
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSMimeHdrParse
//
@@ -4615,7 +4576,6 @@ compare_field_values(RegressionTest *test, TSMBuffer bufp1, TSMLoc hdr_loc1, TSM
return TS_SUCCESS;
}
-
REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
const char *parse_string =
@@ -4719,7 +4679,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrLengthGet", "TestCase1", TC_FAIL, "Cannot run test as unable to create a parser");
}
-
// HOW DO I CHECK FOR PARSER CLEAR????
if (test_passed_parser_create == true) {
TSMimeParserClear(parser);
@@ -4729,7 +4688,6 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeParserClear", "TestCase1", TC_FAIL, "Cannot run test as unable to create a parser");
}
-
if (test_passed_parser_create == true) {
TSMimeParserDestroy(parser);
SDK_RPRINT(test, "TSMimeParserDestroy", "TestCase1", TC_PASS, "ok");
@@ -5034,20 +4992,25 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
REGRESSION_TEST(SDK_API_TSUrlParse)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
static char const *const urls[] = {
- "file:///test.dat;ab?abc=def#abc", "http://www.example.com/", "http://abc:def@www.example.com/", "http://www.example.com:3426/",
- "http://abc:def@www.example.com:3426/", "http://www.example.com/homepage.cgi",
- "http://www.example.com/homepage.cgi;ab?abc=def#abc", "http://abc:def@www.example.com:3426/homepage.cgi;ab?abc=def#abc",
+ "file:///test.dat;ab?abc=def#abc",
+ "http://www.example.com/",
+ "http://abc:def@www.example.com/",
+ "http://www.example.com:3426/",
+ "http://abc:def@www.example.com:3426/",
+ "http://www.example.com/homepage.cgi",
+ "http://www.example.com/homepage.cgi;ab?abc=def#abc",
+ "http://abc:def@www.example.com:3426/homepage.cgi;ab?abc=def#abc",
"https://abc:def@www.example.com:3426/homepage.cgi;ab?abc=def#abc",
"ftp://abc:def@www.example.com:3426/homepage.cgi;ab?abc=def#abc",
"file:///c:/test.dat;ab?abc=def#abc", // Note: file://c: is malformed URL because no host is present.
- "file:///test.dat;ab?abc=def#abc", "foo://bar.com/baz/",
+ "file:///test.dat;ab?abc=def#abc",
+ "foo://bar.com/baz/",
"http://a.b.com/xx.jpg?newpath=http://b.c.com" // https://issues.apache.org/jira/browse/TS-1635
};
static int const num_urls = sizeof(urls) / sizeof(urls[0]);
bool test_passed[num_urls] = {false};
-
const char *start;
const char *end;
char *temp;
@@ -5060,7 +5023,6 @@ REGRESSION_TEST(SDK_API_TSUrlParse)(RegressionTest *test, int /* atype ATS_UNUSE
*pstatus = REGRESSION_TEST_INPROGRESS;
-
int idx;
for (idx = 0; idx < num_urls; idx++) {
char const *url = urls[idx];
@@ -5107,7 +5069,6 @@ REGRESSION_TEST(SDK_API_TSUrlParse)(RegressionTest *test, int /* atype ATS_UNUSE
*pstatus = REGRESSION_TEST_PASSED;
}
-
return;
}
@@ -5129,7 +5090,6 @@ typedef struct {
TSTextLogObject log;
} LogTestData;
-
static int
log_test_handler(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
{
@@ -5178,7 +5138,6 @@ log_test_handler(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
*(data->pstatus) = REGRESSION_TEST_PASSED;
SDK_RPRINT(data->test, "TSTextLogObject", "TestCase1", TC_PASS, "ok");
-
// figure out the matainfo file for cleanup.
// code from MetaInfo::_build_name(const char *filename)
int i = -1, l = 0;
@@ -5265,7 +5224,6 @@ REGRESSION_TEST(SDK_API_TSTextLog)(RegressionTest *test, int /* atype ATS_UNUSED
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSMgmtGet
//
@@ -5344,7 +5302,6 @@ REGRESSION_TEST(SDK_API_TSMgmtGet)(RegressionTest *test, int /* atype ATS_UNUSED
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSConstant
//
@@ -5360,7 +5317,6 @@ REGRESSION_TEST(SDK_API_TSMgmtGet)(RegressionTest *test, int /* atype ATS_UNUSED
} \
}
-
typedef enum {
ORIG_TS_PARSE_ERROR = -1,
ORIG_TS_PARSE_DONE = 0,
@@ -5535,7 +5491,6 @@ typedef enum {
ORIG_TS_SUCCESS = 0,
} ORIG_TSReturnCode;
-
REGRESSION_TEST(SDK_API_TSConstant)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -5552,7 +5507,6 @@ REGRESSION_TEST(SDK_API_TSConstant)(RegressionTest *test, int /* atype ATS_UNUSE
PRINT_DIFF(TS_HTTP_STATUS_OK);
PRINT_DIFF(TS_HTTP_STATUS_CREATED);
-
PRINT_DIFF(TS_HTTP_STATUS_ACCEPTED);
PRINT_DIFF(TS_HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION);
PRINT_DIFF(TS_HTTP_STATUS_NO_CONTENT);
@@ -5676,7 +5630,6 @@ REGRESSION_TEST(SDK_API_TSConstant)(RegressionTest *test, int /* atype ATS_UNUSE
PRINT_DIFF(TS_ERROR);
PRINT_DIFF(TS_SUCCESS);
-
if (test_passed) {
*pstatus = REGRESSION_TEST_PASSED;
} else {
@@ -5695,7 +5648,6 @@ REGRESSION_TEST(SDK_API_TSConstant)(RegressionTest *test, int /* atype ATS_UNUSE
// TSHttpTxnParentProxySet
//////////////////////////////////////////////
-
typedef struct {
RegressionTest *test;
int *pstatus;
@@ -5738,7 +5690,6 @@ checkHttpTxnParentProxy(ContData *data, TSHttpTxn txnp)
return TS_EVENT_CONTINUE;
}
-
static int
ssn_handler(TSCont contp, TSEvent event, void *edata)
{
@@ -5867,7 +5818,6 @@ ssn_handler(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpSsn)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -6092,7 +6042,6 @@ cache_hook_handler(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpTxnCache)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -6655,7 +6604,6 @@ transform_hook_handler(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpTxnTransform)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -6892,7 +6840,6 @@ altinfo_hook_handler(TSCont contp, TSEvent event, void *edata)
return 0;
}
-
EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpAltInfo)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -6938,7 +6885,6 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpAltInfo)(RegressionTest *test, int /* atyp
return;
}
-
//////////////////////////////////////////////
// SDK_API_TSHttpConnect
//
@@ -6978,7 +6924,6 @@ typedef struct {
unsigned long magic;
} ConnectTestData;
-
static int
cont_test_handler(TSCont contp, TSEvent event, void *edata)
{
@@ -7080,7 +7025,6 @@ done:
return TS_EVENT_IMMEDIATE;
}
-
EXCLUSIVE_REGRESSION_TEST(SDK_API_TSHttpConnectIntercept)(RegressionTest *test, int /* atype */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -7122,7 +7066,6 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_TSHttpConnectIntercept)(RegressionTest *test,
return;
}
-
EXCLUSIVE_REGRESSION_TEST(SDK_API_TSHttpConnectServerIntercept)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -7162,7 +7105,6 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_TSHttpConnectServerIntercept)(RegressionTest *
return;
}
-
////////////////////////////////////////////////
// SDK_API_OVERRIDABLE_CONFIGS
//
@@ -7176,50 +7118,101 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_TSHttpConnectServerIntercept)(RegressionTest *
////////////////////////////////////////////////
// The order of these should be the same as TSOverridableConfigKey
-const char *SDK_Overridable_Configs[TS_CONFIG_LAST_ENTRY] = {
- "proxy.config.url_remap.pristine_host_hdr", "proxy.config.http.chunking_enabled", "proxy.config.http.negative_caching_enabled",
- "proxy.config.http.negative_caching_lifetime", "proxy.config.http.cache.when_to_revalidate",
- "proxy.config.http.keep_alive_enabled_in", "proxy.config.http.keep_alive_enabled_out", "proxy.config.http.keep_alive_post_out",
- "proxy.config.http.server_session_sharing.match", "proxy.config.net.sock_recv_buffer_size_out",
- "proxy.config.net.sock_send_buffer_size_out", "proxy.config.net.sock_option_flag_out",
- "proxy.config.http.forward.proxy_auth_to_parent", "proxy.config.http.anonymize_remove_from",
- "proxy.config.http.anonymize_remove_referer", "proxy.config.http.anonymize_remove_user_agent",
- "proxy.config.http.anonymize_remove_cookie", "proxy.config.http.anonymize_remove_client_ip",
- "proxy.config.http.anonymize_insert_client_ip", "proxy.config.http.response_server_enabled",
- "proxy.config.http.insert_squid_x_forwarded_for", "proxy.config.http.server_tcp_init_cwnd",
- "proxy.config.http.send_http11_requests", "proxy.config.http.cache.http", "proxy.config.http.cache.cluster_cache_local",
- "proxy.config.http.cache.ignore_client_no_cache", "proxy.config.http.cache.ignore_client_cc_max_age",
- "proxy.config.http.cache.ims_on_client_no_cache", "proxy.config.http.cache.ignore_server_no_cache",
- "proxy.config.http.cache.cache_responses_to_cookies", "proxy.config.http.cache.ignore_authentication",
- "proxy.config.http.cache.cache_urls_that_look_dynamic", "proxy.config.http.cache.required_headers",
- "proxy.config.http.insert_request_via_str", "proxy.config.http.insert_response_via_str",
- "proxy.config.http.cache.heuristic_min_lifetime", "proxy.config.http.cache.heuristic_max_lifetime",
- "proxy.config.http.cache.guaranteed_min_lifetime", "proxy.config.http.cache.guaranteed_max_lifetime",
- "proxy.config.http.cache.max_stale_age", "proxy.config.http.keep_alive_no_activity_timeout_in",
- "proxy.config.http.keep_alive_no_activity_timeout_out", "proxy.config.http.transaction_no_activity_timeout_in",
- "proxy.config.http.transaction_no_activity_timeout_out", "proxy.config.http.transaction_active_timeout_out",
- "proxy.config.http.origin_max_connections", "proxy.config.http.connect_attempts_max_retries",
- "proxy.config.http.connect_attempts_max_retries_dead_server", "proxy.config.http.connect_attempts_rr_retries",
- "proxy.config.http.connect_attempts_timeout", "proxy.config.http.post_connect_attempts_timeout",
- "proxy.config.http.down_server.cache_time", "proxy.config.http.down_server.abort_threshold", "proxy.config.http.cache.fuzz.time",
- "proxy.config.http.cache.fuzz.min_time", "proxy.config.http.doc_in_cache_skip_dns",
- "proxy.config.http.background_fill_active_timeout", "proxy.config.http.response_server_str",
- "proxy.config.http.cache.heuristic_lm_factor", "proxy.config.http.cache.fuzz.probability",
- "proxy.config.http.background_fill_completed_threshold", "proxy.config.net.sock_packet_mark_out",
- "proxy.config.net.sock_packet_tos_out", "proxy.config.http.insert_age_in_response", "proxy.config.http.chunking.size",
- "proxy.config.http.flow_control.enabled", "proxy.config.http.flow_control.low_water", "proxy.config.http.flow_control.high_water",
- "proxy.config.http.cache.range.lookup", "proxy.config.http.normalize_ae_gzip", "proxy.config.http.default_buffer_size",
- "proxy.config.http.default_buffer_water_mark", "proxy.config.http.request_header_max_size",
- "proxy.config.http.response_header_max_size", "proxy.config.http.negative_revalidating_enabled",
- "proxy.config.http.negative_revalidating_lifetime", "proxy.config.http.accept_encoding_filter_enabled",
- "proxy.config.ssl.hsts_max_age", "proxy.config.ssl.hsts_include_subdomains", "proxy.config.http.cache.open_read_retry_time",
- "proxy.config.http.cache.max_open_read_retries", "proxy.config.http.cache.range.write",
- "proxy.config.http.post.check.content_length.enabled", "proxy.config.http.global_user_agent_header",
- "proxy.config.http.auth_server_session_private", "proxy.config.http.slow.log.threshold", "proxy.config.http.cache.generation",
- "proxy.config.body_factory.template_base", "proxy.config.http.cache.open_write_fail_action",
- "proxy.config.http.redirection_enabled", "proxy.config.http.number_of_redirections",
- "proxy.config.http.cache.max_open_write_retries", "proxy.config.http.redirect_use_orig_cache_key",
- "proxy.config.http.attach_server_session_to_client", "proxy.config.http.origin_max_connections_queue"};
+const char *SDK_Overridable_Configs[TS_CONFIG_LAST_ENTRY] = {"proxy.config.url_remap.pristine_host_hdr",
+ "proxy.config.http.chunking_enabled",
+ "proxy.config.http.negative_caching_enabled",
+ "proxy.config.http.negative_caching_lifetime",
+ "proxy.config.http.cache.when_to_revalidate",
+ "proxy.config.http.keep_alive_enabled_in",
+ "proxy.config.http.keep_alive_enabled_out",
+ "proxy.config.http.keep_alive_post_out",
+ "proxy.config.http.server_session_sharing.match",
+ "proxy.config.net.sock_recv_buffer_size_out",
+ "proxy.config.net.sock_send_buffer_size_out",
+ "proxy.config.net.sock_option_flag_out",
+ "proxy.config.http.forward.proxy_auth_to_parent",
+ "proxy.config.http.anonymize_remove_from",
+ "proxy.config.http.anonymize_remove_referer",
+ "proxy.config.http.anonymize_remove_user_agent",
+ "proxy.config.http.anonymize_remove_cookie",
+ "proxy.config.http.anonymize_remove_client_ip",
+ "proxy.config.http.anonymize_insert_client_ip",
+ "proxy.config.http.response_server_enabled",
+ "proxy.config.http.insert_squid_x_forwarded_for",
+ "proxy.config.http.server_tcp_init_cwnd",
+ "proxy.config.http.send_http11_requests",
+ "proxy.config.http.cache.http",
+ "proxy.config.http.cache.cluster_cache_local",
+ "proxy.config.http.cache.ignore_client_no_cache",
+ "proxy.config.http.cache.ignore_client_cc_max_age",
+ "proxy.config.http.cache.ims_on_client_no_cache",
+ "proxy.config.http.cache.ignore_server_no_cache",
+ "proxy.config.http.cache.cache_responses_to_cookies",
+ "proxy.config.http.cache.ignore_authentication",
+ "proxy.config.http.cache.cache_urls_that_look_dynamic",
+ "proxy.config.http.cache.required_headers",
+ "proxy.config.http.insert_request_via_str",
+ "proxy.config.http.insert_response_via_str",
+ "proxy.config.http.cache.heuristic_min_lifetime",
+ "proxy.config.http.cache.heuristic_max_lifetime",
+ "proxy.config.http.cache.guaranteed_min_lifetime",
+ "proxy.config.http.cache.guaranteed_max_lifetime",
+ "proxy.config.http.cache.max_stale_age",
+ "proxy.config.http.keep_alive_no_activity_timeout_in",
+ "proxy.config.http.keep_alive_no_activity_timeout_out",
+ "proxy.config.http.transaction_no_activity_timeout_in",
+ "proxy.config.http.transaction_no_activity_timeout_out",
+ "proxy.config.http.transaction_active_timeout_out",
+ "proxy.config.http.origin_max_connections",
+ "proxy.config.http.connect_attempts_max_retries",
+ "proxy.config.http.connect_attempts_max_retries_dead_server",
+ "proxy.config.http.connect_attempts_rr_retries",
+ "proxy.config.http.connect_attempts_timeout",
+ "proxy.config.http.post_connect_attempts_timeout",
+ "proxy.config.http.down_server.cache_time",
+ "proxy.config.http.down_server.abort_threshold",
+ "proxy.config.http.cache.fuzz.time",
+ "proxy.config.http.cache.fuzz.min_time",
+ "proxy.config.http.doc_in_cache_skip_dns",
+ "proxy.config.http.background_fill_active_timeout",
+ "proxy.config.http.response_server_str",
+ "proxy.config.http.cache.heuristic_lm_factor",
+ "proxy.config.http.cache.fuzz.probability",
+ "proxy.config.http.background_fill_completed_threshold",
+ "proxy.config.net.sock_packet_mark_out",
+ "proxy.config.net.sock_packet_tos_out",
+ "proxy.config.http.insert_age_in_response",
+ "proxy.config.http.chunking.size",
+ "proxy.config.http.flow_control.enabled",
+ "proxy.config.http.flow_control.low_water",
+ "proxy.config.http.flow_control.high_water",
+ "proxy.config.http.cache.range.lookup",
+ "proxy.config.http.normalize_ae_gzip",
+ "proxy.config.http.default_buffer_size",
+ "proxy.config.http.default_buffer_water_mark",
+ "proxy.config.http.request_header_max_size",
+ "proxy.config.http.response_header_max_size",
+ "proxy.config.http.negative_revalidating_enabled",
+ "proxy.config.http.negative_revalidating_lifetime",
+ "proxy.config.http.accept_encoding_filter_enabled",
+ "proxy.config.ssl.hsts_max_age",
+ "proxy.config.ssl.hsts_include_subdomains",
+ "proxy.config.http.cache.open_read_retry_time",
+ "proxy.config.http.cache.max_open_read_retries",
+ "proxy.config.http.cache.range.write",
+ "proxy.config.http.post.check.content_length.enabled",
+ "proxy.config.http.global_user_agent_header",
+ "proxy.config.http.auth_server_session_private",
+ "proxy.config.http.slow.log.threshold",
+ "proxy.config.http.cache.generation",
+ "proxy.config.body_factory.template_base",
+ "proxy.config.http.cache.open_write_fail_action",
+ "proxy.config.http.redirection_enabled",
+ "proxy.config.http.number_of_redirections",
+ "proxy.config.http.cache.max_open_write_retries",
+ "proxy.config.http.redirect_use_orig_cache_key",
+ "proxy.config.http.attach_server_session_to_client",
+ "proxy.config.http.origin_max_connections_queue"};
REGRESSION_TEST(SDK_API_OVERRIDABLE_CONFIGS)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
@@ -7236,7 +7229,6 @@ REGRESSION_TEST(SDK_API_OVERRIDABLE_CONFIGS)(RegressionTest *test, int /* atype
const char *test_string = "The Apache Traffic Server";
int len;
-
s->init();
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -7321,7 +7313,6 @@ REGRESSION_TEST(SDK_API_TXN_HTTP_INFO_GET)(RegressionTest *test, int /* atype AT
TSHttpTxn txnp = reinterpret_cast<TSHttpTxn>(s);
TSMgmtInt ival_read;
-
s->init();
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -7459,7 +7450,6 @@ REGRESSION_TEST(SDK_API_ENCODING)(RegressionTest *test, int /* atype ATS_UNUSED
return;
}
-
////////////////////////////////////////////////
// SDK_API_DEBUG_NAME_LOOKUPS
//
@@ -7487,7 +7477,6 @@ REGRESSION_TEST(SDK_API_DEBUG_NAME_LOOKUPS)(RegressionTest *test, int /* atype A
SDK_RPRINT(test, "TSHttpServerStateNameLookup", "TestCase1", TC_PASS, "ok");
}
-
str = TSHttpHookNameLookup(TS_HTTP_READ_RESPONSE_HDR_HOOK);
if ((strlen(str) != strlen(hook_name) || strcmp(str, hook_name))) {
SDK_RPRINT(test, "TSHttpHookNameLookup", "TestCase1", TC_FAIL, "Failed on %d, expected %s, got %s",
@@ -7497,7 +7486,6 @@ REGRESSION_TEST(SDK_API_DEBUG_NAME_LOOKUPS)(RegressionTest *test, int /* atype A
SDK_RPRINT(test, "TSHttpHookNameLookup", "TestCase1", TC_PASS, "ok");
}
-
str = TSHttpEventNameLookup(TS_EVENT_IMMEDIATE);
if ((strlen(str) != strlen(event_name) || strcmp(str, event_name))) {
SDK_RPRINT(test, "TSHttpEventNameLookup", "TestCase1", TC_FAIL, "Failed on %d, expected %s, got %s", TS_EVENT_IMMEDIATE,
@@ -7507,7 +7495,6 @@ REGRESSION_TEST(SDK_API_DEBUG_NAME_LOOKUPS)(RegressionTest *test, int /* atype A
SDK_RPRINT(test, "TSHttpEventNameLookup", "TestCase1", TC_PASS, "ok");
}
-
*pstatus = success ? REGRESSION_TEST_PASSED : REGRESSION_TEST_FAILED;
return;
diff --git a/proxy/InkAPITestTool.cc b/proxy/InkAPITestTool.cc
index 75b2efc..fa6d542 100644
--- a/proxy/InkAPITestTool.cc
+++ b/proxy/InkAPITestTool.cc
@@ -125,7 +125,6 @@ typedef struct {
unsigned int magic;
} ClientTxn;
-
//////////////////////////////////////////////////////////////////////////////
// DECLARATIONS
//////////////////////////////////////////////////////////////////////////////
@@ -136,7 +135,6 @@ static char *generate_request(int test_case);
static char *generate_response(const char *request);
static int get_request_id(TSHttpTxn txnp);
-
/* client side */
static ClientTxn *synclient_txn_create(void);
static int synclient_txn_delete(ClientTxn *txn);
@@ -174,7 +172,6 @@ get_body_ptr(const char *request)
return (ptr != NULL) ? (ptr + 4) : NULL;
}
-
/* Caller must free returned request */
static char *
generate_request(int test_case)
@@ -276,7 +273,6 @@ generate_request(int test_case)
return request;
}
-
/* Caller must free returned response */
static char *
generate_response(const char *request)
@@ -360,7 +356,6 @@ generate_response(const char *request)
"\r\n" \
"Body for response 10"
-
int test_case, match, http_version;
char *response = (char *)TSmalloc(RESPONSE_MAX_SIZE + 1);
@@ -409,7 +404,6 @@ generate_response(const char *request)
return response;
}
-
// This routine can be called by tests, from the READ_REQUEST_HDR_HOOK
// to figure out the id of a test message
// Returns id/-1 in case of error
@@ -437,7 +431,6 @@ get_request_id(TSHttpTxn txnp)
return id;
}
-
//////////////////////////////////////////////////////////////////////////////
// SOCKET CLIENT
//////////////////////////////////////////////////////////////////////////////
@@ -540,7 +533,6 @@ synclient_txn_send_request_to_vc(ClientTxn *txn, char *request, TSVConn vc)
return 1;
}
-
static int
synclient_txn_read_response(TSCont contp)
{
@@ -616,7 +608,6 @@ synclient_txn_read_response_handler(TSCont contp, TSEvent event, void * /* data
return 1;
}
-
static int
synclient_txn_write_request(TSCont contp)
{
@@ -689,7 +680,6 @@ synclient_txn_write_request_handler(TSCont contp, TSEvent event, void * /* data
return TS_EVENT_IMMEDIATE;
}
-
static int
synclient_txn_connect_handler(TSCont contp, TSEvent event, void *data)
{
@@ -729,7 +719,6 @@ synclient_txn_connect_handler(TSCont contp, TSEvent event, void *data)
return TS_EVENT_IMMEDIATE;
}
-
static int
synclient_txn_main_handler(TSCont contp, TSEvent event, void *data)
{
@@ -740,7 +729,6 @@ synclient_txn_main_handler(TSCont contp, TSEvent event, void *data)
return (*handler)(contp, event, data);
}
-
//////////////////////////////////////////////////////////////////////////////
// SOCKET SERVER
//////////////////////////////////////////////////////////////////////////////
@@ -840,7 +828,6 @@ synserver_accept_handler(TSCont contp, TSEvent event, void *data)
return TS_EVENT_IMMEDIATE;
}
-
static int
synserver_txn_close(TSCont contp)
{
@@ -865,7 +852,6 @@ synserver_txn_close(TSCont contp)
return TS_EVENT_IMMEDIATE;
}
-
static int
synserver_txn_write_response(TSCont contp)
{
@@ -904,7 +890,6 @@ synserver_txn_write_response(TSCont contp)
return TS_EVENT_IMMEDIATE;
}
-
static int
synserver_txn_write_response_handler(TSCont contp, TSEvent event, void * /* data ATS_UNUSED */)
{
@@ -940,7 +925,6 @@ synserver_txn_write_response_handler(TSCont contp, TSEvent event, void * /* data
return TS_EVENT_IMMEDIATE;
}
-
static int
synserver_txn_read_request(TSCont contp)
{
@@ -1019,7 +1003,6 @@ synserver_txn_read_request_handler(TSCont contp, TSEvent event, void * /* data A
return TS_EVENT_IMMEDIATE;
}
-
static int
synserver_txn_main_handler(TSCont contp, TSEvent event, void *data)
{
diff --git a/proxy/InkIOCoreAPI.cc b/proxy/InkIOCoreAPI.cc
index 5ea27b4..d8b462f 100644
--- a/proxy/InkIOCoreAPI.cc
+++ b/proxy/InkIOCoreAPI.cc
@@ -46,7 +46,6 @@
#define sdk_assert(EX) ((void)((EX) ? (void)0 : _TSReleaseAssert(#EX, __FILE__, __LINE__)))
#endif
-
TSReturnCode
sdk_sanity_check_mutex(TSMutex mutex)
{
@@ -63,7 +62,6 @@ sdk_sanity_check_mutex(TSMutex mutex)
return TS_SUCCESS;
}
-
TSReturnCode
sdk_sanity_check_hostlookup_structure(TSHostLookupResult data)
{
@@ -86,7 +84,6 @@ sdk_sanity_check_iocore_structure(void *data)
TSReturnCode sdk_sanity_check_continuation(TSCont cont);
TSReturnCode sdk_sanity_check_null_ptr(void *ptr);
-
////////////////////////////////////////////////////////////////////
//
// Threads
@@ -94,7 +91,6 @@ TSReturnCode sdk_sanity_check_null_ptr(void *ptr);
////////////////////////////////////////////////////////////////////
struct INKThreadInternal : public EThread {
INKThreadInternal() : EThread(DEDICATED, -1) {}
-
TSThreadFunc func;
void *data;
};
@@ -168,7 +164,6 @@ TSThreadSelf(void)
return ithread;
}
-
////////////////////////////////////////////////////////////////////
//
// Mutexes
@@ -229,7 +224,6 @@ TSMutexLock(TSMutex mutexp)
MUTEX_TAKE_LOCK((ProxyMutex *)mutexp, this_ethread());
}
-
TSReturnCode
TSMutexLockTry(TSMutex mutexp)
{
@@ -401,7 +395,6 @@ INKUDPSendTo(TSCont contp, INKUDPConn udp, unsigned int ip, int port, char *data
return reinterpret_cast<TSAction>(conn->send((Continuation *)contp, packet));
}
-
TSAction
INKUDPRecvFrom(TSCont contp, INKUDPConn udp)
{
@@ -488,7 +481,6 @@ INKUDPPacketGet(INKUDPacketQueue queuep)
return NULL;
}
-
/* Buffers */
TSIOBuffer
diff --git a/proxy/Main.cc b/proxy/Main.cc
index d72b559..089e06a 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -283,7 +283,6 @@ public:
}
~TrackerContinuation() { mutex = NULL; }
-
int
periodic(int event, Event * /* e ATS_UNUSED */)
{
@@ -790,7 +789,6 @@ cmd_verify(char * /* cmd ATS_UNUSED */)
return 0;
}
-
static int cmd_help(char *cmd);
static const struct CMD {
@@ -1180,7 +1178,6 @@ struct ShowStats : public Continuation {
}
};
-
// static void syslog_log_configure()
//
// Reads the syslog configuration variable
@@ -1284,7 +1281,6 @@ run_RegressionTest()
}
#endif // TS_HAS_TESTS
-
static void
chdir_root()
{
@@ -1300,7 +1296,6 @@ chdir_root()
}
}
-
static int
getNumSSLThreads(void)
{
@@ -1782,7 +1777,6 @@ main(int /* argc ATS_UNUSED */, const char **argv)
NetProcessor::accept_mss = accept_mss;
netProcessor.start(0, stacksize);
-
dnsProcessor.start(0, stacksize);
if (hostDBProcessor.start() < 0)
SignalWarning(MGMT_SIGNAL_SYSTEM_ERROR, "bad hostdb or storage configuration, hostdb disabled");
@@ -1834,7 +1828,6 @@ main(int /* argc ATS_UNUSED */, const char **argv)
if (show_statistics)
eventProcessor.schedule_every(new ShowStats(), HRTIME_SECONDS(show_statistics), ET_CALL);
-
//////////////////////////////////////
// main server logic initiated here //
//////////////////////////////////////
@@ -1917,7 +1910,6 @@ main(int /* argc ATS_UNUSED */, const char **argv)
delete main_thread;
}
-
#if TS_HAS_TESTS
//////////////////////////////
// Unit Regresion Test Hook //
diff --git a/proxy/Main.h b/proxy/Main.h
index 5e83bbd..b8a00a0 100644
--- a/proxy/Main.h
+++ b/proxy/Main.h
@@ -29,7 +29,6 @@
#include "ts/Regression.h"
#include "ts/I_Version.h"
-
//
// Constants
//
diff --git a/proxy/Milestones.h b/proxy/Milestones.h
index 078859a..b05d60f 100644
--- a/proxy/Milestones.h
+++ b/proxy/Milestones.h
@@ -38,11 +38,8 @@ class TransactionMilestones
{
public:
TransactionMilestones() { ink_zero(milestones); }
-
ink_hrtime &operator[](TSMilestonesType ms) { return milestones[ms]; }
-
ink_hrtime operator[](TSMilestonesType ms) const { return milestones[ms]; }
-
/**
* Takes two milestones and returns the difference.
* @param start The start time
diff --git a/proxy/ParentConsistentHash.cc b/proxy/ParentConsistentHash.cc
index 67318bd..6c19e9a 100644
--- a/proxy/ParentConsistentHash.cc
+++ b/proxy/ParentConsistentHash.cc
@@ -58,7 +58,6 @@ ParentConsistentHash::~ParentConsistentHash()
delete chash[SECONDARY];
}
-
uint64_t
ParentConsistentHash::getPathHash(HttpRequestData *hrdata, ATSHash64 *h)
{
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index c992d2e..8f5b227 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -540,7 +540,6 @@ ParentRecord::Init(matcher_line *line_info)
bool used = false;
ParentRR_t round_robin = P_NO_ROUND_ROBIN;
-
this->line_num = line_info->line_num;
this->scheme = NULL;
@@ -912,7 +911,6 @@ request_to_data(HttpRequestData *req, sockaddr const *srcip, sockaddr const *dst
http_parser_clear(&parser);
}
-
static int passes;
static int fails;
@@ -948,21 +946,21 @@ EXCLUSIVE_REGRESSION_TEST(PARENTSELECTION)(RegressionTest * /* t ATS_UNUSED */,
params->policy.ParentRetryTime = 5; \
} while (0)
-#define REINIT \
- do { \
- if (request != NULL) { \
- delete request->hdr; \
- ats_free(request->hostname_str); \
- delete request->api_info; \
- } \
- delete request; \
- delete result; \
- request = new HttpRequestData(); \
- result = new ParentResult(); \
- if (!result || !request) { \
- (void) printf("Allocation failed\n"); \
- return; \
- } \
+#define REINIT \
+ do { \
+ if (request != NULL) { \
+ delete request->hdr; \
+ ats_free(request->hostname_str); \
+ delete request->api_info; \
+ } \
+ delete request; \
+ delete result; \
+ request = new HttpRequestData(); \
+ result = new ParentResult(); \
+ if (!result || !request) { \
+ (void)printf("Allocation failed\n"); \
+ return; \
+ } \
} while (0)
#define ST(x) \
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index b7b450c..2f94e2a 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -198,7 +198,6 @@ plugin_expand(char *arg)
break;
}
-
not_found:
Warning("plugin.config: unable to find parameter %s", arg);
return NULL;
diff --git a/proxy/Plugin.h b/proxy/Plugin.h
index 78f05f4..85edf1b 100644
--- a/proxy/Plugin.h
+++ b/proxy/Plugin.h
@@ -67,7 +67,6 @@ class PluginIdentity
public:
/// Make sure destructor is virtual.
virtual ~PluginIdentity() {}
-
/** Get the plugin tag.
The returned string must have a lifetime at least as long as the plugin.
@return A string identifying the plugin or @c NULL.
diff --git a/proxy/PluginVC.cc b/proxy/PluginVC.cc
index b0a5e92..cd25d9a 100644
--- a/proxy/PluginVC.cc
+++ b/proxy/PluginVC.cc
@@ -475,7 +475,6 @@ PluginVC::process_write_side(bool other_side_call)
Debug("pvc", "[%u] %s: process_write_side", core_obj->id, PVC_TYPE);
need_write_process = false;
-
// Check the state of our write buffer as well as ntodo
int64_t ntodo = write_state.vio.ntodo();
if (ntodo == 0) {
@@ -542,7 +541,6 @@ PluginVC::process_write_side(bool other_side_call)
}
}
-
// void PluginVC::process_read_side()
//
// This function may only be called while holding
@@ -1122,7 +1120,6 @@ PluginVCCore::state_send_accept(int /* event ATS_UNUSED */, void * /* data ATS_U
return 0;
}
-
// void PluginVCCore::attempt_delete()
//
// Mutex must be held when calling this function
diff --git a/proxy/Prefetch.cc b/proxy/Prefetch.cc
index 5e3d9ff..ce2213a 100644
--- a/proxy/Prefetch.cc
+++ b/proxy/Prefetch.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include "Prefetch.h"
#include "HdrUtils.h"
#include "HttpCompat.h"
@@ -51,20 +50,20 @@ struct html_tag prefetch_allowable_html_tags[] = {
// this attribute table is hard coded. It has to be the same size as
// the prefetch_allowable_html_tags table
-struct html_tag prefetch_allowable_html_attrs[] = {
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {NULL, NULL},
- {"rel", "stylesheet"}, // We want to prefetch the .css files that are common; make sure this matches {"link", "href"}
- {NULL, NULL}};
+struct html_tag prefetch_allowable_html_attrs[] = {{NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {NULL, NULL},
+ {"rel", "stylesheet"}, // We want to prefetch the .css files that are
+ // common; make sure this matches {"link", "href"}
+ {NULL, NULL}};
static const char *PREFETCH_FIELD_RECURSION;
static int PREFETCH_FIELD_LEN_RECURSION;
@@ -240,7 +239,7 @@ normalize_url(char *url, int *len)
}
} break;
default: /* NONE */
- ;
+ ;
}; /* end of switch (state) */
state = SLASH;
@@ -620,7 +619,6 @@ PrefetchTransform::hash_add(char *s)
if (normalize_url(s, &str_len) > 0)
Debug("PrefetchParserURLs", "Normalized URL: %s\n", s);
-
INK_MD5 hash;
MD5Context().hash_immediate(hash, s, str_len);
index = hash.slice32(1) % HASH_TABLE_LENGTH;
@@ -636,7 +634,6 @@ PrefetchTransform::hash_add(char *s)
return *e;
}
-
#define IS_RECURSIVE_PREFETCH(req_ip) (prefetch_config->max_recursion > 0 && ats_is_ip_loopback(&req_ip))
static void
@@ -731,7 +728,6 @@ check_n_attach_prefetch_transform(HttpSM *sm, HTTPHdr *resp, bool from_cache)
}
}
-
static int
PrefetchPlugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
diff --git a/proxy/Prefetch.h b/proxy/Prefetch.h
index 5ca323b..7b3b00e 100644
--- a/proxy/Prefetch.h
+++ b/proxy/Prefetch.h
@@ -203,7 +203,6 @@ class BlasterUrlList : public Continuation
public:
BlasterUrlList() : Continuation(), timeout(0), action(0), mtu(0), list_head(0), cur_len(0) {}
-
void
init(TSPrefetchBlastData const &bdata = UDP_BLAST_DATA, int tout = 0, int xmtu = INT_MAX)
{
@@ -235,7 +234,6 @@ public:
typedef int (PrefetchUrlBlaster::*EventHandler)(int, void *);
PrefetchUrlBlaster() : url_head(0), action(0) { ink_zero(blast); }
-
void init(PrefetchUrlEntry *list_head, TSPrefetchBlastData const &u_bd = UDP_BLAST_DATA);
void free();
@@ -339,7 +337,6 @@ class KeepAliveConn : public Continuation
{
public:
KeepAliveConn() : Continuation(), nbytes_added(0) { ink_zero(ip); }
-
int init(IpEndpoint const &ip, MIOBuffer *buf, IOBufferReader *reader);
void free();
@@ -386,7 +383,6 @@ class KeepAliveLockHandler : public Continuation
public:
KeepAliveLockHandler() : Continuation() { ink_zero(ip); };
-
void
init(IpEndpoint const &xip, MIOBuffer *xbuf, IOBufferReader *xreader)
{
@@ -401,7 +397,6 @@ public:
}
~KeepAliveLockHandler() { mutex = NULL; }
-
int handleEvent(int event, void *data);
IpEndpoint ip;
@@ -409,7 +404,6 @@ public:
IOBufferReader *reader;
};
-
#define PREFETCH_CONFIG_UPDATE_TIMEOUT (HRTIME_SECOND * 60)
#endif // PREFETCH
diff --git a/proxy/ProtocolProbeSessionAccept.h b/proxy/ProtocolProbeSessionAccept.h
index 9b9e54c..d40404a 100644
--- a/proxy/ProtocolProbeSessionAccept.h
+++ b/proxy/ProtocolProbeSessionAccept.h
@@ -47,7 +47,6 @@ public:
SET_HANDLER(&ProtocolProbeSessionAccept::mainEvent);
}
~ProtocolProbeSessionAccept() {}
-
void registerEndpoint(ProtoGroupKey key, SessionAccept *ap);
void accept(NetVConnection *, MIOBuffer *, IOBufferReader *);
diff --git a/proxy/ProxyClientTransaction.h b/proxy/ProxyClientTransaction.h
index 19800c9..7bba8fc 100644
--- a/proxy/ProxyClientTransaction.h
+++ b/proxy/ProxyClientTransaction.h
@@ -220,7 +220,6 @@ public:
return restart_immediate;
}
-
protected:
ProxyClientSession *parent;
HttpSM *current_reader;
@@ -231,7 +230,6 @@ protected:
bool restart_immediate;
-
private:
};
diff --git a/proxy/ReverseProxy.cc b/proxy/ReverseProxy.cc
index 4a2e145..43af4ed 100644
--- a/proxy/ReverseProxy.cc
+++ b/proxy/ReverseProxy.cc
@@ -116,7 +116,6 @@ response_url_remap(HTTPHdr *response_header)
return rewrite_table ? rewrite_table->ReverseMap(response_header) : false;
}
-
//
//
// End API Functions
diff --git a/proxy/Show.h b/proxy/Show.h
index d014cae..af3f298 100644
--- a/proxy/Show.h
+++ b/proxy/Show.h
@@ -163,5 +163,4 @@ public:
}
};
-
#endif
diff --git a/proxy/SocksProxy.cc b/proxy/SocksProxy.cc
index 3354a75..60448ed 100644
--- a/proxy/SocksProxy.cc
+++ b/proxy/SocksProxy.cc
@@ -62,8 +62,6 @@ struct SocksProxy : public Continuation {
{
}
~SocksProxy() {}
-
-
// int startEvent(int event, void * data);
int mainEvent(int event, void *data);
int setupHttpRequest(unsigned char *p);
@@ -412,7 +410,6 @@ SocksProxy::sendResp(bool granted)
// connect at all. Set these feilds to zeros. Any socks client which uses
// these breaks caching.
-
buf->reset();
unsigned char *p = (unsigned char *)buf->start();
@@ -435,7 +432,6 @@ SocksProxy::sendResp(bool granted)
return n_bytes;
}
-
int
SocksProxy::setupHttpRequest(unsigned char *p)
{
@@ -478,7 +474,6 @@ SocksProxy::setupHttpRequest(unsigned char *p)
return ret;
}
-
static void
new_SocksProxy(NetVConnection *netVC)
{
diff --git a/proxy/StatPages.cc b/proxy/StatPages.cc
index 136c7cd..5cd8c7c 100644
--- a/proxy/StatPages.cc
+++ b/proxy/StatPages.cc
@@ -36,7 +36,6 @@
#define MAX_STAT_PAGES 32
-
// Globals
StatPagesManager statPagesManager;
diff --git a/proxy/StatPages.h b/proxy/StatPages.h
index ba78ec7..5e5b640 100644
--- a/proxy/StatPages.h
+++ b/proxy/StatPages.h
@@ -95,7 +95,6 @@ class BaseStatPagesHandler : public Continuation
public:
BaseStatPagesHandler(ProxyMutex *amutex) : Continuation(amutex), response(NULL), response_size(0), response_length(0){};
~BaseStatPagesHandler() { resp_clear(); };
-
protected:
inkcoreapi void resp_clear(void);
inkcoreapi void resp_add(const char *fmt, ...);
diff --git a/proxy/StufferUdpReceiver.cc b/proxy/StufferUdpReceiver.cc
index 6248619..b059106 100644
--- a/proxy/StufferUdpReceiver.cc
+++ b/proxy/StufferUdpReceiver.cc
@@ -104,7 +104,6 @@ public:
memset(array, 0, size * sizeof(Stream *));
}
~StreamHashTable() { delete[] array; }
-
int
index(prefetch_udp_header *hdr)
{
diff --git a/proxy/TestClusterHash.cc b/proxy/TestClusterHash.cc
index 22cf606..8dd71c3 100644
--- a/proxy/TestClusterHash.cc
+++ b/proxy/TestClusterHash.cc
@@ -28,7 +28,6 @@
#include "Cluster.h"
#include "ts/ink_platform.h"
-
//
// This test function produces the table included
// in Memo.ClusterHash
diff --git a/proxy/TestDNS.cc b/proxy/TestDNS.cc
index e2efce7..4313f7e 100644
--- a/proxy/TestDNS.cc
+++ b/proxy/TestDNS.cc
@@ -58,7 +58,6 @@ ofstream fout;
ofstream fout_rate, fout_rate_misc;
FILE *fin;
-
//////////////////////////////////////////////////////////////////////////////
//
// TestDnsStateMachine
@@ -97,7 +96,6 @@ TestDnsStateMachine::TestDnsStateMachine(char *ahost, size_t size) : Continuatio
return;
}
-
inline const char *
TestDnsStateMachine::currentStateName()
{
diff --git a/proxy/TestPreProc.cc b/proxy/TestPreProc.cc
index 12b0f47..c2de406 100644
--- a/proxy/TestPreProc.cc
+++ b/proxy/TestPreProc.cc
@@ -70,7 +70,6 @@ RequestInput::run()
char *buff = m_cb->getWrite(&maxBytes);
unsigned writeBytes = (m_len < maxBytes) ? m_len : maxBytes;
-
writeBytes = ink_strlcpy(buff, m_sp, maxBytes);
m_cb->wrote(writeBytes);
@@ -177,6 +176,5 @@ main()
cout << "Elapsed time for " << lc << "loops is " << elapsedTime << endl;
}
-
return (0);
}
diff --git a/proxy/TestPreProc.h b/proxy/TestPreProc.h
index 17af028..e9a674b 100644
--- a/proxy/TestPreProc.h
+++ b/proxy/TestPreProc.h
@@ -43,7 +43,6 @@ private:
RequestInput(const RequestInput &);
RequestInput &operator=(const RequestInput &);
-
char *m_sp;
unsigned m_len;
IOBuffer *m_cb;
diff --git a/proxy/TestProxy.cc b/proxy/TestProxy.cc
index 5d807a0..fcc061f 100644
--- a/proxy/TestProxy.cc
+++ b/proxy/TestProxy.cc
@@ -30,7 +30,6 @@
#include "OneWayMultiTunnel.h"
#include "Cache.h"
-
struct TestProxy : Continuation {
VConnection *vc;
VConnection *vconnection_vector[2];
diff --git a/proxy/TestSimpleProxy.cc b/proxy/TestSimpleProxy.cc
index 6cc70f1..412df16 100644
--- a/proxy/TestSimpleProxy.cc
+++ b/proxy/TestSimpleProxy.cc
@@ -137,7 +137,6 @@ struct TestProxy : Continuation {
}
};
-
struct TestAccept : Continuation {
int
startEvent(int event, NetVConnection *e)
diff --git a/proxy/TimeTrace.h b/proxy/TimeTrace.h
index 05c1a01..e6445c2 100644
--- a/proxy/TimeTrace.h
+++ b/proxy/TimeTrace.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
/****************************************************************************
TimeTrace.h
diff --git a/proxy/Transform.cc b/proxy/Transform.cc
index 9444fe7..c33e989 100644
--- a/proxy/Transform.cc
+++ b/proxy/Transform.cc
@@ -65,14 +65,11 @@
#include "HdrUtils.h"
#include "Log.h"
-
#define ART 1
#define AGIF 2
-
TransformProcessor transformProcessor;
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -106,7 +103,6 @@ TransformProcessor::null_transform(ProxyMutex *mutex)
return new NullTransform(mutex);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -119,7 +115,6 @@ TransformProcessor::range_transform(ProxyMutex *mut, RangeRecord *ranges, int nu
return range_transform;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -130,7 +125,6 @@ TransformTerminus::TransformTerminus(TransformVConnection *tvc)
SET_HANDLER(&TransformTerminus::handle_event);
}
-
#define RETRY() \
if (ink_atomic_increment((int *)&m_event_count, 1) < 0) { \
ink_assert(!"not reached"); \
@@ -138,7 +132,6 @@ TransformTerminus::TransformTerminus(TransformVConnection *tvc)
eventProcessor.schedule_in(this, HRTIME_MSECONDS(10), ET_NET); \
return 0;
-
int
TransformTerminus::handle_event(int event, void * /* edata ATS_UNUSED */)
{
@@ -382,7 +375,6 @@ TransformTerminus::reenable(VIO *vio)
}
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -705,7 +697,6 @@ NullTransform::handle_event(int event, void *edata)
return 0;
}
-
/*-------------------------------------------------------------------------
Reasons the JG transform cannot currently be a plugin:
a) Uses the config system
@@ -718,7 +709,6 @@ NullTransform::handle_event(int event, void *edata)
/* the JG transform is now a plugin. All the JG code,
config variables and stats are removed from Transform.cc */
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -732,7 +722,6 @@ TransformTest::run()
}
#endif
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -749,7 +738,6 @@ RangeTransform::RangeTransform(ProxyMutex *mut, RangeRecord *ranges, int num_fie
Debug("http_trans", "RangeTransform creation finishes");
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -759,7 +747,6 @@ RangeTransform::~RangeTransform()
free_MIOBuffer(m_output_buf);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -823,7 +810,6 @@ RangeTransform::handle_event(int event, void *edata)
return 0;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -928,7 +914,6 @@ RangeTransform::transform_to_range()
m_write_vio._cont->handleEvent(VC_EVENT_WRITE_READY, &m_write_vio);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -953,7 +938,6 @@ RangeTransform::add_boundary(bool end)
m_done += m_output_buf->write("\r\n", 2);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1009,7 +993,6 @@ RangeTransform::change_response_header()
if (field != NULL)
m_transform_resp->field_delete(MIME_FIELD_CONTENT_TYPE, MIME_LEN_CONTENT_TYPE);
-
field = m_transform_resp->field_create(MIME_FIELD_CONTENT_TYPE, MIME_LEN_CONTENT_TYPE);
field->value_append(m_transform_resp->m_heap, m_transform_resp->m_mime, range_type, sizeof(range_type) - 1);
diff --git a/proxy/Transform.h b/proxy/Transform.h
index 8585fa0..522b510 100644
--- a/proxy/Transform.h
+++ b/proxy/Transform.h
@@ -32,7 +32,6 @@
typedef struct _RangeRecord {
_RangeRecord() : _start(-1), _end(-1), _done_byte(-1) {}
-
int64_t _start;
int64_t _end;
int64_t _done_byte;
@@ -108,5 +107,4 @@ num_chars_for_int(int64_t i)
extern TransformProcessor transformProcessor;
-
#endif /* __TRANSFORM_H__ */
diff --git a/proxy/TransformInternal.h b/proxy/TransformInternal.h
index ccf83d6..e72ef94 100644
--- a/proxy/TransformInternal.h
+++ b/proxy/TransformInternal.h
@@ -24,16 +24,13 @@
#ifndef __TRANSFORM_INTERNAL_H__
#define __TRANSFORM_INTERNAL_H__
-
#include "HttpSM.h"
#include "MIME.h"
#include "Transform.h"
#include "P_EventSystem.h"
-
class TransformVConnection;
-
class TransformTerminus : public VConnection
{
public:
@@ -58,7 +55,6 @@ public:
int m_called_user;
};
-
class TransformVConnection : public TransformVCChain
{
public:
@@ -86,7 +82,6 @@ public:
volatile int m_closed;
};
-
class TransformControl : public Continuation
{
public:
@@ -101,7 +96,6 @@ public:
MIOBuffer *m_write_buf;
};
-
class NullTransform : public INKVConnInternal
{
public:
@@ -116,7 +110,6 @@ public:
VIO *m_output_vio;
};
-
class RangeTransform : public INKVConnInternal
{
public:
@@ -137,7 +130,6 @@ public:
MIOBuffer *m_output_buf;
IOBufferReader *m_output_reader;
-
// MIMEField *m_range_field;
HTTPHdr *m_transform_resp;
VIO *m_output_vio;
diff --git a/proxy/UDPAPIClientTest.cc b/proxy/UDPAPIClientTest.cc
index 88e74a2..ff41f21 100644
--- a/proxy/UDPAPIClientTest.cc
+++ b/proxy/UDPAPIClientTest.cc
@@ -28,7 +28,6 @@
#include <string.h>
#include <arpa/inet.h>
-
char sendBuff[] = "I'm Alive.";
FILE *fp;
@@ -90,7 +89,6 @@ UDPClient_handle_callbacks(TSCont cont, TSEvent event, void *e)
for (int i = 0; i < avail; i++)
fprintf(fp, "%c", *(buf + i));
-
memcpy((char *)&recvBuff + total_len, buf, avail);
TSIOBufferReaderConsume(reader, avail);
total_len += avail;
diff --git a/proxy/UDPAPITest.cc b/proxy/UDPAPITest.cc
index 7dd74dc..53818b9 100644
--- a/proxy/UDPAPITest.cc
+++ b/proxy/UDPAPITest.cc
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <string.h>
-
char ACK[] = "I got it.";
FILE *fp;
@@ -46,7 +45,6 @@ UDPTestInit()
INKUDPBind(cont, ip, 1813);
}
-
void
printN(const char *start, int length)
{
@@ -74,7 +72,6 @@ handle_callbacks(TSCont cont, TSEvent event, void *e)
int avail, total_len;
char recv_buffer[4096];
-
fp = fopen("UDPServer.log", "a+");
switch (event) {
@@ -84,7 +81,6 @@ handle_callbacks(TSCont cont, TSEvent event, void *e)
INKUDPRecvFrom(cont, UDPConn);
break;
-
case TS_NET_EVENT_DATAGRAM_READ_READY:
fprintf(fp, "read ready event called\n");
packetQueue = (INKUDPacketQueue)e;
@@ -105,7 +101,6 @@ handle_callbacks(TSCont cont, TSEvent event, void *e)
total_len += avail;
}
-
ip = INKUDPPacketFromAddressGet(packet);
port = INKUDPPacketFromPortGet(packet);
fprintf(fp, "port = %d\n", port);
diff --git a/proxy/api/ts/InkAPIPrivateIOCore.h b/proxy/api/ts/InkAPIPrivateIOCore.h
index 9b7371a..2eea5ee 100644
--- a/proxy/api/ts/InkAPIPrivateIOCore.h
+++ b/proxy/api/ts/InkAPIPrivateIOCore.h
@@ -128,7 +128,6 @@ TSReturnCode sdk_sanity_check_iocore_structure(void *);
tsapi TSMutex TSMutexCreateInternal(void);
tsapi int TSMutexCheck(TSMutex mutex);
-
/* IOBuffer */
tsapi void TSIOBufferReaderCopy(TSIOBufferReader readerp, const void *buf, int64_t length);
tsapi int64_t TSIOBufferBlockDataSizeGet(TSIOBufferBlock blockp);
diff --git a/proxy/api/ts/experimental.h b/proxy/api/ts/experimental.h
index 2d6ab10..360bed7 100644
--- a/proxy/api/ts/experimental.h
+++ b/proxy/api/ts/experimental.h
@@ -93,7 +93,6 @@ typedef enum {
*/
tsapi TSReturnCode TSHttpTxnCntl(TSHttpTxn txnp, TSHttpCntlType cntl, void *data);
-
/* Protocols APIs */
tsapi void TSVConnCacheHttpInfoSet(TSVConn connp, TSCacheHttpInfo infop);
@@ -104,7 +103,6 @@ tsapi void TSICPFreshnessFuncSet(TSPluginFreshnessCalcFunc funcp);
tsapi TSReturnCode TSICPCachedReqGet(TSCont contp, TSMBuffer *bufp, TSMLoc *obj);
tsapi TSReturnCode TSICPCachedRespGet(TSCont contp, TSMBuffer *bufp, TSMLoc *obj);
-
/* The rest is from the old "froze" private API include, we should consider
moving some of these over to ts/ts.h as well. TODO */
@@ -162,7 +160,6 @@ tsapi TSReturnCode TSHttpTxnCachedRespTimeGet(TSHttpTxn txnp, time_t *resp_time)
/* ===== Cache ===== */
tsapi TSReturnCode TSCacheKeyDataTypeSet(TSCacheKey key, TSCacheDataType type);
-
/* ===== Utility ===== */
/****************************************************************************
* Create a random number
@@ -201,7 +198,6 @@ tsapi void TSCacheHttpInfoDestroy(TSCacheHttpInfo infop);
*/
tsapi TSReturnCode TSHttpTxnInfoIntGet(TSHttpTxn txnp, TSHttpTxnInfoKey key, TSMgmtInt *value);
-
/* ===== ICP ===== */
tsapi void TSHttpIcpDynamicSet(int value);
@@ -259,7 +255,6 @@ tsapi int TSHttpTxnLookingUpTypeGet(TSHttpTxn txnp);
*/
tsapi TSReturnCode TSPluginDescriptorAccept(TSCont contp);
-
/**
Opens a network connection to the host specified by the 'to' sockaddr
spoofing the client addr to equal the 'from' sockaddr.
@@ -288,7 +283,6 @@ tsapi TSAction TSNetConnectTransparent(
struct sockaddr const *to /**< Address to which to connect. */
);
-
/* ===== Matcher Utils ===== */
#define TS_MATCHER_LINE_INVALID 0
typedef struct tsapi_matcheline *TSMatcherLine;
@@ -501,7 +495,6 @@ tsapi TSClusterRPCMsg_t *TSAllocClusterRPCMsg(TSClusterRPCHandle_t *h, int data_
****************************************************************************/
tsapi int TSSendClusterRPC(TSNodeHandle_t *nh, TSClusterRPCMsg_t *msg);
-
/**
* Extended FetchSM's AIPs
*/
diff --git a/proxy/api/ts/remap.h b/proxy/api/ts/remap.h
index c6f3cab..22531ed 100644
--- a/proxy/api/ts/remap.h
+++ b/proxy/api/ts/remap.h
@@ -41,7 +41,6 @@ typedef struct _tsremap_api_info {
unsigned long tsremap_version; /* in: TS supported version ((major << 16) | minor) */
} TSRemapInterface;
-
typedef struct _tm_remap_request_info {
/* Important: You should *not* release these buf pointers or TSMLocs from your plugin! */
@@ -61,7 +60,6 @@ typedef struct _tm_remap_request_info {
int redirect;
} TSRemapRequestInfo;
-
/* This is the type returned by the TSRemapDoRemap() callback */
typedef enum {
TSREMAP_NO_REMAP = 0, /* No remaping was done, continue with next in chain */
@@ -78,7 +76,6 @@ typedef enum {
TSREMAP_ERROR = -1 /* Some error, that should generate an error page */
} TSRemapStatus;
-
/* ----------------------------------------------------------------------------------
These are the entry points a plugin can implement. Note that TSRemapInit() and
TSRemapDoRemap() are both required.
@@ -92,7 +89,6 @@ typedef enum {
*/
tsapi TSReturnCode TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size);
-
/* Remap new request
Mandatory interface function.
Remap API plugin can/should use SDK API function calls inside this function!
@@ -103,12 +99,10 @@ tsapi TSReturnCode TSRemapInit(TSRemapInterface *api_info, char *errbuf, int err
*/
tsapi TSRemapStatus TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri);
-
/* Plugin shutdown, called when plugin is unloaded.
Optional function. */
tsapi void TSRemapDone(void);
-
/* Plugin new instance. Create new plugin processing entry for unique remap record.
First two arguments in argv vector are - fromURL and toURL from remap record.
Please keep in mind that fromURL and toURL will be converted to canonical view.
@@ -118,7 +112,6 @@ tsapi void TSRemapDone(void);
tsapi TSReturnCode TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf, int errbuf_size);
tsapi void TSRemapDeleteInstance(void *);
-
/* Check response code from Origin Server
os_response_type -> TSServerState
Remap API plugin can use InkAPI function calls inside TSRemapDoRemap()
diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h
index 7ef9914..1593784 100644
--- a/proxy/api/ts/ts.h
+++ b/proxy/api/ts/ts.h
@@ -697,8 +697,8 @@ tsapi TSReturnCode TSUrlHttpFragmentSet(TSMBuffer bufp, TSMLoc offset, const cha
@param map optional (can be NULL) map of characters to encode.
*/
-tsapi TSReturnCode
-TSStringPercentEncode(const char *str, int str_len, char *dst, size_t dst_size, size_t *length, const unsigned char *map);
+tsapi TSReturnCode TSStringPercentEncode(const char *str, int str_len, char *dst, size_t dst_size, size_t *length,
+ const unsigned char *map);
/**
Similar to TSStringPercentEncode(), but works on a URL object.
@@ -711,8 +711,8 @@ TSStringPercentEncode(const char *str, int str_len, char *dst, size_t dst_size,
@param map optional (can be NULL) map of characters to encode.
*/
-tsapi TSReturnCode
-TSUrlPercentEncode(TSMBuffer bufp, TSMLoc offset, char *dst, size_t dst_size, size_t *length, const unsigned char *map);
+tsapi TSReturnCode TSUrlPercentEncode(TSMBuffer bufp, TSMLoc offset, char *dst, size_t dst_size, size_t *length,
+ const unsigned char *map);
/**
Perform percent-decoding of the string in the buffer, writing
@@ -729,7 +729,6 @@ TSUrlPercentEncode(TSMBuffer bufp, TSMLoc offset, char *dst, size_t dst_size, si
*/
tsapi TSReturnCode TSStringPercentDecode(const char *str, size_t str_len, char *dst, size_t dst_size, size_t *length);
-
/* --------------------------------------------------------------------------
MIME headers */
@@ -979,10 +978,10 @@ tsapi TSReturnCode TSMimeHdrFieldCreateNamed(TSMBuffer bufp, TSMLoc mh_mloc, con
*/
tsapi TSReturnCode TSMimeHdrFieldDestroy(TSMBuffer bufp, TSMLoc hdr, TSMLoc field);
-tsapi TSReturnCode
-TSMimeHdrFieldClone(TSMBuffer dest_bufp, TSMLoc dest_hdr, TSMBuffer src_bufp, TSMLoc src_hdr, TSMLoc src_field, TSMLoc *locp);
-tsapi TSReturnCode
-TSMimeHdrFieldCopy(TSMBuffer dest_bufp, TSMLoc dest_hdr, TSMLoc dest_field, TSMBuffer src_bufp, TSMLoc src_hdr, TSMLoc src_field);
+tsapi TSReturnCode TSMimeHdrFieldClone(TSMBuffer dest_bufp, TSMLoc dest_hdr, TSMBuffer src_bufp, TSMLoc src_hdr, TSMLoc src_field,
+ TSMLoc *locp);
+tsapi TSReturnCode TSMimeHdrFieldCopy(TSMBuffer dest_bufp, TSMLoc dest_hdr, TSMLoc dest_field, TSMBuffer src_bufp, TSMLoc src_hdr,
+ TSMLoc src_field);
tsapi TSReturnCode TSMimeHdrFieldCopyValues(TSMBuffer dest_bufp, TSMLoc dest_hdr, TSMLoc dest_field, TSMBuffer src_bufp,
TSMLoc src_hdr, TSMLoc src_field);
tsapi TSMLoc TSMimeHdrFieldNext(TSMBuffer bufp, TSMLoc hdr, TSMLoc field);
@@ -1007,8 +1006,8 @@ tsapi TSReturnCode TSMimeHdrFieldValueDateSet(TSMBuffer bufp, TSMLoc hdr, TSMLoc
tsapi TSReturnCode TSMimeHdrFieldValueAppend(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, int idx, const char *value, int length);
/* These Insert() APIs should be considered. Use the corresponding Set() API instead */
-tsapi TSReturnCode
-TSMimeHdrFieldValueStringInsert(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, int idx, const char *value, int length);
+tsapi TSReturnCode TSMimeHdrFieldValueStringInsert(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, int idx, const char *value,
+ int length);
tsapi TSReturnCode TSMimeHdrFieldValueIntInsert(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, int idx, int value);
tsapi TSReturnCode TSMimeHdrFieldValueUintInsert(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, int idx, unsigned int value);
tsapi TSReturnCode TSMimeHdrFieldValueDateInsert(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, time_t value);
@@ -1726,10 +1725,10 @@ tsapi struct sockaddr const *TSNetVConnRemoteAddrGet(TSVConn vc);
or cancel the attempt to connect.
*/
-tsapi TSAction
-TSNetConnect(TSCont contp, /**< continuation that is called back when the attempted net connection either succeeds or fails. */
- struct sockaddr const *to /**< Address to which to connect. */
- );
+tsapi TSAction TSNetConnect(
+ TSCont contp, /**< continuation that is called back when the attempted net connection either succeeds or fails. */
+ struct sockaddr const *to /**< Address to which to connect. */
+ );
tsapi TSAction TSNetAccept(TSCont contp, int port, int domain, int accept_threads);
@@ -2244,7 +2243,6 @@ tsapi void TSVConnActiveTimeoutCancel(TSVConn connp);
*/
tsapi void TSSkipRemappingSet(TSHttpTxn txnp, int flag);
-
/*
Set or get various overridable configurations, for a transaction. This should
probably be done as early as possible, e.g. TS_HTTP_READ_REQUEST_HDR_HOOK.
diff --git a/proxy/congest/Congestion.h b/proxy/congest/Congestion.h
index 85786fc..f6df309 100644
--- a/proxy/congest/Congestion.h
+++ b/proxy/congest/Congestion.h
@@ -171,7 +171,6 @@ struct FailHistory {
}
};
-
struct CongestionEntry : public RequestData {
// key in the hash table;
uint64_t m_key;
@@ -341,7 +340,6 @@ CongestionEntry::connect_timeout()
}
}
-
inline void
CongestionEntry::stat_inc_F()
{
@@ -396,7 +394,6 @@ inline CongestionEntry::CongestionEntry()
m_hist_lock = new_ProxyMutex();
}
-
inline CongestionEntry::~CongestionEntry()
{
if (m_hostname)
diff --git a/proxy/congest/CongestionDB.cc b/proxy/congest/CongestionDB.cc
index 3015f0f..62356d5 100644
--- a/proxy/congest/CongestionDB.cc
+++ b/proxy/congest/CongestionDB.cc
@@ -40,7 +40,6 @@ int CONGESTION_DB_SIZE = 1024;
CongestionDB *theCongestionDB = NULL;
-
/*
* the CongestionDBCont is the continuation to do the congestion db related work
* when the CongestionDB's corresponding function does not get the lock in the
@@ -57,7 +56,6 @@ public:
int get_congest_entry(int event, Event *e);
-
Action m_action;
// To save momery, use a union here
diff --git a/proxy/congest/CongestionDB.h b/proxy/congest/CongestionDB.h
index a6931b1..84b78ff 100644
--- a/proxy/congest/CongestionDB.h
+++ b/proxy/congest/CongestionDB.h
@@ -39,7 +39,6 @@
#include "MT_hashtable.h"
#include "ControlMatcher.h"
-
class CongestionControlRecord;
struct CongestionEntry;
@@ -75,9 +74,7 @@ struct CongestRequestParam {
};
CongestRequestParam() : m_key(0), m_op(REVALIDATE_BUCKET), m_pEntry(NULL) {}
-
~CongestRequestParam() {}
-
uint64_t m_key;
Op_t m_op;
CongestionEntry *m_pEntry;
diff --git a/proxy/congest/CongestionTest.cc b/proxy/congest/CongestionTest.cc
index f546f54..fc83948 100644
--- a/proxy/congest/CongestionTest.cc
+++ b/proxy/congest/CongestionTest.cc
@@ -381,7 +381,6 @@ struct CCCongestionDBTestCont : public Continuation {
int dbsize;
CongestionEntry *gen_CongestionEntry(sockaddr const *ip, int congested = 0);
-
CCCongestionDBTestCont(Ptr<ProxyMutex> _mutex, RegressionTest *_test)
: Continuation(_mutex), final_status(REGRESSION_TEST_PASSED), complete(false), test(_test), rule(NULL), db(NULL), dbsize(1024)
{
@@ -478,7 +477,6 @@ CCCongestionDBTestCont::mainEvent(int /* event ATS_UNUSED */, Event * /* e ATS_U
rprintf(test, "There are %d records in the db\n", items[0]);
-
rprintf(test, "Add %d records into the db", to_add);
for (i = 0; i < to_add; i++) {
if (i % (to_add / 25) == 0)
diff --git a/proxy/congest/MT_hashtable.h b/proxy/congest/MT_hashtable.h
index 32969b6..12cebb9 100644
--- a/proxy/congest/MT_hashtable.h
+++ b/proxy/congest/MT_hashtable.h
@@ -72,7 +72,6 @@ template <class key_t, class data_t> class HashTableIteratorState
{
public:
HashTableIteratorState() : cur_buck(-1), ppcur(NULL) {}
-
int cur_buck;
HashTableEntry<key_t, data_t> **ppcur;
};
@@ -90,7 +89,6 @@ public:
memset(buckets, 0, bucket_num * sizeof(HashTableEntry<key_t, data_t> *));
}
~IMTHashTable() { reset(); }
-
int
getBucketNum()
{
@@ -241,7 +239,6 @@ IMTHashTable<key_t, data_t>::insert_entry(key_t key, data_t data)
return (data_t)0;
}
-
template <class key_t, class data_t>
inline data_t
IMTHashTable<key_t, data_t>::remove_entry(key_t key)
@@ -283,7 +280,6 @@ IMTHashTable<key_t, data_t>::lookup_entry(key_t key)
return ret;
}
-
template <class key_t, class data_t>
inline data_t
IMTHashTable<key_t, data_t>::first_entry(int bucket_id, HashTableIteratorState<key_t, data_t> *s)
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index f0447d5..31fc92e 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -160,7 +160,6 @@ is_digit(char c)
return ((c <= '9') && (c >= '0'));
}
-
/***********************************************************************
* *
* M A I N C O D E *
@@ -225,7 +224,6 @@ http_init()
HTTP_WKSIDX_PUSH = hdrtoken_wks_to_index(HTTP_METHOD_PUSH);
HTTP_WKSIDX_METHODS_CNT++;
-
HTTP_LEN_CONNECT = hdrtoken_wks_to_length(HTTP_METHOD_CONNECT);
HTTP_LEN_DELETE = hdrtoken_wks_to_length(HTTP_METHOD_DELETE);
HTTP_LEN_GET = hdrtoken_wks_to_length(HTTP_METHOD_GET);
@@ -641,7 +639,6 @@ http_hdr_length_get(HTTPHdrImpl *hdr)
return length;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -708,7 +705,6 @@ http_hdr_url_set(HdrHeap *heap, HTTPHdrImpl *hh, URLImpl *url)
}
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1490,7 +1486,6 @@ http_parse_qvalue(const char *&buf, int &len)
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-
/*-------------------------------------------------------------------------
TE = "TE" ":" #( t-codings )
t-codings = "trailers" | ( transfer-extension [ accept-params ] )
@@ -1727,7 +1722,6 @@ HTTPHdrImpl::marshal(MarshalXlate *ptr_xlate, int num_ptr, MarshalXlate *str_xla
return 0;
}
-
void
HTTPHdrImpl::unmarshal(intptr_t offset)
{
@@ -1743,7 +1737,6 @@ HTTPHdrImpl::unmarshal(intptr_t offset)
HDR_UNMARSHAL_PTR(m_fields_impl, MIMEHdrImpl, offset);
}
-
void
HTTPHdrImpl::move_strings(HdrStrHeap *new_heap)
{
@@ -1890,7 +1883,6 @@ HTTPInfo::copy_frag_offsets_from(HTTPInfo *src)
m_alt->copy_frag_offsets_from(src->m_alt);
}
-
int
HTTPInfo::marshal_length()
{
@@ -2119,7 +2111,6 @@ HTTPInfo::check_marshalled(char *buf, int len)
return true;
}
-
// void HTTPInfo::set_buffer_reference(RefCountObj* block_ref)
//
// Setting a buffer reference for the alt is separate from
diff --git a/proxy/hdrs/HTTP.h b/proxy/hdrs/HTTP.h
index 7d91687..ae20b48 100644
--- a/proxy/hdrs/HTTP.h
+++ b/proxy/hdrs/HTTP.h
@@ -230,7 +230,6 @@ enum SquidHitMissCode {
SQUID_HIT_NET = SQUID_HIT_LEVEL_5
};
-
enum HTTPType {
HTTP_TYPE_UNKNOWN,
HTTP_TYPE_REQUEST,
@@ -275,31 +274,26 @@ struct HTTPValAccept {
double qvalue;
};
-
struct HTTPValAcceptCharset {
char *charset;
double qvalue;
};
-
struct HTTPValAcceptEncoding {
char *encoding;
double qvalue;
};
-
struct HTTPValAcceptLanguage {
char *language;
double qvalue;
};
-
struct HTTPValFieldList {
char *name;
HTTPValFieldList *next;
};
-
struct HTTPValCacheControl {
const char *directive;
@@ -309,27 +303,23 @@ struct HTTPValCacheControl {
} u;
};
-
struct HTTPValRange {
int start;
int end;
HTTPValRange *next;
};
-
struct HTTPValTE {
char *encoding;
double qvalue;
};
-
struct HTTPParser {
bool m_parsing_http;
bool m_allow_non_http;
MIMEParser m_mime_parser;
};
-
extern const char *HTTP_METHOD_CONNECT;
extern const char *HTTP_METHOD_DELETE;
extern const char *HTTP_METHOD_GET;
@@ -355,7 +345,6 @@ extern int HTTP_WKSIDX_TRACE;
extern int HTTP_WKSIDX_PUSH;
extern int HTTP_WKSIDX_METHODS_CNT;
-
extern int HTTP_LEN_CONNECT;
extern int HTTP_LEN_DELETE;
extern int HTTP_LEN_GET;
@@ -457,11 +446,9 @@ MIMEParseResult validate_hdr_host(HTTPHdrImpl *hh);
MIMEParseResult http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const char **start, const char *end,
bool must_copy_strings, bool eof);
-
HTTPStatus http_parse_status(const char *start, const char *end);
int32_t http_parse_version(const char *start, const char *end);
-
/*
HTTPValAccept* http_parse_accept (const char *buf, Arena *arena);
HTTPValAcceptCharset* http_parse_accept_charset (const char *buf, Arena *arena);
@@ -473,7 +460,6 @@ HTTPValRange* http_parse_range (const char *buf, Arena *arena);
*/
HTTPValTE *http_parse_te(const char *buf, int len, Arena *arena);
-
class HTTPVersion
{
public:
@@ -645,7 +631,6 @@ public:
bool is_keep_alive_set() const;
HTTPKeepAlive keep_alive_get() const;
-
protected:
/** Load the target cache.
@see m_host, m_port, m_target_in_url
@@ -668,7 +653,6 @@ private:
friend class UrlPrintHack; // don't ask.
};
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -711,7 +695,8 @@ HTTPVersion::set(int ver_major, int ver_minor)
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-inline HTTPVersion &HTTPVersion::operator=(const HTTPVersion &hv)
+inline HTTPVersion &
+HTTPVersion::operator=(const HTTPVersion &hv)
{
m_version = hv.m_version;
@@ -721,7 +706,8 @@ inline HTTPVersion &HTTPVersion::operator=(const HTTPVersion &hv)
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-inline int HTTPVersion::operator==(const HTTPVersion &hv) const
+inline int
+HTTPVersion::operator==(const HTTPVersion &hv) const
{
return (m_version == hv.m_version);
}
@@ -729,7 +715,8 @@ inline int HTTPVersion::operator==(const HTTPVersion &hv) const
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-inline int HTTPVersion::operator!=(const HTTPVersion &hv) const
+inline int
+HTTPVersion::operator!=(const HTTPVersion &hv) const
{
return (m_version != hv.m_version);
}
@@ -737,7 +724,8 @@ inline int HTTPVersion::operator!=(const HTTPVersion &hv) const
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-inline int HTTPVersion::operator>(const HTTPVersion &hv) const
+inline int
+HTTPVersion::operator>(const HTTPVersion &hv) const
{
return (m_version > hv.m_version);
}
@@ -745,7 +733,8 @@ inline int HTTPVersion::operator>(const HTTPVersion &hv) const
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-inline int HTTPVersion::operator<(const HTTPVersion &hv) const
+inline int
+HTTPVersion::operator<(const HTTPVersion &hv) const
{
return (m_version < hv.m_version);
}
@@ -753,7 +742,8 @@ inline int HTTPVersion::operator<(const HTTPVersion &hv) const
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-inline int HTTPVersion::operator>=(const HTTPVersion &hv) const
+inline int
+HTTPVersion::operator>=(const HTTPVersion &hv) const
{
return (m_version >= hv.m_version);
}
@@ -761,12 +751,12 @@ inline int HTTPVersion::operator>=(const HTTPVersion &hv) const
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-inline int HTTPVersion::operator<=(const HTTPVersion &hv) const
+inline int
+HTTPVersion::operator<=(const HTTPVersion &hv) const
{
return (m_version <= hv.m_version);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -774,7 +764,6 @@ inline HTTPHdr::HTTPHdr() : MIMEHdr(), m_http(NULL), m_url_cached(), m_target_ca
{
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
inline HTTPHdr::~HTTPHdr()
@@ -1066,7 +1055,6 @@ HTTPHdr::method_get(int *length)
return http_hdr_method_get(m_http, length);
}
-
inline int
HTTPHdr::method_get_wksidx()
{
@@ -1076,7 +1064,6 @@ HTTPHdr::method_get_wksidx()
return (m_http->u.req.m_method_wks_idx);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1385,9 +1372,7 @@ public:
HTTPCacheAlt *m_alt;
HTTPInfo() : m_alt(NULL) {}
-
~HTTPInfo() { clear(); }
-
void
clear()
{
@@ -1539,7 +1524,8 @@ HTTPInfo::destroy()
clear();
}
-inline HTTPInfo &HTTPInfo::operator=(const HTTPInfo &m)
+inline HTTPInfo &
+HTTPInfo::operator=(const HTTPInfo &m)
{
m_alt = m.m_alt;
return *this;
diff --git a/proxy/hdrs/HdrHeap.cc b/proxy/hdrs/HdrHeap.cc
index 802ba1a..4fe3c69 100644
--- a/proxy/hdrs/HdrHeap.cc
+++ b/proxy/hdrs/HdrHeap.cc
@@ -131,7 +131,6 @@ new_HdrHeap(int size)
h->m_size = size;
h->init();
-
return h;
}
@@ -204,7 +203,6 @@ HdrHeap::allocate_obj(int nbytes, int type)
HdrHeap *h = this;
-
while (1) {
if ((unsigned)nbytes <= (h->m_free_size)) {
new_space = h->m_free_start;
@@ -237,7 +235,6 @@ HdrHeap::deallocate_obj(HdrHeapObjImpl *obj)
obj->m_type = HDR_HEAP_OBJ_EMPTY;
}
-
char *
HdrHeap::allocate_str(int nbytes)
{
@@ -257,7 +254,6 @@ HdrHeap::allocate_str(int nbytes)
goto FAILED;
}
-
RETRY:
// First check to see if we have a read/write
// string heap
@@ -321,7 +317,6 @@ HdrHeap::duplicate_str(const char *str, int nbytes)
return (new_str);
}
-
// int HdrHeap::demote_rw_str_heap()
//
// Returns 0 on success and non-zero failure
@@ -499,7 +494,6 @@ HdrHeap::sanity_check_strs()
}
}
-
// Loop over the objects in heap call the check
// function on each one
HdrHeap *h = this;
@@ -538,7 +532,6 @@ HdrHeap::sanity_check_strs()
}
}
-
// int HdrHeap::marshal_length()
//
// Determines what the length of a buffer needs to
@@ -599,7 +592,6 @@ compute_checksum(void *buf, int len)
}
#endif
-
// int HdrHeap::marshal(char* buf, int len)
//
// Creates a marshalled representation of the contents
@@ -811,7 +803,6 @@ Failed:
return -1;
}
-
// bool HdrHeap::check_marshalled(char* buf, int buf_length) {
//
// Takes in marshalled buffer and verifies whether stuff appears
@@ -828,7 +819,7 @@ HdrHeap::check_marshalled(uint32_t buf_length)
return false;
}
- if (this->m_size != (uintptr_t) this->m_ronly_heap[0].m_heap_start) {
+ if (this->m_size != (uintptr_t)this->m_ronly_heap[0].m_heap_start) {
return false;
}
@@ -928,7 +919,7 @@ HdrHeap::unmarshal(int buf_length, int obj_type, HdrHeapObjImpl **found_obj, Ref
// Loop over objects and swizzle there pointer to
// live offsets
char *obj_data = m_data_start;
- intptr_t offset = (intptr_t) this;
+ intptr_t offset = (intptr_t)this;
while (obj_data < m_free_start) {
HdrHeapObjImpl *obj = (HdrHeapObjImpl *)obj_data;
@@ -1001,7 +992,6 @@ HdrHeap::attach_str_heap(char *h_start, int h_len, RefCountObj *h_ref_obj, int *
return 1;
}
-
// void HdrHeap::inhertit_string_heaps(const HdrHeap* inherit_from)
//
// Inherits all of inherit_from's string heaps as read-only
@@ -1099,7 +1089,7 @@ HdrHeap::dump_heap(int len)
}
end = ((char *)this) + len;
- fprintf(stderr, "---- Dumping header heap @ 0x%" PRIx64 " - len %d ------", (uint64_t)((ptrdiff_t) this), len);
+ fprintf(stderr, "---- Dumping header heap @ 0x%" PRIx64 " - len %d ------", (uint64_t)((ptrdiff_t)this), len);
while (tmp < end) {
if (count % 4 == 0) {
@@ -1124,7 +1114,6 @@ HdrHeap::dump_heap(int len)
fprintf(stderr, "\n-------------- End header heap dump -----------\n");
}
-
void
HdrStrHeap::free()
{
@@ -1177,7 +1166,6 @@ HdrStrHeap::expand(char *ptr, int old_size, int new_size)
}
}
-
StrHeapDesc::StrHeapDesc()
{
m_heap_start = NULL;
@@ -1259,7 +1247,6 @@ REGRESSION_TEST(HdrHeap_Coalesce)(RegressionTest *t, int /* atype ATS_UNUSED */,
"Checking that the aliased string shows having proper length");
tb.check(aliased_str_url->m_ptr_path == buf3, "Checking that the aliased string is correctly pointing at buf");
-
for (int i = 0; i < HDR_BUF_RONLY_HEAPS; ++i) {
tb.check(heap->m_ronly_heap[i].m_heap_start != (char *)NULL, "Post non-copied string: Checking ronly_heap[%d] is NOT NULL", i);
}
@@ -1272,7 +1259,6 @@ REGRESSION_TEST(HdrHeap_Coalesce)(RegressionTest *t, int /* atype ATS_UNUSED */,
// copied the above string onto the heap. The new behaviour fixed in TS-2766 will make sure that this non copied
// string is accounted for, in the old implementation it would result in an allocation failure.
-
char *str = heap->allocate_str(1); // this will force a coalese.
tb.check(str != NULL, "Checking that 1 byte allocated string is not NULL");
diff --git a/proxy/hdrs/HdrHeap.h b/proxy/hdrs/HdrHeap.h
index a06baf7..cf206cd 100644
--- a/proxy/hdrs/HdrHeap.h
+++ b/proxy/hdrs/HdrHeap.h
@@ -149,7 +149,6 @@ struct StrHeapDesc {
}
};
-
class IOBufferBlock;
class HdrStrHeap : public RefCountObj
@@ -317,7 +316,6 @@ HdrHeap::unmarshal_size() const
return m_size + m_ronly_heap[0].m_heap_len;
}
-
//
struct MarshalXlate {
char *start;
@@ -330,7 +328,6 @@ struct HeapCheck {
char *end;
};
-
// Nasty macro to do string marshalling
#define HDR_MARSHAL_STR(ptr, table, nentries) \
if (ptr) { \
@@ -362,7 +359,6 @@ struct HeapCheck {
} \
}
-
#define HDR_MARSHAL_PTR(ptr, type, table, nentries) \
if (ptr) { \
int found = 0; \
@@ -392,7 +388,6 @@ struct HeapCheck {
} \
}
-
#define HDR_UNMARSHAL_STR(ptr, offset) \
if (ptr) { \
ptr = ((char *)ptr) + offset; \
@@ -440,9 +435,7 @@ struct HeapCheck {
struct HdrHeapSDKHandle {
public:
HdrHeapSDKHandle() : m_heap(NULL) {}
-
~HdrHeapSDKHandle() { clear(); }
-
// clear() only deallocates chained SDK return values
// The underlying MBuffer is left untouched
void clear();
diff --git a/proxy/hdrs/HdrTSOnly.cc b/proxy/hdrs/HdrTSOnly.cc
index 08705d2..c6aef49 100644
--- a/proxy/hdrs/HdrTSOnly.cc
+++ b/proxy/hdrs/HdrTSOnly.cc
@@ -58,7 +58,6 @@ HTTPHdr::parse_req(HTTPParser *parser, IOBufferReader *r, int *bytes_used, bool
MIMEParseResult state = PARSE_CONT;
*bytes_used = 0;
-
do {
int64_t b_avail = r->block_read_avail();
@@ -146,7 +145,6 @@ HdrHeap::set_ronly_str_heap_end(int slot, const char *end)
m_ronly_heap[slot].m_heap_len = (int)(end - m_ronly_heap[slot].m_heap_start);
}
-
// void HdrHeap::attach_block(IOBufferBlock* b, const char* use_start)
//
// Attachs data from an IOBuffer block to
diff --git a/proxy/hdrs/HdrTest.cc b/proxy/hdrs/HdrTest.cc
index 368241f..5ec020c 100644
--- a/proxy/hdrs/HdrTest.cc
+++ b/proxy/hdrs/HdrTest.cc
@@ -94,14 +94,10 @@ HdrTest::test_error_page_selection()
const char *set_name;
const char *content_language;
const char *content_charset;
- } sets[] = {{"default", "en", "iso-8859-1"},
- {"en-cockney", "en-cockney", "iso-8859-1"},
- {"en", "en", "iso-8859-1"},
- {"en-us", "en-us", "us-ascii"},
- {"en", "en", "unicode"},
- {"en-cockney-slang", "en-cockney-slang", "iso-8859-1"},
- {"ko", "ko", "iso-8859-1"},
- {"ko", "ko", "iso-2022-kr"},
+ } sets[] = {{"default", "en", "iso-8859-1"}, {"en-cockney", "en-cockney", "iso-8859-1"},
+ {"en", "en", "iso-8859-1"}, {"en-us", "en-us", "us-ascii"},
+ {"en", "en", "unicode"}, {"en-cockney-slang", "en-cockney-slang", "iso-8859-1"},
+ {"ko", "ko", "iso-8859-1"}, {"ko", "ko", "iso-2022-kr"},
{"jp", "jp", "shift-jis"}};
static struct {
@@ -358,7 +354,6 @@ HdrTest::test_url()
"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]/some/path", "http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]:8080/some/path",
"http://172.16.28.101/", "http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]:8080/",
-
"foo:bar@some.place", "foo:bar@some.place/", "http://foo:bar@some.place", "http://foo:bar@some.place/",
"http://foo:bar@[::1]:8080/", "http://foo@[::1]",
@@ -367,8 +362,15 @@ HdrTest::test_url()
"/finance/external/cbsm/*http://cbs.marketwatch.com/archive/19990713/news/current/net.htx?source=blq/yhoo&dist=yhoo",
"http://a.b.com/xx.jpg?newpath=http://bob.dave.com"};
- static char const *bad[] = {"http://[1:2:3:4:5:6:7:8:9]", "http://1:2:3:4:5:6:7:8:A:B", "http://bob.com[::1]", "http://[::1].com",
- "http://foo:bar:baz@bob.com/", "http://foo:bar:baz@[::1]:8080/", "http://]", "http://:", "http:/"};
+ static char const *bad[] = {"http://[1:2:3:4:5:6:7:8:9]",
+ "http://1:2:3:4:5:6:7:8:A:B",
+ "http://bob.com[::1]",
+ "http://[::1].com",
+ "http://foo:bar:baz@bob.com/",
+ "http://foo:bar:baz@[::1]:8080/",
+ "http://]",
+ "http://:",
+ "http:/"};
int err, failed;
URL url;
@@ -581,7 +583,6 @@ HdrTest::test_mime()
hdr.print(NULL, 0, NULL, NULL);
printf("\n");
-
obj_describe((HdrHeapObjImpl *)(hdr.m_mime), true);
hdr.fields_clear();
@@ -1011,7 +1012,6 @@ comp_http_hdr(HTTPHdr *h1, HTTPHdr *h2)
}
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1050,7 +1050,6 @@ HdrTest::test_http_hdr_copy_over_aux(int testnum, const char *request, const cha
}
http_parser_clear(&parser);
-
/*** (2) parse the response string into hdr ***/
resp_hdr.create(HTTP_TYPE_RESPONSE);
@@ -1621,7 +1620,6 @@ HdrTest::test_http_mutation()
resp_hdr.field_delete(field_name, (int)strlen(field_name));
}
-
printf("\n======== mutated response ==========\n\n");
printf("\n[");
resp_hdr.print(NULL, 0, NULL, NULL);
@@ -1765,7 +1763,6 @@ HdrTest::test_accept_language_match()
return (failures_to_status("test_accept_language_match", failures));
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1841,24 +1838,15 @@ HdrTest::test_comma_vals()
int offset;
int len;
} pieces[4];
- } tests[] = {{",", 2, {{0, 0}, {1, 0}, {-1, 0}, {-1, 0}}},
- {"", 1, {{0, 0}, {-1, 0}, {-1, 0}, {-1, 0}}},
- {" ", 1, {{0, 0}, {-1, 0}, {-1, 0}, {-1, 0}}},
- {", ", 2, {{0, 0}, {1, 0}, {-1, 0}, {-1, 0}}},
- {",,", 3, {{0, 0}, {1, 0}, {2, 0}, {-1, 0}}},
- {" ,", 2, {{0, 0}, {2, 0}, {-1, 0}, {-1, 0}}},
- {" , ", 2, {{0, 0}, {2, 0}, {-1, 0}, {-1, 0}}},
- {"a, ", 2, {{0, 1}, {2, 0}, {-1, 0}, {-1, 0}}},
- {" a, ", 2, {{1, 1}, {3, 0}, {-1, 0}, {-1, 0}}},
- {" ,a", 2, {{0, 0}, {2, 1}, {-1, 0}, {-1, 0}}},
- {" , a", 2, {{0, 0}, {3, 1}, {-1, 0}, {-1, 0}}},
- {"a,a", 2, {{0, 1}, {2, 1}, {-1, 0}, {-1, 0}}},
- {"foo", 1, {{0, 3}, {-1, 0}, {-1, 0}, {-1, 0}}},
- {"foo,", 2, {{0, 3}, {4, 0}, {-1, 0}, {-1, 0}}},
- {"foo, ", 2, {{0, 3}, {4, 0}, {-1, 0}, {-1, 0}}},
- {"foo, bar", 2, {{0, 3}, {5, 3}, {-1, 0}, {-1, 0}}},
- {"foo, bar,", 3, {{0, 3}, {5, 3}, {9, 0}, {-1, 0}}},
- {"foo, bar, ", 3, {{0, 3}, {5, 3}, {9, 0}, {-1, 0}}},
+ } tests[] = {{",", 2, {{0, 0}, {1, 0}, {-1, 0}, {-1, 0}}}, {"", 1, {{0, 0}, {-1, 0}, {-1, 0}, {-1, 0}}},
+ {" ", 1, {{0, 0}, {-1, 0}, {-1, 0}, {-1, 0}}}, {", ", 2, {{0, 0}, {1, 0}, {-1, 0}, {-1, 0}}},
+ {",,", 3, {{0, 0}, {1, 0}, {2, 0}, {-1, 0}}}, {" ,", 2, {{0, 0}, {2, 0}, {-1, 0}, {-1, 0}}},
+ {" , ", 2, {{0, 0}, {2, 0}, {-1, 0}, {-1, 0}}}, {"a, ", 2, {{0, 1}, {2, 0}, {-1, 0}, {-1, 0}}},
+ {" a, ", 2, {{1, 1}, {3, 0}, {-1, 0}, {-1, 0}}}, {" ,a", 2, {{0, 0}, {2, 1}, {-1, 0}, {-1, 0}}},
+ {" , a", 2, {{0, 0}, {3, 1}, {-1, 0}, {-1, 0}}}, {"a,a", 2, {{0, 1}, {2, 1}, {-1, 0}, {-1, 0}}},
+ {"foo", 1, {{0, 3}, {-1, 0}, {-1, 0}, {-1, 0}}}, {"foo,", 2, {{0, 3}, {4, 0}, {-1, 0}, {-1, 0}}},
+ {"foo, ", 2, {{0, 3}, {4, 0}, {-1, 0}, {-1, 0}}}, {"foo, bar", 2, {{0, 3}, {5, 3}, {-1, 0}, {-1, 0}}},
+ {"foo, bar,", 3, {{0, 3}, {5, 3}, {9, 0}, {-1, 0}}}, {"foo, bar, ", 3, {{0, 3}, {5, 3}, {9, 0}, {-1, 0}}},
{",foo,bar,", 4, {{0, 0}, {1, 3}, {5, 3}, {9, 0}}}};
bri_box("test_comma_vals");
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index a2f1c29..78fd909 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -158,7 +158,6 @@ static HdrTokenTypeBinding _hdrtoken_strs_type_initializers[] = {{"file", HDRTOK
{(char *)NULL, (HdrTokenType)0}};
-
static HdrTokenFieldInfo _hdrtoken_strs_field_initializers[] = {
{"Accept", MIME_SLOTID_ACCEPT, MIME_PRESENCE_ACCEPT, (HTIF_COMMAS | HTIF_MULTVALS)},
{"Accept-Charset", MIME_SLOTID_ACCEPT_CHARSET, MIME_PRESENCE_ACCEPT_CHARSET, (HTIF_COMMAS | HTIF_MULTVALS)},
@@ -386,7 +385,6 @@ hdrtoken_hash_init()
abort();
}
-
/***********************************************************************
* *
* M A I N H D R T O K E N C O D E *
diff --git a/proxy/hdrs/HdrUtils.cc b/proxy/hdrs/HdrUtils.cc
index 8285c76..5528fe9 100644
--- a/proxy/hdrs/HdrUtils.cc
+++ b/proxy/hdrs/HdrUtils.cc
@@ -133,7 +133,6 @@ HdrCsvIter::get_nth(MIMEField *field, int *len, int n, bool follow_dups)
return (s);
}
-
int
HdrCsvIter::count_values(MIMEField *field, bool follow_dups)
{
@@ -149,7 +148,6 @@ HdrCsvIter::count_values(MIMEField *field, bool follow_dups)
return (count);
}
-
/*
int main() {
diff --git a/proxy/hdrs/HdrUtils.h b/proxy/hdrs/HdrUtils.h
index efbbd90..7deeaf7 100644
--- a/proxy/hdrs/HdrUtils.h
+++ b/proxy/hdrs/HdrUtils.h
@@ -121,7 +121,6 @@ HdrCsvIter::get_first(const MIMEField *m, int *len, bool follow_dups)
return m_csv_start;
}
-
inline const char *
HdrCsvIter::get_next(int *len)
{
@@ -176,5 +175,4 @@ HdrCsvIter::get_next_int(int *valid)
}
}
-
#endif
diff --git a/proxy/hdrs/HttpCompat.cc b/proxy/hdrs/HttpCompat.cc
index f60b476..b2b4173 100644
--- a/proxy/hdrs/HttpCompat.cc
+++ b/proxy/hdrs/HttpCompat.cc
@@ -25,7 +25,6 @@
#include "HttpCompat.h"
#include "HdrUtils.h" /* MAGIC_EDITING_TAG */
-
//////////////////////////////////////////////////////////////////////////////
//
// HttpCompat::parse_tok_list
@@ -245,7 +244,6 @@ HttpCompat::lookup_param_in_strlist(StrList *param_list, const char *param_name,
return (false);
}
-
//////////////////////////////////////////////////////////////////////////////
//
// bool HttpCompat::lookup_param_in_semicolon_string(
@@ -274,7 +272,6 @@ HttpCompat::lookup_param_in_semicolon_string(const char *semicolon_string, int s
return (result);
}
-
//////////////////////////////////////////////////////////////////////////////
//
// void HttpCompat::parse_mime_type(
@@ -814,7 +811,6 @@ HttpCompat::determine_set_by_language(RawHashTable *table_of_sets, StrList *acpt
Debug("body_factory_determine_set", " SET: [%-8s] A-C match value => [ Qc=%g ]", set_name, Qc);
}
-
/////////////////////////////////////////////////////////////////
// We get back the Q value, the matching field length, and the //
// matching field index. We sort by largest Q value, but if //
diff --git a/proxy/hdrs/HttpCompat.h b/proxy/hdrs/HttpCompat.h
index 2ef1107..d9d46da 100644
--- a/proxy/hdrs/HttpCompat.h
+++ b/proxy/hdrs/HttpCompat.h
@@ -37,7 +37,6 @@ struct HttpBodySetRawData {
RawHashTable *table_of_pages;
};
-
class HttpCompat
{
public:
diff --git a/proxy/hdrs/MIME.cc b/proxy/hdrs/MIME.cc
index b0dbc82..bc59907 100644
--- a/proxy/hdrs/MIME.cc
+++ b/proxy/hdrs/MIME.cc
@@ -43,7 +43,6 @@
#define TRACK_COOKING 0
#define MIME_FORMAT_DATE_USE_LOOKUP_TABLE 1
-
/***********************************************************************
* *
* C O N S T A N T S *
@@ -70,7 +69,6 @@ static MDY *_days_to_mdy_fast_lookup_table = NULL;
static unsigned int _days_to_mdy_fast_lookup_table_first_day;
static unsigned int _days_to_mdy_fast_lookup_table_last_day;
-
/***********************************************************************
* *
* G L O B A L S *
@@ -364,7 +362,6 @@ is_ws(char c)
return ((c == ParseRules::CHAR_SP) || (c == ParseRules::CHAR_HT));
}
-
/***********************************************************************
* *
* P R E S E N C E B I T S *
@@ -541,7 +538,6 @@ checksum_block(const char *s, int len)
return sum;
}
-
#ifdef DEBUG
void
mime_hdr_sanity_check(MIMEHdrImpl *mh)
@@ -637,7 +633,6 @@ mime_hdr_sanity_check(MIMEHdrImpl *mh)
}
#endif
-
void
mime_init()
{
@@ -733,7 +728,6 @@ mime_init()
MIME_FIELD_HTTP2_SETTINGS = hdrtoken_string_to_wks("HTTP2-Settings");
-
MIME_LEN_ACCEPT = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT);
MIME_LEN_ACCEPT_CHARSET = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_CHARSET);
MIME_LEN_ACCEPT_ENCODING = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_ENCODING);
@@ -814,7 +808,6 @@ mime_init()
MIME_LEN_HTTP2_SETTINGS = hdrtoken_wks_to_length(MIME_FIELD_HTTP2_SETTINGS);
-
MIME_WKSIDX_ACCEPT = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT);
MIME_WKSIDX_ACCEPT_CHARSET = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_CHARSET);
MIME_WKSIDX_ACCEPT_ENCODING = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_ENCODING);
@@ -917,7 +910,6 @@ mime_init()
MIME_VALUE_WEBSOCKET = hdrtoken_string_to_wks("websocket");
MIME_VALUE_H2C = hdrtoken_string_to_wks(MIME_UPGRADE_H2C_TOKEN);
-
mime_init_date_format_table();
mime_init_cache_control_cooking_masks();
}
@@ -1959,7 +1951,6 @@ mime_field_value_delete_comma_val(HdrHeap *heap, MIMEHdrImpl *mh, MIMEField *fie
/* End Fix for bug INKqa09752 */
/************************************/
-
// (4) reassemble the new string
field->m_ptr_value = mime_field_value_str_from_strlist(heap, &len, &list);
field->m_len_value = len;
@@ -2592,7 +2583,6 @@ mime_parser_parse(MIMEParser *parser, HdrHeap *heap, MIMEHdrImpl *mh, const char
// build and insert the new field object //
///////////////////////////////////////////
-
MIMEField *field = mime_field_create(heap, mh);
mime_field_name_value_set(heap, mh, field, field_name_wks_idx, field_name_first, field_name_length, field_value_first,
field_value_length, true, total_line_length, 0);
@@ -3156,7 +3146,6 @@ mime_parse_int64(const char *buf, const char *end)
}
}
-
/*-------------------------------------------------------------------------
mime_parse_rfc822_date_fastcase (const char *buf, int length, struct tm *tp)
@@ -3531,7 +3520,6 @@ mime_parse_integer(const char *&buf, const char *end, int *integer)
return 1;
}
-
/***********************************************************************
* *
* M A R S H A L I N G *
@@ -3576,7 +3564,6 @@ MIMEFieldBlockImpl::unmarshal(intptr_t offset)
{
HDR_UNMARSHAL_PTR(m_next, MIMEFieldBlockImpl, offset);
-
for (uint32_t index = 0; index < m_freetop; index++) {
MIMEField *field = &(m_field_slots[index]);
@@ -3687,7 +3674,6 @@ MIMEHdrImpl::recompute_accelerators_and_presence_bits()
mime_hdr_reset_accelerators_and_presence_bits(this);
}
-
/***********************************************************************
* *
* C O O K E D V A L U E C A C H E *
@@ -3702,7 +3688,6 @@ MIMEHdrImpl::recompute_accelerators_and_presence_bits()
// detaching the field //
////////////////////////////////////////////////////////
-
void
MIMEHdrImpl::recompute_cooked_stuff(MIMEField *changing_field_or_null)
{
diff --git a/proxy/hdrs/MIME.h b/proxy/hdrs/MIME.h
index 5e4f4e3..99cc33f 100644
--- a/proxy/hdrs/MIME.h
+++ b/proxy/hdrs/MIME.h
@@ -287,7 +287,6 @@ struct MIMEScanner {
MimeParseState m_state; ///< Parsing machine state.
};
-
struct MIMEParser {
MIMEScanner m_scanner;
int32_t m_field;
@@ -904,7 +903,6 @@ MIMEField::has_dups() const
struct MIMEFieldIter {
MIMEFieldIter() : m_slot(0), m_block(NULL) {}
-
uint32_t m_slot;
MIMEFieldBlockImpl *m_block;
};
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index f5de83f..c343b42 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -107,7 +107,6 @@ is_host_char(char c)
(c == '~') || (c == '%'));
}
-
// Checks if `addr` is a valid FQDN string
bool
validate_host_name(ts::ConstBuffer addr)
@@ -120,7 +119,6 @@ validate_host_name(ts::ConstBuffer addr)
return true;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
URLHashContext::HashType URLHashContext::Setting = URLHashContext::MD5;
@@ -1575,7 +1573,6 @@ url_describe(HdrHeapObjImpl *raw, bool /* recurse ATS_UNUSED */)
(obj->m_ptr_fragment ? obj->m_ptr_fragment : "NULL"), obj->m_len_fragment);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1595,7 +1592,6 @@ memcpy_tolower(char *d, const char *s, int n)
}
}
-
#define BUFSIZE 512
// fast path for MD5, HTTP, no user/password/params/query,
@@ -1640,7 +1636,6 @@ url_MD5_get_fast(const URLImpl *url, CryptoContext &ctx, CryptoHash *hash, cache
ctx.finalize(hash);
}
-
static inline void
url_MD5_get_general(const URLImpl *url, CryptoContext &ctx, CryptoHash &hash, cache_generation_t generation)
{
@@ -1764,7 +1759,6 @@ url_host_MD5_get(URLImpl *url, INK_MD5 *md5)
ctx.finalize(*md5);
}
-
/*-------------------------------------------------------------------------
* Regression tests
-------------------------------------------------------------------------*/
diff --git a/proxy/hdrs/URL.h b/proxy/hdrs/URL.h
index 5982635..bb7741a 100644
--- a/proxy/hdrs/URL.h
+++ b/proxy/hdrs/URL.h
@@ -249,7 +249,6 @@ char *url_unescapify(Arena *arena, const char *str, int length);
void unescape_str(char *&buf, char *buf_e, const char *&str, const char *str_e, int &state);
void unescape_str_tolower(char *&buf, char *end, const char *&str, const char *str_e, int &state);
-
inline int
url_canonicalize_port(int type, int port)
{
@@ -330,7 +329,6 @@ private:
URL &operator=(const URL &u);
};
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -500,7 +498,6 @@ URL::scheme_get(int *length)
return (url_scheme_get(m_url_impl, length));
}
-
inline int
URL::scheme_get_wksidx()
{
diff --git a/proxy/hdrs/load_http_hdr.cc b/proxy/hdrs/load_http_hdr.cc
index 3bf7dac..dc9b5da 100644
--- a/proxy/hdrs/load_http_hdr.cc
+++ b/proxy/hdrs/load_http_hdr.cc
@@ -42,7 +42,6 @@
* state and is therefore not useful for must purposes.
***************************************************************************/
-
#include "HdrHeap.h"
#include "MIME.h"
#include "HTTP.h"
@@ -88,7 +87,6 @@ load_string(const char *s, int len, int offset)
return r;
}
-
void
process_http_hdr_impl(HdrHeapObjImpl *obj, int offset)
{
@@ -143,7 +141,6 @@ process_mime_hdr_impl(HdrHeapObjImpl *obj, int offset)
process_mime_block_impl(&mhdr->m_first_fblock, offset);
}
-
void
loop_over_heap_objs(HdrHeap *hdr_heap, int offset)
{
@@ -195,7 +192,6 @@ loop_over_heap_objs(HdrHeap *hdr_heap, int offset)
}
}
-
void
load_buffer(int fd, hdr_type h_type)
{
@@ -209,7 +205,6 @@ load_buffer(int fd, hdr_type h_type)
char *file_buf = (char *)ats_malloc(sizeof(char) * (s_info.st_size + 1));
file_buf[s_info.st_size] = '\0';
-
// Read in the entire file
int bytes_to_read = s_info.st_size;
while (bytes_to_read > 0) {
@@ -229,7 +224,6 @@ load_buffer(int fd, hdr_type h_type)
Tokenizer line_tok("\n");
Tokenizer el_tok(" \t");
-
int num_lines = line_tok.Initialize(file_buf);
int num_el = el_tok.Initialize(line_tok[0]);
diff --git a/proxy/hdrs/test_header.cc b/proxy/hdrs/test_header.cc
index ed3f212..176d32b 100644
--- a/proxy/hdrs/test_header.cc
+++ b/proxy/hdrs/test_header.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include <stdlib.h>
#include <string.h>
@@ -68,7 +67,6 @@ main(int argc, char *argv[])
return (0);
}
-
static void
test_parse_date()
{
@@ -115,7 +113,6 @@ test_parse_date()
printf("*** %s ***\n", (failures ? "FAILED" : "PASSED"));
}
-
static void
test_format_date()
{
@@ -181,7 +178,6 @@ test_format_date()
printf("*** %s ***\n", (failures ? "FAILED" : "PASSED"));
}
-
static void
test_url()
{
@@ -265,7 +261,6 @@ test_url()
printf("*** %s ***\n", (failed ? "FAILED" : "PASSED"));
}
-
static void
test_mime()
{
@@ -346,7 +341,6 @@ test_mime()
printf("FAILED: set_date(%ld) ... get_date = %ld\n\n", t1, t2);
}
-
hdr.value_append("Cache-Control", 13, "no-cache", 8, 1);
MIMEField *cc_field;
@@ -355,7 +349,6 @@ test_mime()
cc_field = hdr.field_find("Cache-Control", 13);
slist_count = cc_field->value_get_comma_list(&slist); // FIX: correct usage?
-
mime_parser_clear(&parser);
hdr.print(NULL, 0, NULL, NULL);
@@ -368,7 +361,6 @@ test_mime()
hdr.destroy();
}
-
static void
test_http_parser_eos_boundary_cases()
{
@@ -447,7 +439,6 @@ test_http_parser_eos_boundary_cases()
printf("*** %s ***\n", (failures ? "FAILED" : "PASSED"));
}
-
static void
test_http_aux(const char *request, const char *response)
{
@@ -566,7 +557,6 @@ test_http_aux(const char *request, const char *response)
rsp_hdr.destroy();
}
-
static void
test_http()
{
@@ -718,7 +708,6 @@ test_http()
static const char response_blank3[] = {" "
"\r\n"};
-
test_http_aux(request0, response0);
test_http_aux(request09, response09);
test_http_aux(request1, response1);
@@ -808,7 +797,6 @@ test_http_mutation()
resp_hdr.field_delete(field_name, strlen(field_name));
}
-
printf("\n======== mutated response ==========\n\n");
printf("\n[");
resp_hdr.print(NULL, 0, NULL, NULL);
@@ -831,7 +819,6 @@ test_arena_aux(Arena *arena, int len)
}
}
-
static void
test_arena()
{
@@ -863,7 +850,6 @@ test_arena()
printf("*** %s ***\n", (failures ? "FAILED" : "PASSED"));
}
-
static void
test_regex()
{
@@ -878,7 +864,6 @@ test_regex()
printf("match www.apache.org [%d]\n", dfa.match("www.apache.org"));
}
-
static void
test_accept_language_match()
{
diff --git a/proxy/hdrs/test_urlhash.cc b/proxy/hdrs/test_urlhash.cc
index ed9f599..c91c9bb 100644
--- a/proxy/hdrs/test_urlhash.cc
+++ b/proxy/hdrs/test_urlhash.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#include <stdlib.h>
#include <string.h>
diff --git a/proxy/http/Http1ClientSession.h b/proxy/http/Http1ClientSession.h
index 3f76519..613717d 100644
--- a/proxy/http/Http1ClientSession.h
+++ b/proxy/http/Http1ClientSession.h
@@ -186,7 +186,6 @@ private:
VIO *ka_vio;
VIO *slave_ka_vio;
-
HttpServerSession *bound_ss;
public:
@@ -204,7 +203,6 @@ public:
/// Transparently pass-through non-HTTP traffic.
bool f_transparent_passthrough;
-
// for DI. An active connection is one that a request has
// been successfully parsed (PARSE_DONE) and it remains to
// be active until the transaction goes through or the client
diff --git a/proxy/http/Http1ClientTransaction.h b/proxy/http/Http1ClientTransaction.h
index 4d1eba0..ff1ccb7 100644
--- a/proxy/http/Http1ClientTransaction.h
+++ b/proxy/http/Http1ClientTransaction.h
@@ -34,7 +34,6 @@ public:
typedef ProxyClientTransaction super;
Http1ClientTransaction() : super() {}
-
// Implement VConnection interface.
virtual VIO *
do_io_read(Continuation *c, int64_t nbytes = INT64_MAX, MIOBuffer *buf = 0)
diff --git a/proxy/http/HttpBodyFactory.cc b/proxy/http/HttpBodyFactory.cc
index 540f01c..8483a3a 100644
--- a/proxy/http/HttpBodyFactory.cc
+++ b/proxy/http/HttpBodyFactory.cc
@@ -241,7 +241,6 @@ HttpBodyFactory::dump_template_tables(FILE *fp)
unlock();
}
-
////////////////////////////////////////////////////////////////////////
//
// Configuration Change Callback
@@ -383,14 +382,12 @@ HttpBodyFactory::HttpBodyFactory()
}
}
-
HttpBodyFactory::~HttpBodyFactory()
{
// FIX: need to implement destructor
delete table_of_sets;
}
-
// LOCKING: must be called with lock taken
char *
HttpBodyFactory::fabricate(StrList *acpt_language_list, StrList *acpt_charset_list, const char *type, HttpTransact::State *context,
@@ -455,7 +452,6 @@ HttpBodyFactory::fabricate(StrList *acpt_language_list, StrList *acpt_charset_li
return (buffer);
}
-
// LOCKING: must be called with lock taken
const char *
HttpBodyFactory::determine_set_by_host(HttpTransact::State *context)
@@ -524,7 +520,6 @@ HttpBodyFactory::find_template(const char *set, const char *type, HttpBodySet **
return (NULL);
}
-
// LOCKING: must be called with lock taken
bool
HttpBodyFactory::is_response_suppressed(HttpTransact::State *context)
@@ -553,7 +548,6 @@ HttpBodyFactory::is_response_suppressed(HttpTransact::State *context)
}
}
-
// LOCKING: must be called with lock taken
void
HttpBodyFactory::nuke_template_tables()
@@ -611,7 +605,6 @@ HttpBodyFactory::nuke_template_tables()
table_of_sets = NULL;
}
-
// LOCKING: must be called with lock taken
RawHashTable *
HttpBodyFactory::load_sets_from_directory(char *set_dir)
@@ -678,7 +671,6 @@ HttpBodyFactory::load_sets_from_directory(char *set_dir)
return (new_table_of_sets);
}
-
// LOCKING: must be called with lock taken
HttpBodySet *
HttpBodyFactory::load_body_set_from_directory(char *set_name, char *tmpl_dir)
@@ -755,7 +747,6 @@ HttpBodyFactory::load_body_set_from_directory(char *set_name, char *tmpl_dir)
return (body_set);
}
-
////////////////////////////////////////////////////////////////////////
//
// class HttpBodySet
@@ -773,7 +764,6 @@ HttpBodySet::HttpBodySet()
table_of_pages = NULL;
}
-
HttpBodySet::~HttpBodySet()
{
ats_free(set_name);
@@ -783,7 +773,6 @@ HttpBodySet::~HttpBodySet()
delete table_of_pages;
}
-
int
HttpBodySet::init(char *set, char *dir)
{
@@ -894,7 +883,6 @@ HttpBodySet::init(char *set, char *dir)
return (lines_added);
}
-
HttpBodyTemplate *
HttpBodySet::get_template_by_name(const char *name)
{
@@ -917,7 +905,6 @@ HttpBodySet::get_template_by_name(const char *name)
return (NULL);
}
-
void
HttpBodySet::set_template_by_name(const char *name, HttpBodyTemplate *t)
{
@@ -938,13 +925,11 @@ HttpBodyTemplate::HttpBodyTemplate()
template_pathname = NULL;
}
-
HttpBodyTemplate::~HttpBodyTemplate()
{
reset();
}
-
void
HttpBodyTemplate::reset()
{
@@ -954,7 +939,6 @@ HttpBodyTemplate::reset()
ats_free(template_pathname);
}
-
int
HttpBodyTemplate::load_from_file(char *dir, char *file)
{
diff --git a/proxy/http/HttpBodyFactory.h b/proxy/http/HttpBodyFactory.h
index f5c4086..ddfe11a 100644
--- a/proxy/http/HttpBodyFactory.h
+++ b/proxy/http/HttpBodyFactory.h
@@ -66,7 +66,6 @@
#include "Main.h"
#include "ts/RawHashTable.h"
-
#define HTTP_BODY_TEMPLATE_MAGIC 0xB0DFAC00
#define HTTP_BODY_SET_MAGIC 0xB0DFAC55
#define HTTP_BODY_FACTORY_MAGIC 0xB0DFACFF
@@ -103,7 +102,6 @@ public:
char *template_pathname;
};
-
////////////////////////////////////////////////////////////////////////
//
// class HttpBodySet
@@ -134,7 +132,6 @@ public:
void set_template_by_name(const char *name, HttpBodyTemplate *t);
};
-
////////////////////////////////////////////////////////////////////////
//
// class HttpBodyFactory
diff --git a/proxy/http/HttpCacheSM.cc b/proxy/http/HttpCacheSM.cc
index 64e2650..f471eaa 100644
--- a/proxy/http/HttpCacheSM.cc
+++ b/proxy/http/HttpCacheSM.cc
@@ -45,7 +45,6 @@
#define REMEMBER(e, r) master_sm->add_history_entry(__FILE__ ":" _REMEMBER(__LINE__), e, r);
-
HttpCacheAction::HttpCacheAction() : sm(NULL)
{
}
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 504a385..4d6a2c6 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -49,7 +49,6 @@
REC_EstablishStaticConfigByte(_ix, _n); \
REC_RegisterConfigUpdateFunc(_n, http_config_cb, NULL)
-
RecRawStatBlock *http_rsb;
#define HTTP_CLEAR_DYN_STAT(x) \
do { \
@@ -57,7 +56,6 @@ RecRawStatBlock *http_rsb;
RecSetRawStatCount(http_rsb, x, 0); \
} while (0);
-
class HttpConfigCont : public Continuation
{
public:
@@ -77,7 +75,7 @@ template <typename T> struct ConfigEnumPair {
/// If found @a value is set to the corresponding value in @a list.
template <typename T, unsigned N>
static bool
-http_config_enum_search(char const *key, const ConfigEnumPair<T>(&list)[N], MgmtByte &value)
+http_config_enum_search(char const *key, const ConfigEnumPair<T> (&list)[N], MgmtByte &value)
{
// We don't expect any of these lists to be more than 10 long, so a linear search is the best choice.
for (unsigned i = 0; i < N; ++i) {
@@ -95,7 +93,7 @@ http_config_enum_search(char const *key, const ConfigEnumPair<T>(&list)[N], Mgmt
/// If found @a value is set to the corresponding value in @a list.
template <typename T, unsigned N>
static bool
-http_config_enum_read(char const *name, const ConfigEnumPair<T>(&list)[N], MgmtByte &value)
+http_config_enum_read(char const *name, const ConfigEnumPair<T> (&list)[N], MgmtByte &value)
{
char key[512]; // it's just one key - painful UI if keys are longer than this
if (REC_ERR_OKAY == RecGetRecordString(name, key, sizeof(key))) {
@@ -127,7 +125,6 @@ HttpUserAgent_RegxEntry *HttpConfig::user_agent_list = NULL;
static volatile int http_config_changes = 1;
static HttpConfigCont *http_config_cont = NULL;
-
HttpConfigCont::HttpConfigCont() : Continuation(new_ProxyMutex())
{
SET_HANDLER(&HttpConfigCont::handle_event);
@@ -142,7 +139,6 @@ HttpConfigCont::handle_event(int /* event ATS_UNUSED */, void * /* edata ATS_UNU
return 0;
}
-
static int
http_config_cb(const char * /* name ATS_UNUSED */, RecDataT /* data_type ATS_UNUSED */, RecData /* data ATS_UNUSED */,
void * /* cookie ATS_UNUSED */)
@@ -738,7 +734,6 @@ register_stat_callbacks()
RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.5xx_responses", RECD_COUNTER, RECP_PERSISTENT,
(int)http_response_status_5xx_count_stat, RecRawStatSyncCount);
-
////////////////////////////////////////////////////////////////////////////////
// http - time and count of transactions classified by client's point of view //
// the internal stat is in msecs, the output time is float seconds //
@@ -774,7 +769,6 @@ register_stat_callbacks()
RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.transaction_totaltime.miss_changed", RECD_FLOAT, RECP_PERSISTENT,
(int)http_ua_msecs_counts_miss_changed_stat, RecRawStatSyncIntMsecsToFloatSeconds);
-
RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.transaction_counts.miss_client_no_cache", RECD_COUNTER,
RECP_PERSISTENT, (int)http_ua_msecs_counts_miss_client_no_cache_stat, RecRawStatSyncCount);
RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.transaction_totaltime.miss_client_no_cache", RECD_FLOAT,
@@ -860,7 +854,6 @@ register_stat_callbacks()
(int)http_sm_finish_time_stat, RecRawStatSyncSum);
}
-
////////////////////////////////////////////////////////////////
//
// HttpConfig::startup()
@@ -972,7 +965,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigLongLong(c.oride.sock_packet_mark_out, "proxy.config.net.sock_packet_mark_out");
HttpEstablishStaticConfigLongLong(c.oride.sock_packet_tos_out, "proxy.config.net.sock_packet_tos_out");
-
HttpEstablishStaticConfigByte(c.oride.fwd_proxy_auth_to_parent, "proxy.config.http.forward.proxy_auth_to_parent");
HttpEstablishStaticConfigByte(c.oride.anonymize_remove_from, "proxy.config.http.anonymize_remove_from");
@@ -993,7 +985,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigByte(c.oride.insert_squid_x_forwarded_for, "proxy.config.http.insert_squid_x_forwarded_for");
-
HttpEstablishStaticConfigByte(c.oride.insert_age_in_response, "proxy.config.http.insert_age_in_response");
HttpEstablishStaticConfigByte(c.enable_http_stats, "proxy.config.http.enable_http_stats");
HttpEstablishStaticConfigByte(c.oride.normalize_ae_gzip, "proxy.config.http.normalize_ae_gzip");
@@ -1246,7 +1237,6 @@ HttpConfig::reconfigure()
params->oride.sock_packet_mark_out = m_master.oride.sock_packet_mark_out;
params->oride.sock_packet_tos_out = m_master.oride.sock_packet_tos_out;
-
params->oride.fwd_proxy_auth_to_parent = INT_TO_BOOL(m_master.oride.fwd_proxy_auth_to_parent);
params->oride.anonymize_remove_from = INT_TO_BOOL(m_master.oride.anonymize_remove_from);
@@ -1550,7 +1540,6 @@ HttpConfig::parse_url_expansions(char *url_expansions_str, int *num_expansions)
return expansions;
}
-
////////////////////////////////////////////////////////////////
//
// HttpConfig::cluster_delta_cb
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 1f1f487..6db1078 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -347,7 +347,6 @@ struct HttpConfigPortRange {
HttpConfigPortRange *next;
HttpConfigPortRange() : low(0), high(0), next(0) {}
-
~HttpConfigPortRange()
{
if (next)
@@ -601,7 +600,6 @@ struct OverridableHttpConfigParams {
MgmtInt number_of_redirections;
};
-
/////////////////////////////////////////////////////////////
//
// struct HttpConfigParams
diff --git a/proxy/http/HttpConnectionCount.cc b/proxy/http/HttpConnectionCount.cc
index 9f482a9..3966ce0 100644
--- a/proxy/http/HttpConnectionCount.cc
+++ b/proxy/http/HttpConnectionCount.cc
@@ -23,6 +23,5 @@
#include "HttpConnectionCount.h"
-
ConnectionCount ConnectionCount::_connectionCount;
ConnectionCountQueue ConnectionCountQueue::_connectionCount;
diff --git a/proxy/http/HttpConnectionCount.h b/proxy/http/HttpConnectionCount.h
index eea0d1a..7256fcd 100644
--- a/proxy/http/HttpConnectionCount.h
+++ b/proxy/http/HttpConnectionCount.h
@@ -118,7 +118,6 @@ public:
md5_ctx.hash_immediate(_hostname_hash, static_cast<const void *>(hostname), strlen(hostname));
}
-
operator bool() { return ats_is_ip(&_addr); }
};
@@ -195,7 +194,6 @@ protected:
// Hide the constructor and copy constructor
ConnectionCount() { ink_mutex_init(&_mutex, "ConnectionCountMutex"); }
ConnectionCount(const ConnectionCount & /* x ATS_UNUSED */) {}
-
static ConnectionCount _connectionCount;
HashMap<ConnAddr, ConnAddrHashFns, int> _hostCount;
ink_mutex _mutex;
@@ -218,5 +216,4 @@ private:
static ConnectionCountQueue _connectionCount;
};
-
#endif
diff --git a/proxy/http/HttpDebugNames.cc b/proxy/http/HttpDebugNames.cc
index da4e178..7285787 100644
--- a/proxy/http/HttpDebugNames.cc
+++ b/proxy/http/HttpDebugNames.cc
@@ -132,7 +132,6 @@ HttpDebugNames::get_event_name(int event)
case EVENT_INTERVAL:
return ("VC_EVENT_INTERVAL");
-
/////////////////
// NET EVENTS //
/////////////////
@@ -164,7 +163,6 @@ HttpDebugNames::get_event_name(int event)
case EVENT_SRV_GET_RESPONSE:
return ("EVENT_SRV_GET_RESPONSE");
-
////////////////////
// DNS EVENTS //
////////////////////
@@ -435,7 +433,6 @@ HttpDebugNames::get_cache_action_name(HttpTransact::CacheAction_t t)
return ("unknown cache action");
}
-
//////////////////////////////////////////////////////////////////
//
// HttpDebugNames::get_api_hook_name()
diff --git a/proxy/http/HttpPages.cc b/proxy/http/HttpPages.cc
index fae6a88..8b52a37 100644
--- a/proxy/http/HttpPages.cc
+++ b/proxy/http/HttpPages.cc
@@ -156,7 +156,6 @@ HttpPagesHandler::dump_tunnel_info(HttpSM *sm)
}
resp_end_table();
-
resp_add("<p> Consumers </p>");
resp_begin_table(1, 5, 60);
for (int j = 0; j < MAX_CONSUMERS; j++) {
@@ -200,7 +199,6 @@ HttpPagesHandler::dump_tunnel_info(HttpSM *sm)
}
resp_end_column();
-
resp_end_row();
}
}
@@ -333,7 +331,6 @@ HttpPagesHandler::handle_smdetails(int event, void * /* data ATS_UNUSED */)
}
}
-
// If we got here, we did not find our state machine
resp_add("<h2>Id %" PRId64 " not found</h2>", sm_id);
resp_end();
diff --git a/proxy/http/HttpPages.h b/proxy/http/HttpPages.h
index de43487..20f96f9 100644
--- a/proxy/http/HttpPages.h
+++ b/proxy/http/HttpPages.h
@@ -71,7 +71,6 @@ private:
void dump_history(HttpSM *sm);
int dump_sm(HttpSM *sm);
-
Arena arena;
char *request;
int list_bucket;
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index f2e5f74..06e811d 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -115,7 +115,6 @@ milestone_update_api_time(TransactionMilestones &milestones, ink_hrtime &api_tim
}
}
-
ClassAllocator<HttpSM> httpSMAllocator("httpSMAllocator");
HttpVCTable::HttpVCTable()
@@ -257,10 +256,8 @@ HttpVCTable::cleanup_all()
default_handler = _h; \
}
-
static int next_sm_id = 0;
-
HttpSM::HttpSM()
: Continuation(NULL), sm_id(-1), magic(HTTP_SM_MAGIC_DEAD),
// YTS Team, yamsat Plugin
@@ -456,7 +453,6 @@ HttpSM::kill_this_async_hook(int /* event ATS_UNUSED */, void * /* data ATS_UNUS
return EVENT_DONE;
}
-
void
HttpSM::start_sub_sm()
{
@@ -551,7 +547,6 @@ HttpSM::attach_client_session(ProxyClientTransaction *client_vc, IOBufferReader
}
}
-
void
HttpSM::setup_client_read_request_header()
{
@@ -838,7 +833,6 @@ HttpSM::state_drain_client_request_body(int event, void *data)
}
#endif /* PROXY_DRAIN */
-
int
HttpSM::state_watch_for_client_abort(int event, void *data)
{
@@ -1127,7 +1121,6 @@ HttpSM::state_raw_http_server_open(int event, void *data)
return 0;
}
-
// int HttpSM::state_request_wait_for_transform_read(int event, void* data)
//
// We've done a successful transform open and issued a do_io_write
@@ -1167,7 +1160,6 @@ HttpSM::state_request_wait_for_transform_read(int event, void *data)
return 0;
}
-
// int HttpSM::state_response_wait_for_transform_read(int event, void* data)
//
// We've done a successful transform open and issued a do_io_write
@@ -1200,7 +1192,6 @@ HttpSM::state_response_wait_for_transform_read(int event, void *data)
return 0;
}
-
// int HttpSM::state_common_wait_for_transform_read(...)
//
// This function handles the overlapping cases between request and response
@@ -1743,7 +1734,6 @@ HttpSM::state_http_server_open(int event, void *data)
return 0;
}
-
int
HttpSM::state_read_server_response_header(int event, void *data)
{
@@ -2854,7 +2844,6 @@ HttpSM::tunnel_handler(int event, void *data)
return 0;
}
-
/****************************************************
TUNNELLING HANDLERS
******************************************************/
@@ -3354,7 +3343,6 @@ HttpSM::tunnel_handler_cache_read(int event, HttpTunnelProducer *p)
return 0;
}
-
int
HttpSM::tunnel_handler_cache_write(int event, HttpTunnelConsumer *c)
{
@@ -4033,9 +4021,10 @@ HttpSM::do_hostdb_lookup()
historical_action = pending_action;
} else {
char *host_name = t_state.dns_info.srv_lookup_success ? t_state.dns_info.srv_hostname : t_state.dns_info.lookup_name;
- opt.port = t_state.dns_info.srv_lookup_success ? t_state.dns_info.srv_port : t_state.server_info.dst_addr.isValid() ?
- t_state.server_info.dst_addr.host_order_port() :
- t_state.hdr_info.client_request.port_get();
+ opt.port = t_state.dns_info.srv_lookup_success ?
+ t_state.dns_info.srv_port :
+ t_state.server_info.dst_addr.isValid() ? t_state.server_info.dst_addr.host_order_port() :
+ t_state.hdr_info.client_request.port_get();
opt.flags = (t_state.cache_info.directives.does_client_permit_dns_storing) ? HostDBProcessor::HOSTDB_DO_NOT_FORCE_DNS :
HostDBProcessor::HOSTDB_FORCE_DNS_RELOAD;
opt.timeout = (t_state.api_txn_dns_timeout_value != -1) ? t_state.api_txn_dns_timeout_value : 0;
@@ -4057,10 +4046,10 @@ HttpSM::do_hostdb_lookup()
// If there is not a current server, we must be looking up the origin
// server at the beginning of the transaction
- int server_port =
- t_state.current.server ? t_state.current.server->dst_addr.host_order_port() : t_state.server_info.dst_addr.isValid() ?
- t_state.server_info.dst_addr.host_order_port() :
- t_state.hdr_info.client_request.port_get();
+ int server_port = t_state.current.server ?
+ t_state.current.server->dst_addr.host_order_port() :
+ t_state.server_info.dst_addr.isValid() ? t_state.server_info.dst_addr.host_order_port() :
+ t_state.hdr_info.client_request.port_get();
if (t_state.api_txn_dns_timeout_value != -1) {
DebugSM("http_timeout", "beginning DNS lookup. allowing %d mseconds for DNS lookup", t_state.api_txn_dns_timeout_value);
@@ -4436,7 +4425,6 @@ HttpSM::do_range_setup_if_necessary()
}
}
-
void
HttpSM::do_cache_lookup_and_read()
{
@@ -4937,7 +4925,6 @@ HttpSM::do_http_server_open(bool raw)
return;
}
-
void
HttpSM::do_icp_lookup()
{
@@ -5075,7 +5062,6 @@ HttpSM::mark_host_failure(HostDBInfo *info, time_t time_down)
info->app.http_data.last_failure = time_down;
-
#ifdef DEBUG
ink_assert(ink_cluster_time() + t_state.txn_conf->down_server_timeout > time_down);
#endif
@@ -5684,7 +5670,6 @@ HttpSM::perform_cache_write_action()
}
}
-
void
HttpSM::issue_cache_update()
{
@@ -5761,7 +5746,6 @@ HttpSM::attach_server_session(HttpServerSession *s)
server_entry->vc_type = HTTP_SERVER_VC;
server_entry->vc_handler = &HttpSM::state_send_server_request_header;
-
// es - is this a concern here in HttpSM? Does it belong somewhere else?
// Get server and client connections
UnixNetVConnection *server_vc = dynamic_cast<UnixNetVConnection *>(server_session->get_netvc());
@@ -5968,7 +5952,6 @@ HttpSM::setup_cache_read_transfer()
client_response_hdr_bytes = hdr_size = write_response_header_into_buffer(&t_state.hdr_info.client_response, buf);
cache_response_hdr_bytes = client_response_hdr_bytes;
-
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::tunnel_handler);
if (doc_size != INT64_MAX)
@@ -6007,7 +5990,6 @@ HttpSM::setup_cache_transfer_to_transform()
MIOBuffer *buf = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = buf->alloc_reader();
-
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::state_response_wait_for_transform_read);
HttpTunnelProducer *p = tunnel.add_producer(cache_sm.cache_read_vc, doc_size, buf_start, &HttpSM::tunnel_handler_cache_read,
@@ -6171,7 +6153,6 @@ HttpSM::setup_internal_transfer(HttpSMHandler handler_arg)
buf->append_fast_allocated(t_state.internal_msg_buffer, t_state.internal_msg_buffer_size,
t_state.internal_msg_buffer_fast_allocator_size);
-
// The IOBufferBlock will free the msg buffer when necessary so
// eliminate our pointer to it
t_state.internal_msg_buffer = NULL;
@@ -6357,7 +6338,6 @@ HttpSM::setup_transfer_from_transform()
return p;
}
-
HttpTunnelProducer *
HttpSM::setup_transfer_from_transform_to_cache_only()
{
@@ -6583,7 +6563,6 @@ HttpSM::setup_blind_tunnel(bool send_response_hdr)
c_ua = tunnel.add_consumer(ua_entry->vc, server_entry->vc, &HttpSM::tunnel_handler_ssl_consumer, HT_HTTP_CLIENT,
"user agent - tunnel");
-
p_ua = tunnel.add_producer(ua_entry->vc, -1, r_from, &HttpSM::tunnel_handler_ssl_producer, HT_HTTP_CLIENT, "user agent - tunnel");
c_os = tunnel.add_consumer(server_entry->vc, ua_entry->vc, &HttpSM::tunnel_handler_ssl_consumer, HT_HTTP_SERVER,
@@ -6864,7 +6843,6 @@ HttpSM::update_stats()
}
*/
-
// print slow requests if the threshold is set (> 0) and if we are over the time threshold
if (t_state.txn_conf->slow_log_threshold != 0 && ink_hrtime_from_msec(t_state.txn_conf->slow_log_threshold) < total_time) {
URL *url = t_state.hdr_info.client_request.url_get();
@@ -6948,7 +6926,6 @@ HttpSM::update_stats()
}
}
-
//
// void HttpSM::dump_state_on_assert
// Debugging routine to dump the state machine's history
@@ -7004,7 +6981,6 @@ HttpSM::dump_state_hdr(HTTPHdr *h, const char *s)
}
}
-
/*****************************************************************************
*****************************************************************************
**** ****
@@ -7363,7 +7339,6 @@ HttpSM::set_next_state()
break;
}
-
case HttpTransact::SM_ACTION_INTERNAL_REQUEST: {
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::state_handle_stat_page);
Action *action_handle = statPagesManager.handle_http(this, &t_state.hdr_info.client_request);
@@ -7486,13 +7461,11 @@ HttpSM::set_next_state()
}
}
-
void
clear_http_handler_times()
{
}
-
bool
HttpSM::do_congestion_control_lookup()
{
@@ -7530,7 +7503,6 @@ HttpSM::state_congestion_control_lookup(int event, void *data)
return 0;
}
-
// YTS Team, yamsat Plugin
void
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index e83fdfb..93b957c 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -167,7 +167,6 @@ enum HttpApiState_t {
HTTP_API_DEFERED_SERVER_ERROR,
};
-
enum HttpPluginTunnel_t {
HTTP_NO_PLUGIN_TUNNEL = 0,
HTTP_PLUGIN_AS_SERVER,
diff --git a/proxy/http/HttpServerSession.cc b/proxy/http/HttpServerSession.cc
index d2f2386..8d0bd09 100644
--- a/proxy/http/HttpServerSession.cc
+++ b/proxy/http/HttpServerSession.cc
@@ -37,7 +37,6 @@
static int64_t next_ss_id = (int64_t)0;
ClassAllocator<HttpServerSession> httpServerSessionAllocator("httpServerSessionAllocator");
-
void
HttpServerSession::destroy()
{
diff --git a/proxy/http/HttpSessionAccept.cc b/proxy/http/HttpSessionAccept.cc
index 330e6da..394bbf7 100644
--- a/proxy/http/HttpSessionAccept.cc
+++ b/proxy/http/HttpSessionAccept.cc
@@ -54,7 +54,6 @@ HttpSessionAccept::accept(NetVConnection *netvc, MIOBuffer *iobuf, IOBufferReade
netvc->attributes = transport_type;
}
-
if (is_debug_tag_set("http_seq")) {
Debug("http_seq", "[HttpSessionAccept:mainEvent %p] accepted connection from %s transport type = %d", netvc,
ats_ip_nptop(client_ip, ipb, sizeof(ipb)), netvc->attributes);
diff --git a/proxy/http/HttpSessionAccept.h b/proxy/http/HttpSessionAccept.h
index 43abffc..8823630 100644
--- a/proxy/http/HttpSessionAccept.h
+++ b/proxy/http/HttpSessionAccept.h
@@ -205,7 +205,6 @@ public:
}
~HttpSessionAccept() { return; }
-
void accept(NetVConnection *, MIOBuffer *, IOBufferReader *);
int mainEvent(int event, void *netvc);
diff --git a/proxy/http/HttpSessionManager.cc b/proxy/http/HttpSessionManager.cc
index e62e810..004beaa 100644
--- a/proxy/http/HttpSessionManager.cc
+++ b/proxy/http/HttpSessionManager.cc
@@ -217,7 +217,6 @@ ServerSessionPool::eventHandler(int event, void *data)
return 0;
}
-
void
HttpSessionManager::init()
{
diff --git a/proxy/http/HttpSessionManager.h b/proxy/http/HttpSessionManager.h
index 01056ee..921a517 100644
--- a/proxy/http/HttpSessionManager.h
+++ b/proxy/http/HttpSessionManager.h
@@ -30,7 +30,6 @@
****************************************************************************/
-
#ifndef _HTTP_SESSION_MANAGER_H_
#define _HTTP_SESSION_MANAGER_H_
@@ -155,9 +154,7 @@ class HttpSessionManager
{
public:
HttpSessionManager() : m_g_pool(NULL) {}
-
~HttpSessionManager() {}
-
HSMresult_t acquire_session(Continuation *cont, sockaddr const *addr, const char *hostname, ProxyClientTransaction *ua_session,
HttpSM *sm);
HSMresult_t release_session(HttpServerSession *to_release);
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 27cdb8f..87763b6 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -413,7 +413,6 @@ do_cookies_prevent_caching(int cookies_conf, HTTPHdr *request, HTTPHdr *response
return false; // Non text objects can be cached
}
-
inline static bool
does_method_require_cache_copy_deletion(const HttpConfigParams *http_config_param, const int method)
{
@@ -536,7 +535,6 @@ how_to_open_connection(HttpTransact::State *s)
return s->cdn_saved_next_action;
}
-
/*****************************************************************************
*****************************************************************************
**** ****
@@ -996,7 +994,6 @@ HttpTransact::handle_upgrade_request(State *s)
return false;
}
-
// Mark this request as an upgrade request.
s->is_upgrade_request = true;
@@ -1085,7 +1082,6 @@ HttpTransact::handle_websocket_connection(State *s)
HandleRequest(s);
}
-
static bool
mimefield_value_equal(MIMEField *field, const char *value, const int value_len)
{
@@ -1277,7 +1273,6 @@ HttpTransact::HandleRequest(State *s)
// client keep-alive, cache action, etc.
initialize_state_variables_from_request(s, &s->hdr_info.client_request);
-
// The following chunk of code will limit the maximum number of websocket connections (TS-3659)
if (s->is_upgrade_request && s->is_websocket && s->http_config_param->max_websocket_connections >= 0) {
int64_t val = 0;
@@ -1421,7 +1416,6 @@ HttpTransact::HandleRequest(State *s)
}
}
-
if (s->force_dns) {
TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, OSDNSLookup); // After handling the request, DNS is done.
} else {
@@ -1642,7 +1636,6 @@ HttpTransact::ReDNSRoundRobin(State *s)
return;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : OSDNSLookup
// Description: called after the DNS lookup of origin server name
@@ -1798,7 +1791,6 @@ HttpTransact::OSDNSLookup(State *s)
// that allows for filtering. We'll do traffic_server internal
// filtering after API filtering
-
// After SM_ACTION_DNS_LOOKUP, goto the saved action/state ORIGIN_SERVER_(RAW_)OPEN.
// Should we skip the StartAccessControl()? why?
@@ -2047,7 +2039,6 @@ HttpTransact::LookupSkipOpenServer(State *s)
}
}
-
//////////////////////////////////////////////////////////////////////////////
// Name : HandleCacheOpenReadPush
// Description:
@@ -2145,7 +2136,6 @@ HttpTransact::HandlePushCacheWrite(State *s)
}
}
-
void
HttpTransact::HandlePushTunnelSuccess(State *s)
{
@@ -2159,7 +2149,6 @@ HttpTransact::HandlePushTunnelSuccess(State *s)
TRANSACT_RETURN(SM_ACTION_INTERNAL_CACHE_NOOP, NULL);
}
-
void
HttpTransact::HandlePushTunnelFailure(State *s)
{
@@ -2184,7 +2173,6 @@ HttpTransact::HandlePushError(State *s, const char *reason)
build_error_response(s, HTTP_STATUS_BAD_REQUEST, reason, "default", NULL);
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : HandleCacheOpenRead
// Description: the cache lookup succeeded - may have been a hit or a miss
@@ -2251,7 +2239,6 @@ HttpTransact::HandleCacheOpenRead(State *s)
return;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : issue_revalidate
// Description: Sets cache action and does various bookkeeping
@@ -2392,7 +2379,6 @@ HttpTransact::issue_revalidate(State *s)
}
}
-
void
HttpTransact::HandleCacheOpenReadHitFreshness(State *s)
{
@@ -2543,7 +2529,6 @@ HttpTransact::need_to_revalidate(State *s)
} else
needs_revalidate = false;
-
bool send_revalidate = ((needs_authenticate == true) || (needs_revalidate == true) || (is_cache_response_returnable(s) == false));
if (needs_cache_auth == true) {
s->www_auth_content = send_revalidate ? CACHE_AUTH_STALE : CACHE_AUTH_FRESH;
@@ -2824,7 +2809,6 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : build_response_from_cache()
// Description: build a client response from cached response and client request
@@ -3189,7 +3173,6 @@ HttpTransact::HandleCacheOpenReadMiss(State *s)
return;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : HandleICPLookup
// Description:
@@ -3262,7 +3245,6 @@ HttpTransact::HandleICPLookup(State *s)
return;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : OriginServerRawOpen
// Description: called for ssl tunneling
@@ -3537,7 +3519,6 @@ HttpTransact::handle_response_from_icp_suggested_host(State *s)
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : handle_response_from_parent
// Description: response came from a parent proxy
@@ -3687,7 +3668,6 @@ HttpTransact::handle_response_from_parent(State *s)
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : handle_response_from_server
// Description: response is from the origin server
@@ -3811,7 +3791,6 @@ HttpTransact::handle_response_from_server(State *s)
return;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : delete_server_rr_entry
// Description:
@@ -3968,7 +3947,6 @@ HttpTransact::handle_server_connection_not_open(State *s)
return;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : handle_forward_server_connection_open
// Description: connection to a forward server is open and good
@@ -4349,7 +4327,6 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
SET_VIA_STRING(VIA_SERVER_RESULT, VIA_SERVER_SERVED);
SET_VIA_STRING(VIA_PROXY_RESULT, VIA_PROXY_SERVED);
-
/* if we receive a 500, 502, 503 or 504 while revalidating
a document, treat the response as a 304 and in effect revalidate the document for
negative_revalidating_lifetime. (negative revalidating)
@@ -4633,7 +4610,6 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
return;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : handle_no_cache_operation_on_forward_server_response
// Description:
@@ -4733,7 +4709,6 @@ HttpTransact::handle_no_cache_operation_on_forward_server_response(State *s)
return;
}
-
void
HttpTransact::merge_and_update_headers_for_cache_update(State *s)
{
@@ -4956,7 +4931,6 @@ HttpTransact::merge_response_header_with_cached_header(HTTPHdr *cached_header, H
const char *name;
bool dups_seen = false;
-
field = response_header->iter_get_first(&fiter);
for (; field != NULL; field = response_header->iter_get_next(&fiter)) {
@@ -5051,7 +5025,6 @@ HttpTransact::merge_response_header_with_cached_header(HTTPHdr *cached_header, H
Debug("http_hdr_space", "Merged response header with %d dead bytes", cached_header->m_heap->m_lost_string_space);
}
-
void
HttpTransact::merge_warning_header(HTTPHdr *cached_header, HTTPHdr *response_header)
{
@@ -5172,7 +5145,6 @@ HttpTransact::get_ka_info_from_config(State *s, ConnectionAttributes *server_inf
return check_hostdb;
}
-
////////////////////////////////////////////////////////
// Set the keep-alive and version flags for later use //
// in request construction //
@@ -5809,7 +5781,6 @@ HttpTransact::initialize_state_variables_from_response(State *s, HTTPHdr *incomi
s->state_machine->t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
}
-
HTTPStatus status_code = incoming_response->status_get();
if (is_response_body_precluded(status_code, s->method)) {
s->hdr_info.response_content_length = 0;
@@ -5893,7 +5864,6 @@ HttpTransact::initialize_state_variables_from_response(State *s, HTTPHdr *incomi
s->current.server->transfer_encoding = NO_TRANSFER_ENCODING;
}
-
bool
HttpTransact::is_cache_response_returnable(State *s)
{
@@ -5982,7 +5952,6 @@ HttpTransact::is_stale_cache_response_returnable(State *s)
return true;
}
-
bool
HttpTransact::url_looks_dynamic(URL *url)
{
@@ -6041,7 +6010,6 @@ HttpTransact::url_looks_dynamic(URL *url)
return (false);
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : is_request_cache_lookupable()
// Description: check if a request should be looked up in cache
@@ -6113,7 +6081,6 @@ HttpTransact::is_request_cache_lookupable(State *s)
return true;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : response_cacheable_indicated_by_cc()
// Description: check if a response is cacheable as indicated by Cache-Control
@@ -6148,7 +6115,6 @@ response_cacheable_indicated_by_cc(HTTPHdr *response)
return 0;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : is_response_cacheable()
// Description: check if a response is cacheable
@@ -6637,7 +6603,6 @@ HttpTransact::process_quick_http_filter(State *s, int method)
}
}
-
HttpTransact::HostNameExpansionError_t
HttpTransact::try_to_expand_host_name(State *s)
{
@@ -6860,7 +6825,6 @@ HttpTransact::handle_content_length_header(State *s, HTTPHdr *header, HTTPHdr *b
return;
} /* End HttpTransact::handle_content_length_header */
-
//////////////////////////////////////////////////////////////////////////////
//
// void HttpTransact::handle_request_keep_alive_headers(
@@ -7112,7 +7076,6 @@ HttpTransact::handle_response_keep_alive_headers(State *s, HTTPVersion ver, HTTP
}
} /* End HttpTransact::handle_response_keep_alive_headers */
-
bool
HttpTransact::delete_all_document_alternates_and_return(State *s, bool cache_hit)
{
@@ -7217,7 +7180,6 @@ HttpTransact::does_client_request_permit_storing(CacheControlResult *c, HTTPHdr
return (true);
}
-
int
HttpTransact::calculate_document_freshness_limit(State *s, HTTPHdr *response, time_t response_date, bool *heuristic)
{
@@ -7329,7 +7291,6 @@ HttpTransact::calculate_document_freshness_limit(State *s, HTTPHdr *response, ti
return (freshness_limit);
}
-
////////////////////////////////////////////////////////////////////////////////////
// int HttpTransact::calculate_freshness_fuzz()
//
@@ -7421,7 +7382,6 @@ HttpTransact::what_is_document_freshness(State *s, HTTPHdr *client_request, HTTP
}
}
-
cooked_cc_mask = cached_obj_response->get_cooked_cc_mask();
os_specifies_revalidate = cooked_cc_mask & (MIME_COOKED_MASK_CC_MUST_REVALIDATE | MIME_COOKED_MASK_CC_PROXY_REVALIDATE);
cc_mask = MIME_COOKED_MASK_CC_NEED_REVALIDATE_ONCE;
@@ -7656,7 +7616,6 @@ HttpTransact::handle_server_died(State *s)
// FIX: all the body types below need to be filled in //
////////////////////////////////////////////////////////
-
//
// congestion control
//
@@ -7851,7 +7810,6 @@ HttpTransact::build_request(State *s, HTTPHdr *base_request, HTTPHdr *outgoing_r
// HttpTransactHeaders::convert_request(outgoing_version, outgoing_request); // commented out this idea
-
// Check whether a Host header field is missing from a 1.0 or 1.1 request.
if (outgoing_version != HTTPVersion(0, 9) && !outgoing_request->presence(MIME_PRESENCE_HOST)) {
URL *url = outgoing_request->url_get();
@@ -7926,7 +7884,6 @@ HttpTransact::build_request(State *s, HTTPHdr *base_request, HTTPHdr *outgoing_r
// The assert is backwards in this case because request is being (re)sent.
ink_assert(s->request_sent_time >= s->response_received_time);
-
DebugTxn("http_trans", "[build_request] request_sent_time: %" PRId64, (int64_t)s->request_sent_time);
if (!s->cop_test_page)
DUMP_HEADER("http_hdrs", outgoing_request, s->state_machine_id, "Proxy's Request");
@@ -7936,7 +7893,6 @@ HttpTransact::build_request(State *s, HTTPHdr *base_request, HTTPHdr *outgoing_r
// build a (status_code) response based upon the given info
-
void
HttpTransact::build_response(State *s, HTTPHdr *base_response, HTTPHdr *outgoing_response, HTTPVersion outgoing_version)
{
@@ -7944,7 +7900,6 @@ HttpTransact::build_response(State *s, HTTPHdr *base_response, HTTPHdr *outgoing
return;
}
-
void
HttpTransact::build_response(State *s, HTTPHdr *outgoing_response, HTTPVersion outgoing_version, HTTPStatus status_code,
const char *reason_phrase)
@@ -8251,7 +8206,6 @@ HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char
s->hdr_info.client_response.value_set(MIME_FIELD_LOCATION, MIME_LEN_LOCATION, s->remap_redirect, strlen(s->remap_redirect));
}
-
////////////////////////////////////////////////////////////////////
// create the error message using the "body factory", which will //
// build a customized error message if available, or generate the //
@@ -8358,7 +8312,6 @@ HttpTransact::build_redirect_response(State *s)
sizeof(body_type), "%s <a href=\"%s\">%s</a>. %s.", "The document you requested is now", new_url, new_url,
"Please update your documents and bookmarks accordingly", NULL);
-
h->set_content_length(s->internal_msg_buffer_size);
h->value_set(MIME_FIELD_CONTENT_TYPE, MIME_LEN_CONTENT_TYPE, "text/html", 9);
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 8e4faef..5173229 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#if !defined(_HttpTransact_h_)
#define _HttpTransact_h_
@@ -77,7 +76,6 @@
} \
}
-
#define TRANSACT_SETUP_RETURN(n, r) \
s->next_action = n; \
s->transact_return_point = r; \
@@ -91,7 +89,6 @@
TRANSACT_SETUP_RETURN(n, r) \
return v;
-
#define SET_UNPREPARE_CACHE_ACTION(C) \
{ \
if (C.action == HttpTransact::CACHE_PREPARE_TO_DELETE) { \
@@ -775,7 +772,6 @@ public:
_SquidLogInfo() : log_code(SQUID_LOG_ERR_UNKNOWN), hier_code(SQUID_HIER_EMPTY), hit_miss_code(SQUID_MISS_NONE) {}
} SquidLogInfo;
-
#define HTTP_TRANSACT_STATE_MAX_XBUF_SIZE (1024 * 2) /* max size of plugin exchange buffer */
struct State {
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index 99063b4..2a85a6e 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -79,7 +79,6 @@ do_strings_match_strongly(const char *raw_tag_field, int raw_tag_field_len, cons
const char *etag_start;
int n, etag_length;
-
// Can never match a weak tag with a strong compare
if ((raw_tag_field_len >= 2) && (raw_tag_field[0] == 'W' && raw_tag_field[1] == '/')) {
return false;
@@ -179,7 +178,6 @@ HttpTransactCache::SelectFromAlternates(CacheHTTPInfoVector *cache_vector, HTTPH
return -1;
}
-
Debug("http_match", "[SelectFromAlternates] # alternates = %d", alt_count);
Debug("http_seq", "[SelectFromAlternates] %d alternates for this cached doc", alt_count);
if (is_debug_tag_set("http_alts")) {
@@ -617,7 +615,6 @@ does_charset_match(char *charset1, char *charset2)
return (is_asterisk(charset1) || is_empty(charset1) || (strcasecmp(charset1, charset2) == 0));
}
-
float
HttpTransactCache::calculate_quality_of_accept_charset_match(MIMEField *accept_field, MIMEField *content_field,
MIMEField *cached_accept_field)
@@ -842,7 +839,6 @@ HttpTransactCache::calculate_quality_of_accept_encoding_match(MIMEField *accept_
const char *a_raw, *ca_raw;
int a_raw_len, ca_raw_len;
-
// prefer exact matches
if (accept_field && cached_accept_field) {
a_raw = accept_field->value_get(&a_raw_len);
@@ -1054,7 +1050,6 @@ match_accept_content_language(const char *c_raw, MIMEField *accept_field, bool *
return false;
}
-
// FIX: This code is icky, and i suspect wrong in places, particularly
// beacuse parts of match_accept_content_language are commented out.
// It looks like lots of hacks were done. The code should probably
@@ -1287,7 +1282,6 @@ HttpTransactCache::match_response_to_request_conditionals(HTTPHdr *request, HTTP
ink_assert(response->status_get() != HTTP_STATUS_PRECONDITION_FAILED);
ink_assert(response->status_get() != HTTP_STATUS_RANGE_NOT_SATISFIABLE);
-
if (!(request->presence(MIME_PRESENCE_IF_MODIFIED_SINCE | MIME_PRESENCE_IF_NONE_MATCH | MIME_PRESENCE_IF_UNMODIFIED_SINCE |
MIME_PRESENCE_IF_MATCH | MIME_PRESENCE_RANGE))) {
return response->status_get();
@@ -1458,7 +1452,6 @@ HttpTransactCache::match_response_to_request_conditionals(HTTPHdr *request, HTTP
return response->status_get();
}
-
/*---------------------------------------------------
* class CacheLookupHttpConfig
*---------------------------------------------------*/
diff --git a/proxy/http/HttpTransactCache.h b/proxy/http/HttpTransactCache.h
index c6ef7d1..794e4e6 100644
--- a/proxy/http/HttpTransactCache.h
+++ b/proxy/http/HttpTransactCache.h
@@ -71,13 +71,15 @@ extern ClassAllocator<CacheLookupHttpConfig> CacheLookupHttpConfigAllocator;
// this is a global CacheLookupHttpConfig used to bypass SelectFromAlternates
extern CacheLookupHttpConfig global_cache_lookup_config;
-inline void *CacheLookupHttpConfig::operator new(size_t size, void *mem)
+inline void *
+CacheLookupHttpConfig::operator new(size_t size, void *mem)
{
(void)size;
return mem;
}
-inline void CacheLookupHttpConfig::operator delete(void *mem)
+inline void
+CacheLookupHttpConfig::operator delete(void *mem)
{
CacheLookupHttpConfigAllocator.free((CacheLookupHttpConfig *)mem);
}
@@ -93,7 +95,6 @@ enum ContentEncoding {
GZIP,
};
-
class HttpTransactCache
{
public:
diff --git a/proxy/http/HttpTransactHeaders.cc b/proxy/http/HttpTransactHeaders.cc
index b9783c9..2b06baf 100644
--- a/proxy/http/HttpTransactHeaders.cc
+++ b/proxy/http/HttpTransactHeaders.cc
@@ -37,7 +37,6 @@ HttpTransactHeaders::is_method_cacheable(const HttpConfigParams *http_config_par
(http_config_param->cache_post_method == 1 && method == HTTP_WKSIDX_POST));
}
-
bool
HttpTransactHeaders::is_method_cache_lookupable(int method)
{
@@ -47,7 +46,6 @@ HttpTransactHeaders::is_method_cache_lookupable(int method)
method == HTTP_WKSIDX_PUT || method == HTTP_WKSIDX_PURGE || method == HTTP_WKSIDX_PUSH);
}
-
bool
HttpTransactHeaders::is_this_a_hop_by_hop_header(const char *field_name)
{
@@ -60,7 +58,6 @@ HttpTransactHeaders::is_this_a_hop_by_hop_header(const char *field_name)
}
}
-
bool
HttpTransactHeaders::is_this_method_supported(int the_scheme, int the_method)
{
@@ -74,7 +71,6 @@ HttpTransactHeaders::is_this_method_supported(int the_scheme, int the_method)
return false;
}
-
void
HttpTransactHeaders::insert_supported_methods_in_response(HTTPHdr *response, int scheme)
{
@@ -151,7 +147,6 @@ HttpTransactHeaders::insert_supported_methods_in_response(HTTPHdr *response, int
ats_free(alloced_buffer);
}
-
void
HttpTransactHeaders::build_base_response(HTTPHdr *outgoing_response, HTTPStatus status, const char *reason_phrase,
int reason_phrase_len, ink_time_t date)
@@ -168,7 +163,6 @@ HttpTransactHeaders::build_base_response(HTTPHdr *outgoing_response, HTTPStatus
outgoing_response->set_date(date);
}
-
////////////////////////////////////////////////////////////////////////
// Copy all non hop-by-hop header fields from src_hdr to new_hdr.
// If header Date: is not present or invalid in src_hdr,
@@ -222,7 +216,6 @@ HttpTransactHeaders::copy_header_fields(HTTPHdr *src_hdr, HTTPHdr *new_hdr, bool
new_hdr->set_date(date);
}
-
////////////////////////////////////////////////////////////////////////
// Just convert the outgoing request to the appropriate version
void
@@ -261,7 +254,6 @@ HttpTransactHeaders::convert_response(HTTPVersion outgoing_ver, HTTPHdr *outgoin
}
}
-
////////////////////////////////////////////////////////////////////////
// Take an existing outgoing request header and make it HTTP/0.9
void
@@ -277,7 +269,6 @@ HttpTransactHeaders::convert_to_0_9_request_header(HTTPHdr *outgoing_request)
outgoing_request->fields_clear();
}
-
////////////////////////////////////////////////////////////////////////
// Take an existing outgoing request header and make it HTTP/1.0
void
@@ -301,7 +292,6 @@ HttpTransactHeaders::convert_to_1_0_request_header(HTTPHdr *outgoing_request)
// outgoing_request->value_insert(MIME_FIELD_TE, "chunked;q=0.0");
}
-
////////////////////////////////////////////////////////////////////////
// Take an existing outgoing request header and make it HTTP/1.1
void
@@ -320,7 +310,6 @@ HttpTransactHeaders::convert_to_1_1_request_header(HTTPHdr *outgoing_request)
// outgoing_request->value_insert(MIME_FIELD_TE, "chunked;q=0.0");
}
-
////////////////////////////////////////////////////////////////////////
// Take an existing outgoing response header and make it HTTP/0.9
void
@@ -335,7 +324,6 @@ HttpTransactHeaders::convert_to_0_9_response_header(HTTPHdr * /* outgoing_respon
// There is therefore no need to clear the header.
}
-
////////////////////////////////////////////////////////////////////////
// Take an existing outgoing response header and make it HTTP/1.0
void
@@ -353,7 +341,6 @@ HttpTransactHeaders::convert_to_1_0_response_header(HTTPHdr *outgoing_response)
// Cache-Control?
}
-
////////////////////////////////////////////////////////////////////////
// Take an existing outgoing response header and make it HTTP/1.1
void
@@ -367,7 +354,6 @@ HttpTransactHeaders::convert_to_1_1_response_header(HTTPHdr *outgoing_response)
outgoing_response->version_set(HTTPVersion(1, 1));
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : calculate_document_age()
// Description: returns age of document
@@ -436,7 +422,6 @@ HttpTransactHeaders::calculate_document_age(ink_time_t request_time, ink_time_t
return current_age;
}
-
bool
HttpTransactHeaders::does_server_allow_response_to_be_stored(HTTPHdr *resp)
{
@@ -448,7 +433,6 @@ HttpTransactHeaders::does_server_allow_response_to_be_stored(HTTPHdr *resp)
return true;
}
-
bool
HttpTransactHeaders::downgrade_request(bool *origin_server_keep_alive, HTTPHdr *outgoing_request)
{
@@ -656,7 +640,6 @@ HttpTransactHeaders::insert_warning_header(HttpConfigParams *http_config_param,
header->value_set(MIME_FIELD_WARNING, MIME_LEN_WARNING, warning_text, len);
}
-
void
HttpTransactHeaders::insert_time_and_age_headers_in_response(ink_time_t request_sent_time, ink_time_t response_received_time,
ink_time_t now, HTTPHdr *base, HTTPHdr *outgoing)
@@ -672,7 +655,6 @@ HttpTransactHeaders::insert_time_and_age_headers_in_response(ink_time_t request_
outgoing->set_date(now);
}
-
void
HttpTransactHeaders::insert_server_header_in_response(const char *server_tag, int server_tag_size, HTTPHdr *h)
{
@@ -681,7 +663,6 @@ HttpTransactHeaders::insert_server_header_in_response(const char *server_tag, in
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : insert_via_header_in_request
// Description: takes in existing via_string and inserts it in header
@@ -875,7 +856,6 @@ HttpTransactHeaders::insert_via_header_in_response(HttpTransact::State *s, HTTPH
header->value_append(MIME_FIELD_VIA, MIME_LEN_VIA, new_via_string, via_string - new_via_string, true);
}
-
///////////////////////////////////////////////////////////////////////////////
// Name: insert_basic_realm_in_proxy_authenticate
// Description: insert Basic realm into Proxy-Authenticate based on
@@ -905,7 +885,6 @@ HttpTransactHeaders::insert_basic_realm_in_proxy_authenticate(const char *realm,
header->field_attach(auth);
}
-
void
HttpTransactHeaders::remove_conditional_headers(HTTPHdr *outgoing)
{
@@ -930,7 +909,6 @@ HttpTransactHeaders::remove_100_continue_headers(HttpTransact::State *s, HTTPHdr
}
}
-
////////////////////////////////////////////////////////////////////////
// Deal with lame-o servers by removing the host name from the url.
void
@@ -940,7 +918,6 @@ HttpTransactHeaders::remove_host_name_from_url(HTTPHdr *outgoing_request)
outgoing_url->nuke_proxy_stuff();
}
-
void
HttpTransactHeaders::add_global_user_agent_header_to_request(OverridableHttpConfigParams *http_txn_conf, HTTPHdr *header)
{
@@ -958,7 +935,6 @@ HttpTransactHeaders::add_global_user_agent_header_to_request(OverridableHttpConf
}
}
-
void
HttpTransactHeaders::add_server_header_to_response(OverridableHttpConfigParams *http_txn_conf, HTTPHdr *header)
{
@@ -983,7 +959,6 @@ HttpTransactHeaders::add_server_header_to_response(OverridableHttpConfigParams *
}
}
-
void
HttpTransactHeaders::remove_privacy_headers_from_request(HttpConfigParams *http_config_param,
OverridableHttpConfigParams *http_txn_conf, HTTPHdr *header)
diff --git a/proxy/http/HttpTransactHeaders.h b/proxy/http/HttpTransactHeaders.h
index 505a6fa..f6719ab 100644
--- a/proxy/http/HttpTransactHeaders.h
+++ b/proxy/http/HttpTransactHeaders.h
@@ -88,7 +88,6 @@ public:
static int nstrcpy(char *d, const char *as);
};
-
/*****************************************************************************
*****************************************************************************
**** ****
@@ -114,7 +113,6 @@ HttpTransactHeaders::nstrcpy(char *d, const char *as)
return s - as;
}
-
///////////////////////////////////////////////////////////////////////////////
// Name : is_request_proxy_authorized
// Description: does request authorization meet our authentication requirement
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index 51e2adf..0bd3f4c 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -978,7 +978,6 @@ HttpTunnel::producer_run(HttpTunnelProducer *p)
}
}
-
if (p->alive) {
ink_assert(producer_n >= 0);
@@ -1373,7 +1372,6 @@ HttpTunnel::consumer_handler(int event, HttpTunnelConsumer *c)
return sm_callback;
}
-
// void HttpTunnel::chain_abort_all(HttpTunnelProducer* p)
//
// Abort the producer and everyone still alive
@@ -1617,7 +1615,6 @@ HttpTunnel::internal_error()
{
}
-
// YTS Team, yamsat Plugin
// Function to copy the partial Post data while tunnelling
void
@@ -1668,7 +1665,6 @@ HttpTunnel::allocate_redirect_postdata_buffers(IOBufferReader *ua_reader)
}
}
-
// YTS Team, yamsat Plugin
// Deallocating the post data buffers
void
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index a075dd6..0feed3d 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -50,7 +50,7 @@
#define HTTP_TUNNEL_EVENT_PRECOMPLETE (HTTP_TUNNEL_EVENTS_START + 2)
#define HTTP_TUNNEL_EVENT_CONSUMER_DETACH (HTTP_TUNNEL_EVENTS_START + 3)
-#define HTTP_TUNNEL_STATIC_PRODUCER (VConnection *) !0
+#define HTTP_TUNNEL_STATIC_PRODUCER (VConnection *)!0
// YTS Team, yamsat Plugin
#define ALLOCATE_AND_WRITE_TO_BUF 1
diff --git a/proxy/http/HttpUpdateSM.cc b/proxy/http/HttpUpdateSM.cc
index e90927d..42cd9e2 100644
--- a/proxy/http/HttpUpdateSM.cc
+++ b/proxy/http/HttpUpdateSM.cc
@@ -32,7 +32,6 @@
****************************************************************************/
-
#include "HttpUpdateSM.h"
#include "HttpDebugNames.h"
diff --git a/proxy/http/HttpUpdateSM.h b/proxy/http/HttpUpdateSM.h
index d04bbf4..30eb482 100644
--- a/proxy/http/HttpUpdateSM.h
+++ b/proxy/http/HttpUpdateSM.h
@@ -45,7 +45,6 @@
#define HTTP_SCH_UPDATE_EVENT_ERROR (HTTP_SCH_UPDATE_EVENTS_START + 5)
#define HTTP_SCH_UPDATE_EVENT_NO_ACTION (HTTP_SCH_UPDATE_EVENTS_START + 6)
-
class HttpUpdateSM : public HttpSM
{
public:
diff --git a/proxy/http/TestHttpTransact.cc b/proxy/http/TestHttpTransact.cc
index 15b1809..10216ec 100644
--- a/proxy/http/TestHttpTransact.cc
+++ b/proxy/http/TestHttpTransact.cc
@@ -37,7 +37,6 @@ HttpNetProcessor httpNetProcessor;
HttpConfigParams httpConfigParams;
DebugStream debug_out("debug.txt", 1, 1, "DebugStreamLevels.txt", "http.stops");
-
typedef struct {
char *accept;
char *field;
diff --git a/proxy/http/TestUrl.cc b/proxy/http/TestUrl.cc
index 096f2c3..f30f748 100644
--- a/proxy/http/TestUrl.cc
+++ b/proxy/http/TestUrl.cc
@@ -40,14 +40,12 @@ create_url(const char *url_string)
cout << "UserNameExists: " << url.userNameExists() << endl;
cout << "UserNameEmpty : " << url.userNameEmpty() << endl;
-
len = url.getPassword(buf, sizeof(buf));
buf[len] = '\0';
cout << "password : " << buf << endl;
cout << "PasswordExists: " << url.passwordExists() << endl;
cout << "PasswordEmpty : " << url.passwordEmpty() << endl;
-
len = url.getHost(buf, sizeof(buf));
buf[len] = '\0';
cout << "host : " << buf << endl;
@@ -110,7 +108,6 @@ test_marshal(URL *url)
return;
}
-
main()
{
create_url("www.microsoft.com/isapi/redir.dll?TARGET=%2Foffice%2Fmigration%2F&nonie3home&homepage&&&&headline1&1006");
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 8b5f58e..6a33352 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -853,7 +853,6 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in
Debug("url_rewrite", "Argument %d: %s", k, parv[k]);
}
-
Debug("remap_plugin", "creating new plugin instance");
void *ih = NULL;
diff --git a/proxy/http/remap/RemapPluginInfo.cc b/proxy/http/remap/RemapPluginInfo.cc
index c47870d..35b6bca 100644
--- a/proxy/http/remap/RemapPluginInfo.cc
+++ b/proxy/http/remap/RemapPluginInfo.cc
@@ -42,7 +42,6 @@ remap_plugin_info::~remap_plugin_info()
dlclose(dlh);
}
-
//
// Find a plugin by path from our linked list
//
@@ -62,7 +61,6 @@ remap_plugin_info::find_by_path(char *_path)
return pi;
}
-
//
// Add a plugin to the linked list
//
@@ -80,7 +78,6 @@ remap_plugin_info::add_to_list(remap_plugin_info *pi)
}
}
-
//
// Remove and delete all plugins from a list, including ourselves.
//
diff --git a/proxy/http/remap/RemapPluginInfo.h b/proxy/http/remap/RemapPluginInfo.h
index 6b61df9..b507e5c 100644
--- a/proxy/http/remap/RemapPluginInfo.h
+++ b/proxy/http/remap/RemapPluginInfo.h
@@ -68,7 +68,6 @@ public:
void delete_my_list();
};
-
/**
* struct host_hdr_info;
* Used to store info about host header
@@ -79,5 +78,4 @@ struct host_hdr_info {
int request_port;
};
-
#endif
diff --git a/proxy/http/remap/RemapPlugins.h b/proxy/http/remap/RemapPlugins.h
index 4329ca5..ebc81d0 100644
--- a/proxy/http/remap/RemapPlugins.h
+++ b/proxy/http/remap/RemapPlugins.h
@@ -42,14 +42,12 @@
**/
struct RemapPlugins : public Continuation {
RemapPlugins() : _cur(0) {}
-
RemapPlugins(HttpTransact::State *s, URL *u, HTTPHdr *h, host_hdr_info *hi)
: _cur(0), _s(s), _request_url(u), _request_header(h), _hh_ptr(hi)
{
}
~RemapPlugins() { _cur = 0; }
-
// Some basic setters
void
setState(HttpTransact::State *state)
diff --git a/proxy/http/remap/RemapProcessor.h b/proxy/http/remap/RemapProcessor.h
index 2e42853..d956677 100644
--- a/proxy/http/remap/RemapProcessor.h
+++ b/proxy/http/remap/RemapProcessor.h
@@ -44,9 +44,7 @@ class RemapProcessor : public Processor
{
public:
RemapProcessor() : ET_REMAP(0), _use_separate_remap_thread(false) {}
-
~RemapProcessor() {}
-
bool setup_for_remap(HttpTransact::State *s);
bool finish_remap(HttpTransact::State *s);
diff --git a/proxy/http/remap/UrlMapping.cc b/proxy/http/remap/UrlMapping.cc
index 45651fd..dd500ed 100644
--- a/proxy/http/remap/UrlMapping.cc
+++ b/proxy/http/remap/UrlMapping.cc
@@ -37,7 +37,6 @@ url_mapping::url_mapping(int rank /* = 0 */)
memset(_instance_data, 0, sizeof(_instance_data));
}
-
/**
*
**/
@@ -54,7 +53,6 @@ url_mapping::add_plugin(remap_plugin_info *i, void *ih)
return true;
}
-
/**
*
**/
@@ -82,7 +80,6 @@ url_mapping::delete_instance(unsigned int index)
}
}
-
/**
*
**/
@@ -174,7 +171,6 @@ redirect_tag_str::parse_format_redirect_url(char *url)
return list;
}
-
/**
*
**/
@@ -211,7 +207,6 @@ referer_info::referer_info(char *_ref, bool *error_flag, char *errmsgbuf, int er
}
}
-
/**
*
**/
diff --git a/proxy/http/remap/UrlMapping.h b/proxy/http/remap/UrlMapping.h
index f86744c..86f305b 100644
--- a/proxy/http/remap/UrlMapping.h
+++ b/proxy/http/remap/UrlMapping.h
@@ -59,7 +59,6 @@ class redirect_tag_str
{
public:
redirect_tag_str() : next(0), chunk_str(NULL), type(0) {}
-
~redirect_tag_str()
{
type = 0;
@@ -130,7 +129,6 @@ private:
int _rank;
};
-
/**
* UrlMappingContainer wraps a url_mapping object and allows a caller to rewrite the target URL.
* This is used while evaluating remap rules.
@@ -139,11 +137,8 @@ class UrlMappingContainer
{
public:
UrlMappingContainer() : _mapping(NULL), _toURLPtr(NULL), _heap(NULL) {}
-
explicit UrlMappingContainer(HdrHeap *heap) : _mapping(NULL), _toURLPtr(NULL), _heap(heap) {}
-
~UrlMappingContainer() { deleteToURL(); }
-
URL *
getToURL() const
{
diff --git a/proxy/http/remap/UrlMappingPathIndex.h b/proxy/http/remap/UrlMappingPathIndex.h
index e7fe804..2993a3d 100644
--- a/proxy/http/remap/UrlMappingPathIndex.h
+++ b/proxy/http/remap/UrlMappingPathIndex.h
@@ -35,7 +35,6 @@ class UrlMappingPathIndex
{
public:
UrlMappingPathIndex() {}
-
virtual ~UrlMappingPathIndex();
bool Insert(url_mapping *mapping);
url_mapping *Search(URL *request_url, int request_port, bool normal_search = true) const;
@@ -49,8 +48,8 @@ private:
int port;
UrlMappingTrieKey(int idx, int p) : scheme_wks_idx(idx), port(p) {}
-
- bool operator<(const UrlMappingTrieKey &rhs) const
+ bool
+ operator<(const UrlMappingTrieKey &rhs) const
{
if (scheme_wks_idx == rhs.scheme_wks_idx) {
return (port < rhs.port);
@@ -65,7 +64,11 @@ private:
// make copy-constructor and assignment operator private
// till we properly implement them
UrlMappingPathIndex(const UrlMappingPathIndex & /* rhs ATS_UNUSED */){};
- UrlMappingPathIndex &operator=(const UrlMappingPathIndex & /* rhs ATS_UNUSED */) { return *this; }
+ UrlMappingPathIndex &
+ operator=(const UrlMappingPathIndex & /* rhs ATS_UNUSED */)
+ {
+ return *this;
+ }
inline UrlMappingTrie *
_GetTrie(URL *url, int &idx, int port, bool search = true) const
diff --git a/proxy/http/test_socket_close.cc b/proxy/http/test_socket_close.cc
index d1b1fe0..94f9a11 100644
--- a/proxy/http/test_socket_close.cc
+++ b/proxy/http/test_socket_close.cc
@@ -154,7 +154,6 @@ main(int argc, char **argv)
memset(&write_buf, 'B', sizeof(write_buf));
memset(&read_buf, '\0', sizeof(read_buf));
-
client.connection_type = CONNECTION_CLIENT;
server.connection_type = CONNECTION_SERVER;
@@ -420,7 +419,6 @@ do_accept(Conn *c)
timeout.tv_sec = 0;
timeout.tv_usec = 10; /* 0.01 ms */
-
if (select(c->listen_s + 1, &readfds, 0, 0, &timeout) > 0) {
addrlen = sizeof(c->addr);
c->s = accept(c->listen_s, (struct sockaddr *)&c->addr, &addrlen);
diff --git a/proxy/http2/HPACK.cc b/proxy/http2/HPACK.cc
index c1598ee..d33c440 100644
--- a/proxy/http2/HPACK.cc
+++ b/proxy/http2/HPACK.cc
@@ -161,7 +161,6 @@ const static struct {
{"via", ""},
{"www-authenticate", ""}};
-
/******************
* Local functions
******************/
@@ -199,7 +198,6 @@ hpack_parse_field_type(uint8_t ftype)
return HPACK_FIELD_NOINDEX_LITERAL;
}
-
/************************
* HpackIndexingTable
************************/
diff --git a/proxy/http2/HPACK.h b/proxy/http2/HPACK.h
index 37e3a65..cf57f7d 100644
--- a/proxy/http2/HPACK.h
+++ b/proxy/http2/HPACK.h
@@ -55,18 +55,15 @@ enum HpackMatchType {
// Result of looking for a header field in IndexingTable
struct HpackLookupResult {
HpackLookupResult() : index(0), index_type(HPACK_INDEX_TYPE_NONE), match_type(HPACK_NO_MATCH) {}
-
int index;
HpackIndexType index_type;
HpackMatchType match_type;
};
-
class MIMEFieldWrapper
{
public:
MIMEFieldWrapper(MIMEField *f, HdrHeap *hh, MIMEHdrImpl *impl) : _field(f), _heap(hh), _mh(impl) {}
-
void
name_set(const char *name, int name_len)
{
@@ -142,9 +139,7 @@ class HpackIndexingTable
{
public:
HpackIndexingTable(uint32_t size) { _dynamic_table = new HpackDynamicTable(size); }
-
~HpackIndexingTable() { delete _dynamic_table; }
-
HpackLookupResult lookup(const MIMEFieldWrapper &field) const;
HpackLookupResult lookup(const char *name, int name_len, const char *value, int value_len) const;
int get_header_field(uint32_t index, MIMEFieldWrapper &header_field) const;
@@ -157,7 +152,6 @@ private:
HpackDynamicTable *_dynamic_table;
};
-
// Low level interfaces
int64_t encode_integer(uint8_t *buf_start, const uint8_t *buf_end, uint32_t value, uint8_t n);
int64_t decode_integer(uint32_t &dst, const uint8_t *buf_start, const uint8_t *buf_end, uint8_t n);
@@ -174,7 +168,6 @@ int64_t decode_literal_header_field(MIMEFieldWrapper &header, const uint8_t *buf
HpackIndexingTable &indexing_table);
int64_t update_dynamic_table_size(const uint8_t *buf_start, const uint8_t *buf_end, HpackIndexingTable &indexing_table);
-
// High level interfaces
typedef HpackIndexingTable HpackHandle;
int64_t hpack_decode_header_block(HpackHandle &handle, HTTPHdr *hdr, const uint8_t *in_buf, const size_t in_buf_len);
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
index 92b2742..bcaad3b 100644
--- a/proxy/http2/HTTP2.cc
+++ b/proxy/http2/HTTP2.cc
@@ -63,7 +63,6 @@ static char const *const HTTP2_STAT_SESSION_DIE_ERROR_NAME = "proxy.process.http
union byte_pointer {
byte_pointer(void *p) : ptr(p) {}
-
void *ptr;
uint8_t *u8;
uint16_t *u16;
@@ -111,7 +110,7 @@ write_and_advance(byte_pointer &dst, uint8_t src)
template <unsigned N>
static void
-memcpy_and_advance(uint8_t(&dst)[N], byte_pointer &src)
+memcpy_and_advance(uint8_t (&dst)[N], byte_pointer &src)
{
memcpy(dst, src.u8, N);
src.u8 += N;
@@ -581,7 +580,6 @@ http2_decode_header_blocks(HTTPHdr *hdr, const uint8_t *buf_start, const uint32_
*len_read = result;
}
-
MIMEFieldIter iter;
unsigned int expected_pseudo_header_count = 4;
unsigned int pseudo_header_count = 0;
diff --git a/proxy/http2/HTTP2.h b/proxy/http2/HTTP2.h
index 537f555..3cbb443 100644
--- a/proxy/http2/HTTP2.h
+++ b/proxy/http2/HTTP2.h
@@ -254,7 +254,6 @@ struct Http2SettingsParameter {
// [RFC 7540] 6.3 PRIORITY Format
struct Http2Priority {
Http2Priority() : stream_dependency(0), weight(15) {}
-
uint32_t stream_dependency;
uint8_t weight;
};
@@ -262,7 +261,6 @@ struct Http2Priority {
// [RFC 7540] 6.2 HEADERS Format
struct Http2HeadersParameter {
Http2HeadersParameter() : pad_length(0) {}
-
uint8_t pad_length;
Http2Priority priority;
};
@@ -270,7 +268,6 @@ struct Http2HeadersParameter {
// [RFC 7540] 6.8 GOAWAY Format
struct Http2Goaway {
Http2Goaway() : last_streamid(0), error_code(0) {}
-
Http2StreamId last_streamid;
uint32_t error_code;
@@ -339,7 +336,6 @@ Http2ErrorCode http2_encode_header_blocks(HTTPHdr *, uint8_t *, uint32_t, uint32
MIMEParseResult http2_convert_header_from_2_to_1_1(HTTPHdr *);
void http2_generate_h2_header_from_1_1(HTTPHdr *headers, HTTPHdr *h2_headers);
-
// Not sure where else to put this, but figure this is as good of a start as
// anything else.
// Right now, only the static init() is available, which sets up some basic
diff --git a/proxy/http2/Http2ClientSession.h b/proxy/http2/Http2ClientSession.h
index 672ca76..b0ddc69 100644
--- a/proxy/http2/Http2ClientSession.h
+++ b/proxy/http2/Http2ClientSession.h
@@ -45,7 +45,6 @@ size_t const HTTP2_HEADER_BUFFER_SIZE_INDEX = CLIENT_CONNECTION_FIRST_READ_BUFFE
// To support Upgrade: h2c
struct Http2UpgradeContext {
Http2UpgradeContext() : req_header(NULL) {}
-
~Http2UpgradeContext()
{
if (req_header) {
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index 4da397b..da1f8d3 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -962,7 +962,6 @@ Http2ConnectionState::send_data_frame(Http2Stream *stream)
stream->update_sent_count(payload_length);
-
// Change state to 'closed' if its end of DATAs.
if (flags & HTTP2_FLAGS_DATA_END_STREAM) {
DebugHttp2Stream(ua_session, stream->get_id(), "End of DATA frame");
diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h
index b7a5514..d4d77e6 100644
--- a/proxy/http2/Http2Stream.h
+++ b/proxy/http2/Http2Stream.h
@@ -61,7 +61,6 @@ public:
}
~Http2Stream() { this->destroy(); }
-
int main_event_handler(int event, void *edata);
void destroy();
diff --git a/proxy/http2/HuffmanCodec.cc b/proxy/http2/HuffmanCodec.cc
index bd9684d..1d56068 100644
--- a/proxy/http2/HuffmanCodec.cc
+++ b/proxy/http2/HuffmanCodec.cc
@@ -31,263 +31,44 @@ struct huffman_entry {
uint32_t bit_len;
};
-static const huffman_entry huffman_table[] = {{0x1ff8, 13},
- {0x7fffd8, 23},
- {0xfffffe2, 28},
- {0xfffffe3, 28},
- {0xfffffe4, 28},
- {0xfffffe5, 28},
- {0xfffffe6, 28},
- {0xfffffe7, 28},
- {0xfffffe8, 28},
- {0xffffea, 24},
- {0x3ffffffc, 30},
- {0xfffffe9, 28},
- {0xfffffea, 28},
- {0x3ffffffd, 30},
- {0xfffffeb, 28},
- {0xfffffec, 28},
- {0xfffffed, 28},
- {0xfffffee, 28},
- {0xfffffef, 28},
- {0xffffff0, 28},
- {0xffffff1, 28},
- {0xffffff2, 28},
- {0x3ffffffe, 30},
- {0xffffff3, 28},
- {0xffffff4, 28},
- {0xffffff5, 28},
- {0xffffff6, 28},
- {0xffffff7, 28},
- {0xffffff8, 28},
- {0xffffff9, 28},
- {0xffffffa, 28},
- {0xffffffb, 28},
- {0x14, 6},
- {0x3f8, 10},
- {0x3f9, 10},
- {0xffa, 12},
- {0x1ff9, 13},
- {0x15, 6},
- {0xf8, 8},
- {0x7fa, 11},
- {0x3fa, 10},
- {0x3fb, 10},
- {0xf9, 8},
- {0x7fb, 11},
- {0xfa, 8},
- {0x16, 6},
- {0x17, 6},
- {0x18, 6},
- {0x0, 5},
- {0x1, 5},
- {0x2, 5},
- {0x19, 6},
- {0x1a, 6},
- {0x1b, 6},
- {0x1c, 6},
- {0x1d, 6},
- {0x1e, 6},
- {0x1f, 6},
- {0x5c, 7},
- {0xfb, 8},
- {0x7ffc, 15},
- {0x20, 6},
- {0xffb, 12},
- {0x3fc, 10},
- {0x1ffa, 13},
- {0x21, 6},
- {0x5d, 7},
- {0x5e, 7},
- {0x5f, 7},
- {0x60, 7},
- {0x61, 7},
- {0x62, 7},
- {0x63, 7},
- {0x64, 7},
- {0x65, 7},
- {0x66, 7},
- {0x67, 7},
- {0x68, 7},
- {0x69, 7},
- {0x6a, 7},
- {0x6b, 7},
- {0x6c, 7},
- {0x6d, 7},
- {0x6e, 7},
- {0x6f, 7},
- {0x70, 7},
- {0x71, 7},
- {0x72, 7},
- {0xfc, 8},
- {0x73, 7},
- {0xfd, 8},
- {0x1ffb, 13},
- {0x7fff0, 19},
- {0x1ffc, 13},
- {0x3ffc, 14},
- {0x22, 6},
- {0x7ffd, 15},
- {0x3, 5},
- {0x23, 6},
- {0x4, 5},
- {0x24, 6},
- {0x5, 5},
- {0x25, 6},
- {0x26, 6},
- {0x27, 6},
- {0x6, 5},
- {0x74, 7},
- {0x75, 7},
- {0x28, 6},
- {0x29, 6},
- {0x2a, 6},
- {0x7, 5},
- {0x2b, 6},
- {0x76, 7},
- {0x2c, 6},
- {0x8, 5},
- {0x9, 5},
- {0x2d, 6},
- {0x77, 7},
- {0x78, 7},
- {0x79, 7},
- {0x7a, 7},
- {0x7b, 7},
- {0x7ffe, 15},
- {0x7fc, 11},
- {0x3ffd, 14},
- {0x1ffd, 13},
- {0xffffffc, 28},
- {0xfffe6, 20},
- {0x3fffd2, 22},
- {0xfffe7, 20},
- {0xfffe8, 20},
- {0x3fffd3, 22},
- {0x3fffd4, 22},
- {0x3fffd5, 22},
- {0x7fffd9, 23},
- {0x3fffd6, 22},
- {0x7fffda, 23},
- {0x7fffdb, 23},
- {0x7fffdc, 23},
- {0x7fffdd, 23},
- {0x7fffde, 23},
- {0xffffeb, 24},
- {0x7fffdf, 23},
- {0xffffec, 24},
- {0xffffed, 24},
- {0x3fffd7, 22},
- {0x7fffe0, 23},
- {0xffffee, 24},
- {0x7fffe1, 23},
- {0x7fffe2, 23},
- {0x7fffe3, 23},
- {0x7fffe4, 23},
- {0x1fffdc, 21},
- {0x3fffd8, 22},
- {0x7fffe5, 23},
- {0x3fffd9, 22},
- {0x7fffe6, 23},
- {0x7fffe7, 23},
- {0xffffef, 24},
- {0x3fffda, 22},
- {0x1fffdd, 21},
- {0xfffe9, 20},
- {0x3fffdb, 22},
- {0x3fffdc, 22},
- {0x7fffe8, 23},
- {0x7fffe9, 23},
- {0x1fffde, 21},
- {0x7fffea, 23},
- {0x3fffdd, 22},
- {0x3fffde, 22},
- {0xfffff0, 24},
- {0x1fffdf, 21},
- {0x3fffdf, 22},
- {0x7fffeb, 23},
- {0x7fffec, 23},
- {0x1fffe0, 21},
- {0x1fffe1, 21},
- {0x3fffe0, 22},
- {0x1fffe2, 21},
- {0x7fffed, 23},
- {0x3fffe1, 22},
- {0x7fffee, 23},
- {0x7fffef, 23},
- {0xfffea, 20},
- {0x3fffe2, 22},
- {0x3fffe3, 22},
- {0x3fffe4, 22},
- {0x7ffff0, 23},
- {0x3fffe5, 22},
- {0x3fffe6, 22},
- {0x7ffff1, 23},
- {0x3ffffe0, 26},
- {0x3ffffe1, 26},
- {0xfffeb, 20},
- {0x7fff1, 19},
- {0x3fffe7, 22},
- {0x7ffff2, 23},
- {0x3fffe8, 22},
- {0x1ffffec, 25},
- {0x3ffffe2, 26},
- {0x3ffffe3, 26},
- {0x3ffffe4, 26},
- {0x7ffffde, 27},
- {0x7ffffdf, 27},
- {0x3ffffe5, 26},
- {0xfffff1, 24},
- {0x1ffffed, 25},
- {0x7fff2, 19},
- {0x1fffe3, 21},
- {0x3ffffe6, 26},
- {0x7ffffe0, 27},
- {0x7ffffe1, 27},
- {0x3ffffe7, 26},
- {0x7ffffe2, 27},
- {0xfffff2, 24},
- {0x1fffe4, 21},
- {0x1fffe5, 21},
- {0x3ffffe8, 26},
- {0x3ffffe9, 26},
- {0xffffffd, 28},
- {0x7ffffe3, 27},
- {0x7ffffe4, 27},
- {0x7ffffe5, 27},
- {0xfffec, 20},
- {0xfffff3, 24},
- {0xfffed, 20},
- {0x1fffe6, 21},
- {0x3fffe9, 22},
- {0x1fffe7, 21},
- {0x1fffe8, 21},
- {0x7ffff3, 23},
- {0x3fffea, 22},
- {0x3fffeb, 22},
- {0x1ffffee, 25},
- {0x1ffffef, 25},
- {0xfffff4, 24},
- {0xfffff5, 24},
- {0x3ffffea, 26},
- {0x7ffff4, 23},
- {0x3ffffeb, 26},
- {0x7ffffe6, 27},
- {0x3ffffec, 26},
- {0x3ffffed, 26},
- {0x7ffffe7, 27},
- {0x7ffffe8, 27},
- {0x7ffffe9, 27},
- {0x7ffffea, 27},
- {0x7ffffeb, 27},
- {0xffffffe, 28},
- {0x7ffffec, 27},
- {0x7ffffed, 27},
- {0x7ffffee, 27},
- {0x7ffffef, 27},
- {0x7fffff0, 27},
- {0x3ffffee, 26},
- {0x3fffffff, 30}};
+static const huffman_entry huffman_table[] = {
+ {0x1ff8, 13}, {0x7fffd8, 23}, {0xfffffe2, 28}, {0xfffffe3, 28}, {0xfffffe4, 28}, {0xfffffe5, 28}, {0xfffffe6, 28},
+ {0xfffffe7, 28}, {0xfffffe8, 28}, {0xffffea, 24}, {0x3ffffffc, 30}, {0xfffffe9, 28}, {0xfffffea, 28}, {0x3ffffffd, 30},
+ {0xfffffeb, 28}, {0xfffffec, 28}, {0xfffffed, 28}, {0xfffffee, 28}, {0xfffffef, 28}, {0xffffff0, 28}, {0xffffff1, 28},
+ {0xffffff2, 28}, {0x3ffffffe, 30}, {0xffffff3, 28}, {0xffffff4, 28}, {0xffffff5, 28}, {0xffffff6, 28}, {0xffffff7, 28},
+ {0xffffff8, 28}, {0xffffff9, 28}, {0xffffffa, 28}, {0xffffffb, 28}, {0x14, 6}, {0x3f8, 10}, {0x3f9, 10},
+ {0xffa, 12}, {0x1ff9, 13}, {0x15, 6}, {0xf8, 8}, {0x7fa, 11}, {0x3fa, 10}, {0x3fb, 10},
+ {0xf9, 8}, {0x7fb, 11}, {0xfa, 8}, {0x16, 6}, {0x17, 6}, {0x18, 6}, {0x0, 5},
+ {0x1, 5}, {0x2, 5}, {0x19, 6}, {0x1a, 6}, {0x1b, 6}, {0x1c, 6}, {0x1d, 6},
+ {0x1e, 6}, {0x1f, 6}, {0x5c, 7}, {0xfb, 8}, {0x7ffc, 15}, {0x20, 6}, {0xffb, 12},
+ {0x3fc, 10}, {0x1ffa, 13}, {0x21, 6}, {0x5d, 7}, {0x5e, 7}, {0x5f, 7}, {0x60, 7},
+ {0x61, 7}, {0x62, 7}, {0x63, 7}, {0x64, 7}, {0x65, 7}, {0x66, 7}, {0x67, 7},
+ {0x68, 7}, {0x69, 7}, {0x6a, 7}, {0x6b, 7}, {0x6c, 7}, {0x6d, 7}, {0x6e, 7},
+ {0x6f, 7}, {0x70, 7}, {0x71, 7}, {0x72, 7}, {0xfc, 8}, {0x73, 7}, {0xfd, 8},
+ {0x1ffb, 13}, {0x7fff0, 19}, {0x1ffc, 13}, {0x3ffc, 14}, {0x22, 6}, {0x7ffd, 15}, {0x3, 5},
+ {0x23, 6}, {0x4, 5}, {0x24, 6}, {0x5, 5}, {0x25, 6}, {0x26, 6}, {0x27, 6},
+ {0x6, 5}, {0x74, 7}, {0x75, 7}, {0x28, 6}, {0x29, 6}, {0x2a, 6}, {0x7, 5},
+ {0x2b, 6}, {0x76, 7}, {0x2c, 6}, {0x8, 5}, {0x9, 5}, {0x2d, 6}, {0x77, 7},
+ {0x78, 7}, {0x79, 7}, {0x7a, 7}, {0x7b, 7}, {0x7ffe, 15}, {0x7fc, 11}, {0x3ffd, 14},
+ {0x1ffd, 13}, {0xffffffc, 28}, {0xfffe6, 20}, {0x3fffd2, 22}, {0xfffe7, 20}, {0xfffe8, 20}, {0x3fffd3, 22},
+ {0x3fffd4, 22}, {0x3fffd5, 22}, {0x7fffd9, 23}, {0x3fffd6, 22}, {0x7fffda, 23}, {0x7fffdb, 23}, {0x7fffdc, 23},
+ {0x7fffdd, 23}, {0x7fffde, 23}, {0xffffeb, 24}, {0x7fffdf, 23}, {0xffffec, 24}, {0xffffed, 24}, {0x3fffd7, 22},
+ {0x7fffe0, 23}, {0xffffee, 24}, {0x7fffe1, 23}, {0x7fffe2, 23}, {0x7fffe3, 23}, {0x7fffe4, 23}, {0x1fffdc, 21},
+ {0x3fffd8, 22}, {0x7fffe5, 23}, {0x3fffd9, 22}, {0x7fffe6, 23}, {0x7fffe7, 23}, {0xffffef, 24}, {0x3fffda, 22},
+ {0x1fffdd, 21}, {0xfffe9, 20}, {0x3fffdb, 22}, {0x3fffdc, 22}, {0x7fffe8, 23}, {0x7fffe9, 23}, {0x1fffde, 21},
+ {0x7fffea, 23}, {0x3fffdd, 22}, {0x3fffde, 22}, {0xfffff0, 24}, {0x1fffdf, 21}, {0x3fffdf, 22}, {0x7fffeb, 23},
+ {0x7fffec, 23}, {0x1fffe0, 21}, {0x1fffe1, 21}, {0x3fffe0, 22}, {0x1fffe2, 21}, {0x7fffed, 23}, {0x3fffe1, 22},
+ {0x7fffee, 23}, {0x7fffef, 23}, {0xfffea, 20}, {0x3fffe2, 22}, {0x3fffe3, 22}, {0x3fffe4, 22}, {0x7ffff0, 23},
+ {0x3fffe5, 22}, {0x3fffe6, 22}, {0x7ffff1, 23}, {0x3ffffe0, 26}, {0x3ffffe1, 26}, {0xfffeb, 20}, {0x7fff1, 19},
+ {0x3fffe7, 22}, {0x7ffff2, 23}, {0x3fffe8, 22}, {0x1ffffec, 25}, {0x3ffffe2, 26}, {0x3ffffe3, 26}, {0x3ffffe4, 26},
+ {0x7ffffde, 27}, {0x7ffffdf, 27}, {0x3ffffe5, 26}, {0xfffff1, 24}, {0x1ffffed, 25}, {0x7fff2, 19}, {0x1fffe3, 21},
+ {0x3ffffe6, 26}, {0x7ffffe0, 27}, {0x7ffffe1, 27}, {0x3ffffe7, 26}, {0x7ffffe2, 27}, {0xfffff2, 24}, {0x1fffe4, 21},
+ {0x1fffe5, 21}, {0x3ffffe8, 26}, {0x3ffffe9, 26}, {0xffffffd, 28}, {0x7ffffe3, 27}, {0x7ffffe4, 27}, {0x7ffffe5, 27},
+ {0xfffec, 20}, {0xfffff3, 24}, {0xfffed, 20}, {0x1fffe6, 21}, {0x3fffe9, 22}, {0x1fffe7, 21}, {0x1fffe8, 21},
+ {0x7ffff3, 23}, {0x3fffea, 22}, {0x3fffeb, 22}, {0x1ffffee, 25}, {0x1ffffef, 25}, {0xfffff4, 24}, {0xfffff5, 24},
+ {0x3ffffea, 26}, {0x7ffff4, 23}, {0x3ffffeb, 26}, {0x7ffffe6, 27}, {0x3ffffec, 26}, {0x3ffffed, 26}, {0x7ffffe7, 27},
+ {0x7ffffe8, 27}, {0x7ffffe9, 27}, {0x7ffffea, 27}, {0x7ffffeb, 27}, {0xffffffe, 28}, {0x7ffffec, 27}, {0x7ffffed, 27},
+ {0x7ffffee, 27}, {0x7ffffef, 27}, {0x7fffff0, 27}, {0x3ffffee, 26}, {0x3fffffff, 30}};
typedef struct node {
node *left, *right;
diff --git a/proxy/http2/RegressionHPACK.cc b/proxy/http2/RegressionHPACK.cc
index 779d576..e78a7e7 100644
--- a/proxy/http2/RegressionHPACK.cc
+++ b/proxy/http2/RegressionHPACK.cc
@@ -45,7 +45,7 @@ const static struct {
uint8_t *encoded_field;
int encoded_field_len;
int prefix;
-} integer_test_case[] = {{10, (uint8_t *) "\x0A", 1, 5}, {1337, (uint8_t *) "\x1F\x9A\x0A", 3, 5}, {42, (uint8_t *) "\x2A", 1, 8}};
+} integer_test_case[] = {{10, (uint8_t *)"\x0A", 1, 5}, {1337, (uint8_t *)"\x1F\x9A\x0A", 3, 5}, {42, (uint8_t *)"\x2A", 1, 8}};
// Example: custom-key: custom-header
const static struct {
@@ -53,17 +53,17 @@ const static struct {
uint32_t raw_string_len;
uint8_t *encoded_field;
int encoded_field_len;
-} string_test_case[] = {{(char *)"", 0, (uint8_t *) "\x0"
- "",
+} string_test_case[] = {{(char *)"", 0, (uint8_t *)"\x0"
+ "",
1},
- {(char *)"custom-key", 10, (uint8_t *) "\xA"
- "custom-key",
+ {(char *)"custom-key", 10, (uint8_t *)"\xA"
+ "custom-key",
11},
- {(char *)"", 0, (uint8_t *) "\x80"
- "",
+ {(char *)"", 0, (uint8_t *)"\x80"
+ "",
1},
- {(char *)"custom-key", 10, (uint8_t *) "\x88"
- "\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f",
+ {(char *)"custom-key", 10, (uint8_t *)"\x88"
+ "\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f",
9}};
// [RFC 7541] C.2.4. Indexed Header Field
@@ -73,7 +73,7 @@ const static struct {
char *raw_value;
uint8_t *encoded_field;
int encoded_field_len;
-} indexed_test_case[] = {{2, (char *) ":method", (char *) "GET", (uint8_t *) "\x82", 1}};
+} indexed_test_case[] = {{2, (char *)":method", (char *)"GET", (uint8_t *)"\x82", 1}};
// [RFC 7541] C.2. Header Field Representation Examples
const static struct {
@@ -84,76 +84,76 @@ const static struct {
uint8_t *encoded_field;
int encoded_field_len;
} literal_test_case[] = {
- {(char *)"custom-key", (char *) "custom-header", 0, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *) "\x40\x0a"
- "custom-key\x0d"
- "custom-header",
+ {(char *)"custom-key", (char *)"custom-header", 0, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *)"\x40\x0a"
+ "custom-key\x0d"
+ "custom-header",
26},
- {(char *)"custom-key", (char *) "custom-header", 0, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *) "\x00\x0a"
- "custom-key\x0d"
- "custom-header",
+ {(char *)"custom-key", (char *)"custom-header", 0, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *)"\x00\x0a"
+ "custom-key\x0d"
+ "custom-header",
26},
- {(char *)"custom-key", (char *) "custom-header", 0, HPACK_FIELD_NEVERINDEX_LITERAL, (uint8_t *) "\x10\x0a"
- "custom-key\x0d"
- "custom-header",
+ {(char *)"custom-key", (char *)"custom-header", 0, HPACK_FIELD_NEVERINDEX_LITERAL, (uint8_t *)"\x10\x0a"
+ "custom-key\x0d"
+ "custom-header",
26},
- {(char *)":path", (char *) "/sample/path", 4, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *) "\x44\x0c"
- "/sample/path",
+ {(char *)":path", (char *)"/sample/path", 4, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *)"\x44\x0c"
+ "/sample/path",
14},
- {(char *)":path", (char *) "/sample/path", 4, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *) "\x04\x0c"
- "/sample/path",
+ {(char *)":path", (char *)"/sample/path", 4, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *)"\x04\x0c"
+ "/sample/path",
14},
- {(char *)":path", (char *) "/sample/path", 4, HPACK_FIELD_NEVERINDEX_LITERAL, (uint8_t *) "\x14\x0c"
- "/sample/path",
+ {(char *)":path", (char *)"/sample/path", 4, HPACK_FIELD_NEVERINDEX_LITERAL, (uint8_t *)"\x14\x0c"
+ "/sample/path",
14},
- {(char *)"password", (char *) "secret", 0, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *) "\x40\x08"
- "password\x06"
- "secret",
+ {(char *)"password", (char *)"secret", 0, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *)"\x40\x08"
+ "password\x06"
+ "secret",
17},
- {(char *)"password", (char *) "secret", 0, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *) "\x00\x08"
- "password\x06"
- "secret",
+ {(char *)"password", (char *)"secret", 0, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *)"\x00\x08"
+ "password\x06"
+ "secret",
17},
- {(char *)"password", (char *) "secret", 0, HPACK_FIELD_NEVERINDEX_LITERAL, (uint8_t *) "\x10\x08"
- "password\x06"
- "secret",
+ {(char *)"password", (char *)"secret", 0, HPACK_FIELD_NEVERINDEX_LITERAL, (uint8_t *)"\x10\x08"
+ "password\x06"
+ "secret",
17},
// with Huffman Coding
- {(char *)"custom-key", (char *) "custom-header", 0, HPACK_FIELD_INDEXED_LITERAL,
- (uint8_t *) "\x40"
- "\x88\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f"
- "\x89\x25\xa8\x49\xe9\x5a\x72\x8e\x42\xd9",
+ {(char *)"custom-key", (char *)"custom-header", 0, HPACK_FIELD_INDEXED_LITERAL,
+ (uint8_t *)"\x40"
+ "\x88\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f"
+ "\x89\x25\xa8\x49\xe9\x5a\x72\x8e\x42\xd9",
20},
- {(char *)"custom-key", (char *) "custom-header", 0, HPACK_FIELD_NOINDEX_LITERAL,
- (uint8_t *) "\x00"
- "\x88\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f"
- "\x89\x25\xa8\x49\xe9\x5a\x72\x8e\x42\xd9",
+ {(char *)"custom-key", (char *)"custom-header", 0, HPACK_FIELD_NOINDEX_LITERAL,
+ (uint8_t *)"\x00"
+ "\x88\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f"
+ "\x89\x25\xa8\x49\xe9\x5a\x72\x8e\x42\xd9",
20},
- {(char *)"custom-key", (char *) "custom-header", 0, HPACK_FIELD_NEVERINDEX_LITERAL,
- (uint8_t *) "\x10"
- "\x88\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f"
- "\x89\x25\xa8\x49\xe9\x5a\x72\x8e\x42\xd9",
+ {(char *)"custom-key", (char *)"custom-header", 0, HPACK_FIELD_NEVERINDEX_LITERAL,
+ (uint8_t *)"\x10"
+ "\x88\x25\xa8\x49\xe9\x5b\xa9\x7d\x7f"
+ "\x89\x25\xa8\x49\xe9\x5a\x72\x8e\x42\xd9",
20},
- {(char *)":path", (char *) "/sample/path", 4, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *) "\x44"
- "\x89\x61\x03\xa6\xba\x0a\xc5\x63\x4c\xff",
+ {(char *)":path", (char *)"/sample/path", 4, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *)"\x44"
+ "\x89\x61\x03\xa6\xba\x0a\xc5\x63\x4c\xff",
11},
- {(char *)":path", (char *) "/sample/path", 4, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *) "\x04"
- "\x89\x61\x03\xa6\xba\x0a\xc5\x63\x4c\xff",
+ {(char *)":path", (char *)"/sample/path", 4, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *)"\x04"
+ "\x89\x61\x03\xa6\xba\x0a\xc5\x63\x4c\xff",
11},
- {(char *)":path", (char *) "/sample/path", 4, HPACK_FIELD_NEVERINDEX_LITERAL,
- (uint8_t *) "\x14"
- "\x89\x61\x03\xa6\xba\x0a\xc5\x63\x4c\xff",
+ {(char *)":path", (char *)"/sample/path", 4, HPACK_FIELD_NEVERINDEX_LITERAL,
+ (uint8_t *)"\x14"
+ "\x89\x61\x03\xa6\xba\x0a\xc5\x63\x4c\xff",
11},
- {(char *)"password", (char *) "secret", 0, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *) "\x40"
- "\x86\xac\x68\x47\x83\xd9\x27"
- "\x84\x41\x49\x61\x53",
+ {(char *)"password", (char *)"secret", 0, HPACK_FIELD_INDEXED_LITERAL, (uint8_t *)"\x40"
+ "\x86\xac\x68\x47\x83\xd9\x27"
+ "\x84\x41\x49\x61\x53",
13},
- {(char *)"password", (char *) "secret", 0, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *) "\x00"
- "\x86\xac\x68\x47\x83\xd9\x27"
- "\x84\x41\x49\x61\x53",
+ {(char *)"password", (char *)"secret", 0, HPACK_FIELD_NOINDEX_LITERAL, (uint8_t *)"\x00"
+ "\x86\xac\x68\x47\x83\xd9\x27"
+ "\x84\x41\x49\x61\x53",
13},
- {(char *)"password", (char *) "secret", 0, HPACK_FIELD_NEVERINDEX_LITERAL, (uint8_t *) "\x10"
- "\x86\xac\x68\x47\x83\xd9\x27"
- "\x84\x41\x49\x61\x53",
+ {(char *)"password", (char *)"secret", 0, HPACK_FIELD_NEVERINDEX_LITERAL, (uint8_t *)"\x10"
+ "\x86\xac\x68\x47\x83\xd9\x27"
+ "\x84\x41\x49\x61\x53",
13}};
// [RFC 7541] C.3. Request Examples without Huffman Coding - C.3.1. First Request
@@ -162,18 +162,18 @@ const static struct {
char *raw_name;
char *raw_value;
} raw_field_request_test_case[][MAX_TEST_FIELD_NUM] = {{
- {(char *)":method", (char *) "GET"},
- {(char *)":scheme", (char *) "http"},
- {(char *)":path", (char *) "/"},
- {(char *)":authority", (char *) "www.example.com"},
- {(char *)"", (char *) ""} // End of this test case
+ {(char *)":method", (char *)"GET"},
+ {(char *)":scheme", (char *)"http"},
+ {(char *)":path", (char *)"/"},
+ {(char *)":authority", (char *)"www.example.com"},
+ {(char *)"", (char *)""} // End of this test case
},
{
- {(char *)":method", (char *) "GET"},
- {(char *)":scheme", (char *) "http"},
- {(char *)":path", (char *) "/"},
- {(char *)":authority", (char *) "www.example.com"},
- {(char *)"", (char *) ""} // End of this test case
+ {(char *)":method", (char *)"GET"},
+ {(char *)":scheme", (char *)"http"},
+ {(char *)":path", (char *)"/"},
+ {(char *)":authority", (char *)"www.example.com"},
+ {(char *)"", (char *)""} // End of this test case
}};
const static struct {
uint8_t *encoded_field;
@@ -211,27 +211,27 @@ const static struct {
char *raw_value;
} raw_field_response_test_case[][MAX_TEST_FIELD_NUM] = {
{
- {(char *)":status", (char *) "302"},
- {(char *)"cache-control", (char *) "private"},
- {(char *)"date", (char *) "Mon, 21 Oct 2013 20:13:21 GMT"},
- {(char *)"location", (char *) "https://www.example.com"},
- {(char *)"", (char *) ""} // End of this test case
+ {(char *)":status", (char *)"302"},
+ {(char *)"cache-control", (char *)"private"},
+ {(char *)"date", (char *)"Mon, 21 Oct 2013 20:13:21 GMT"},
+ {(char *)"location", (char *)"https://www.example.com"},
+ {(char *)"", (char *)""} // End of this test case
},
{
- {(char *)":status", (char *) "307"},
- {(char *)"cache-control", (char *) "private"},
- {(char *)"date", (char *) "Mon, 21 Oct 2013 20:13:21 GMT"},
- {(char *)"location", (char *) "https://www.example.com"},
- {(char *)"", (char *) ""} // End of this test case
+ {(char *)":status", (char *)"307"},
+ {(char *)"cache-control", (char *)"private"},
+ {(char *)"date", (char *)"Mon, 21 Oct 2013 20:13:21 GMT"},
+ {(char *)"location", (char *)"https://www.example.com"},
+ {(char *)"", (char *)""} // End of this test case
},
{
- {(char *)":status", (char *) "200"},
- {(char *)"cache-control", (char *) "private"},
- {(char *)"date", (char *) "Mon, 21 Oct 2013 20:13:22 GMT"},
- {(char *)"location", (char *) "https://www.example.com"},
- {(char *)"content-encoding", (char *) "gzip"},
- {(char *)"set-cookie", (char *) "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"},
- {(char *)"", (char *) ""} // End of this test case
+ {(char *)":status", (char *)"200"},
+ {(char *)"cache-control", (char *)"private"},
+ {(char *)"date", (char *)"Mon, 21 Oct 2013 20:13:22 GMT"},
+ {(char *)"location", (char *)"https://www.example.com"},
+ {(char *)"content-encoding", (char *)"gzip"},
+ {(char *)"set-cookie", (char *)"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"},
+ {(char *)"", (char *)""} // End of this test case
}};
const static struct {
uint8_t *encoded_field;
@@ -272,27 +272,26 @@ const static struct {
char *value;
} dynamic_table_response_test_case[][MAX_TEST_FIELD_NUM] = {
{
- {63, (char *) "location", (char *) "https://www.example.com"},
- {65, (char *) "date", (char *) "Mon, 21 Oct 2013 20:13:21 GMT"},
- {52, (char *) "cache-control", (char *) "private"},
- {42, (char *) ":status", (char *) "302"},
- {0, (char *) "", (char *) ""} // End of this test case
+ {63, (char *)"location", (char *)"https://www.example.com"},
+ {65, (char *)"date", (char *)"Mon, 21 Oct 2013 20:13:21 GMT"},
+ {52, (char *)"cache-control", (char *)"private"},
+ {42, (char *)":status", (char *)"302"},
+ {0, (char *)"", (char *)""} // End of this test case
},
{
- {42, (char *) ":status", (char *) "307"},
- {63, (char *) "location", (char *) "https://www.example.com"},
- {65, (char *) "date", (char *) "Mon, 21 Oct 2013 20:13:21 GMT"},
- {52, (char *) "cache-control", (char *) "private"},
- {0, (char *) "", (char *) ""} // End of this test case
+ {42, (char *)":status", (char *)"307"},
+ {63, (char *)"location", (char *)"https://www.example.com"},
+ {65, (char *)"date", (char *)"Mon, 21 Oct 2013 20:13:21 GMT"},
+ {52, (char *)"cache-control", (char *)"private"},
+ {0, (char *)"", (char *)""} // End of this test case
},
{
- {98, (char *) "set-cookie", (char *) "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"},
- {52, (char *) "content-encoding", (char *) "gzip"},
- {65, (char *) "date", (char *) "Mon, 21 Oct 2013 20:13:22 GMT"},
- {0, (char *) "", (char *) ""} // End of this test case
+ {98, (char *)"set-cookie", (char *)"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"},
+ {52, (char *)"content-encoding", (char *)"gzip"},
+ {65, (char *)"date", (char *)"Mon, 21 Oct 2013 20:13:22 GMT"},
+ {0, (char *)"", (char *)""} // End of this test case
}};
-
/***********************************************************************************
* *
* Regression test codes *
diff --git a/proxy/http2/test_Huffmancode.cc b/proxy/http2/test_Huffmancode.cc
index f873f13..24cf41f 100644
--- a/proxy/http2/test_Huffmancode.cc
+++ b/proxy/http2/test_Huffmancode.cc
@@ -64,7 +64,6 @@ uint32_t test_values[] = {
0x7ffffeb, 27, 0xffffffe, 28, 0x7ffffec, 27, 0x7ffffed, 27, 0x7ffffee, 27, 0x7ffffef, 27, 0x7fffff0, 27, 0x3ffffee, 26,
0x3fffffff, 30};
-
void
random_test()
{
@@ -149,13 +148,13 @@ const static struct {
uint8_t *expect;
int64_t expect_len;
} huffman_encode_test_data[] = {
- {(uint8_t *)"", 0, (uint8_t *) "", 0},
- {(uint8_t *)"0", 1, (uint8_t *) "\x07", 1},
- {(uint8_t *)"302", 3, (uint8_t *) "\x64\x02", 2},
- {(uint8_t *)"private", 7, (uint8_t *) "\xae\xc3\x77\x1a\x4b", 5},
+ {(uint8_t *)"", 0, (uint8_t *)"", 0},
+ {(uint8_t *)"0", 1, (uint8_t *)"\x07", 1},
+ {(uint8_t *)"302", 3, (uint8_t *)"\x64\x02", 2},
+ {(uint8_t *)"private", 7, (uint8_t *)"\xae\xc3\x77\x1a\x4b", 5},
{(uint8_t *)"Mon, 21 Oct 2013 20:13:21 GMT", 29,
- (uint8_t *) "\xd0\x7a\xbe\x94\x10\x54\xd4\x44\xa8\x20\x05\x95\x04\x0b\x81\x66\xe0\x82\xa6\x2d\x1b\xff", 22},
- {(uint8_t *)"https://www.example.com", 23, (uint8_t *) "\x9d\x29\xad\x17\x18\x63\xc7\x8f\x0b\x97\xc8\xe9\xae\x82\xae\x43\xd3",
+ (uint8_t *)"\xd0\x7a\xbe\x94\x10\x54\xd4\x44\xa8\x20\x05\x95\x04\x0b\x81\x66\xe0\x82\xa6\x2d\x1b\xff", 22},
+ {(uint8_t *)"https://www.example.com", 23, (uint8_t *)"\x9d\x29\xad\x17\x18\x63\xc7\x8f\x0b\x97\xc8\xe9\xae\x82\xae\x43\xd3",
17}};
void
diff --git a/proxy/logcat.cc b/proxy/logcat.cc
index 3fe50fe..81cfb95 100644
--- a/proxy/logcat.cc
+++ b/proxy/logcat.cc
@@ -191,7 +191,6 @@ open_output_file(char *output_file)
return file_desc;
}
-
/*-------------------------------------------------------------------------
main
-------------------------------------------------------------------------*/
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index 0aa98b5..c71e373 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -358,7 +358,7 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, "hiih", field);
// interface ip end
field = new LogField("client_auth_user_name", "caun", LogField::STRING, &LogAccess::marshal_client_auth_user_name,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "caun", field);
@@ -403,48 +403,48 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, "cqtt", field);
field = new LogField("client_req_text", "cqtx", LogField::STRING, &LogAccess::marshal_client_req_text,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_http_text);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_http_text);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cqtx", field);
field = new LogField("client_req_http_method", "cqhm", LogField::STRING, &LogAccess::marshal_client_req_http_method,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cqhm", field);
field = new LogField("client_req_url", "cqu", LogField::STRING, &LogAccess::marshal_client_req_url,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str, &LogAccess::set_client_req_url);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str, &LogAccess::set_client_req_url);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cqu", field);
field = new LogField("client_req_url_canonical", "cquc", LogField::STRING, &LogAccess::marshal_client_req_url_canon,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str, &LogAccess::set_client_req_url_canon);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str, &LogAccess::set_client_req_url_canon);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cquc", field);
field =
new LogField("client_req_unmapped_url_canonical", "cquuc", LogField::STRING, &LogAccess::marshal_client_req_unmapped_url_canon,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str, &LogAccess::set_client_req_unmapped_url_canon);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str, &LogAccess::set_client_req_unmapped_url_canon);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cquuc", field);
field = new LogField("client_req_unmapped_url_path", "cquup", LogField::STRING, &LogAccess::marshal_client_req_unmapped_url_path,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str, &LogAccess::set_client_req_unmapped_url_path);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str, &LogAccess::set_client_req_unmapped_url_path);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cquup", field);
field = new LogField("client_req_unmapped_url_host", "cquuh", LogField::STRING, &LogAccess::marshal_client_req_unmapped_url_host,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str, &LogAccess::set_client_req_unmapped_url_host);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str, &LogAccess::set_client_req_unmapped_url_host);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cquuh", field);
field = new LogField("client_req_url_scheme", "cqus", LogField::STRING, &LogAccess::marshal_client_req_url_scheme,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cqus", field);
field = new LogField("client_req_url_path", "cqup", LogField::STRING, &LogAccess::marshal_client_req_url_path,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str, &LogAccess::set_client_req_url_path);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str, &LogAccess::set_client_req_url_path);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cqup", field);
@@ -454,7 +454,7 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, "cqhv", field);
field = new LogField("client_req_protocol_version", "cqpv", LogField::dINT, &LogAccess::marshal_client_req_protocol_version,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cqpv", field);
@@ -464,7 +464,7 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, "cqhl", field);
field = new LogField("cache_lookup_url_canonical", "cluc", LogField::STRING, &LogAccess::marshal_cache_lookup_url_canon,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cluc", field);
@@ -489,12 +489,12 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, "cqssr", field);
field = new LogField("client_sec_protocol", "cqssv", LogField::STRING, &LogAccess::marshal_client_security_protocol,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cqssv", field);
field = new LogField("client_cipher_suite", "cqssc", LogField::STRING, &LogAccess::marshal_client_security_cipher_suite,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "cqssc", field);
@@ -508,7 +508,7 @@ Log::init_fields()
// proxy -> client fields
field = new LogField("proxy_resp_content_type", "psct", LogField::STRING, &LogAccess::marshal_proxy_resp_content_type,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "psct", field);
@@ -600,7 +600,7 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, "pqbl", field);
field = new LogField("proxy_req_server_name", "pqsn", LogField::STRING, &LogAccess::marshal_proxy_req_server_name,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "pqsn", field);
@@ -640,7 +640,7 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, "phr", field);
field = new LogField("proxy_host_name", "phn", LogField::STRING, &LogAccess::marshal_proxy_host_name,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "phn", field);
@@ -665,7 +665,7 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, "shi", field);
field = new LogField("server_host_name", "shn", LogField::STRING, &LogAccess::marshal_server_host_name,
- (LogField::UnmarshalFunc) & LogAccess::unmarshal_str);
+ (LogField::UnmarshalFunc)&LogAccess::unmarshal_str);
global_field_list.add(field, false);
ink_hash_table_insert(field_symbol_hash, "shn", field);
@@ -825,7 +825,6 @@ Log::handle_periodic_tasks_int_change(const char * /* name ATS_UNUSED */, RecDat
return REC_ERR_OKAY;
}
-
void
Log::init(int flags)
{
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index 814b277..e77101c 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -325,7 +325,6 @@ public:
int m_len;
LogFlushData(LogFile *logfile, void *data, int len = -1) : m_logfile(logfile), m_data(data), m_len(len) {}
-
~LogFlushData()
{
switch (m_logfile->m_file_format) {
@@ -479,7 +478,6 @@ private:
Log &operator=(const Log &rhs);
};
-
static inline bool
LogRollingEnabledIsValid(int enabled)
{
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index e528002..639e0e8 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -49,7 +49,6 @@
#include "LogBuffer.h"
#include "Log.h"
-
/*-------------------------------------------------------------------------
LogAccess::init
-------------------------------------------------------------------------*/
@@ -652,7 +651,6 @@ LogAccess::marshal_http_header_field(LogField::Container /* container ATS_UNUSED
DEFAULT_STR_FIELD;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -748,7 +746,6 @@ LogAccess::marshal_milestone_diff(TSMilestonesType ms1, TSMilestonesType ms2, ch
DEFAULT_INT_FIELD;
}
-
// To allow for a generic marshal_record function, rather than
// multiple functions (one per data type) we always marshal a record
// as a string of a fixed length. We use a fixed length because the
@@ -875,11 +872,9 @@ LogAccess::marshal_record(char *record, char *buf)
ink_assert(num_chars <= max_chars);
memcpy(buf, out_buf, num_chars);
-
return max_chars;
}
-
/*-------------------------------------------------------------------------
LogAccess::marshal_str
@@ -1138,7 +1133,6 @@ LogAccess::unmarshal_int_to_str_hex(char **buf, char *dest, int len)
return -1;
}
-
/*-------------------------------------------------------------------------
LogAccess::unmarshal_str
@@ -1432,7 +1426,6 @@ LogAccess::unmarshal_finish_status(char **buf, char *dest, int len, Ptr<LogField
return (LogAccess::unmarshal_with_map(unmarshal_int(buf), dest, len, map, "UNKNOWN_FINISH_CODE"));
}
-
/*-------------------------------------------------------------------------
LogAccess::unmarshal_cache_code
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index 96be7f0..bda148b 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -151,7 +151,6 @@ enum LogCacheWriteCodeType {
N_LOG_CACHE_WRITE_TYPES
};
-
class LogAccess
{ // Abstract Base Class
public:
@@ -162,7 +161,6 @@ public:
}
inkcoreapi virtual ~LogAccess() {}
-
inkcoreapi virtual void init();
virtual LogEntryType entry_type() = 0;
@@ -244,7 +242,6 @@ public:
inkcoreapi virtual int marshal_cache_resp_header_len(char *); // INT
inkcoreapi virtual int marshal_cache_resp_http_version(char *); // INT
-
inkcoreapi virtual void set_client_req_url(char *, int){}; // STR
inkcoreapi virtual void set_client_req_url_canon(char *, int){}; // STR
inkcoreapi virtual void set_client_req_unmapped_url_canon(char *, int){}; // STR
@@ -273,7 +270,6 @@ public:
inkcoreapi virtual int marshal_cache_lookup_url_canon(char *); // STR
int marshal_entry_type(char *); // INT
-
// named fields from within a http header
//
inkcoreapi virtual int marshal_http_header_field(LogField::Container container, char *field, char *buf);
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index 7f9f7e3..1d736cf 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -195,7 +195,6 @@ LogAccessHttp::set_client_req_url_path(char *buf, int len)
}
}
-
/*-------------------------------------------------------------------------
The marshalling routines ...
@@ -295,7 +294,6 @@ LogAccessHttp::marshal_client_auth_user_name(char *buf)
return len;
}
-
/*-------------------------------------------------------------------------
Private utility function to validate m_client_req_unmapped_url_canon_str &
m_client_req_unmapped_url_canon_len fields.
@@ -355,7 +353,6 @@ LogAccessHttp::validate_unmapped_url_path(void)
}
}
-
/*-------------------------------------------------------------------------
Private utility function to validate m_cache_lookup_url_canon_str &
m_cache_lookup__url_canon_len fields.
@@ -453,7 +450,6 @@ LogAccessHttp::marshal_client_req_url_canon(char *buf)
return len;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -632,7 +628,6 @@ LogAccessHttp::marshal_client_req_protocol_version(char *buf)
return len;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1019,7 +1014,6 @@ LogAccessHttp::marshal_server_host_ip(char *buf)
return marshal_ip(buf, ip);
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1042,7 +1036,6 @@ LogAccessHttp::marshal_server_host_name(char *buf)
return padded_len;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1226,7 +1219,6 @@ LogAccessHttp::marshal_cache_resp_http_version(char *buf)
return (2 * INK_MIN_ALIGN);
}
-
int
LogAccessHttp::marshal_client_retry_after_time(char *buf)
{
@@ -1270,7 +1262,6 @@ convert_cache_write_code(HttpTransact::CacheWriteStatus_t t)
return code;
}
-
int
LogAccessHttp::marshal_cache_write_code(char *buf)
{
@@ -1293,7 +1284,6 @@ LogAccessHttp::marshal_cache_write_transform_code(char *buf)
return INK_MIN_ALIGN;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -1558,7 +1548,6 @@ LogAccessHttp::marshal_http_header_field_escapify(LogField::Container container,
return (padded_len);
}
-
int
LogAccessHttp::marshal_milestone(TSMilestonesType ms, char *buf)
{
@@ -1569,7 +1558,6 @@ LogAccessHttp::marshal_milestone(TSMilestonesType ms, char *buf)
return INK_MIN_ALIGN;
}
-
int
LogAccessHttp::marshal_milestone_diff(TSMilestonesType ms1, TSMilestonesType ms2, char *buf)
{
diff --git a/proxy/logging/LogAccessHttp.h b/proxy/logging/LogAccessHttp.h
index a4720f4..8ddde20 100644
--- a/proxy/logging/LogAccessHttp.h
+++ b/proxy/logging/LogAccessHttp.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_ACCESS_HTTP_H
#define LOG_ACCESS_HTTP_H
diff --git a/proxy/logging/LogAccessICP.h b/proxy/logging/LogAccessICP.h
index 2fdd49a..7e293c3 100644
--- a/proxy/logging/LogAccessICP.h
+++ b/proxy/logging/LogAccessICP.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_ACCESS_ICP_H
#define LOG_ACCESS_ICP_H
diff --git a/proxy/logging/LogAccessTest.h b/proxy/logging/LogAccessTest.h
index c5a62ce..103597c 100644
--- a/proxy/logging/LogAccessTest.h
+++ b/proxy/logging/LogAccessTest.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_ACCESS_TEST_H
#define LOG_ACCESS_TEST_H
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index 5ba2d62..8af18c0 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -45,7 +45,6 @@
#include "LogBuffer.h"
#include "Log.h"
-
struct FieldListCacheElement {
LogFieldList *fieldlist;
char *symbol_str;
@@ -341,7 +340,6 @@ LogBuffer::checkin_write(size_t write_offset)
return ret_val;
}
-
unsigned
LogBuffer::add_header_str(const char *str, char *buf_ptr, unsigned buf_len)
{
@@ -355,7 +353,6 @@ LogBuffer::add_header_str(const char *str, char *buf_ptr, unsigned buf_len)
return len;
}
-
size_t
LogBuffer::_add_buffer_header()
{
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index d7c24d4..1031a0f 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_BUFFER_H
#define LOG_BUFFER_H
@@ -95,13 +94,11 @@ struct LogBufferHeader {
char *log_filename();
};
-
union LB_State {
LB_State() : ival(0) {}
-
LB_State(volatile LB_State &vs) { ival = vs.ival; }
-
- LB_State &operator=(volatile LB_State &vs)
+ LB_State &
+ operator=(volatile LB_State &vs)
{
ival = vs.ival;
return *this;
@@ -293,7 +290,6 @@ private:
LogBufferIterator &operator=(const LogBufferIterator &);
};
-
/*-------------------------------------------------------------------------
LogBufferIterator
@@ -320,7 +316,6 @@ inline LogBufferIterator::LogBufferIterator(LogBufferHeader *header, bool in_net
}
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 7f04f86..448ffb3 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -212,7 +212,6 @@ LogConfig::read_configuration_variables()
collation_max_send_buffers = val;
}
-
// ROLLING
// we don't check for valid values of rolling_enabled, rolling_interval_sec,
@@ -306,7 +305,6 @@ LogConfig::~LogConfig()
ats_free(m_dir_entry);
}
-
/*-------------------------------------------------------------------------
LogConfig::setup_collation
-------------------------------------------------------------------------*/
@@ -542,18 +540,34 @@ void
LogConfig::register_config_callbacks()
{
static const char *names[] = {
- "proxy.config.log.log_buffer_size", "proxy.config.log.max_secs_per_buffer", "proxy.config.log.max_space_mb_for_logs",
- "proxy.config.log.max_space_mb_for_orphan_logs", "proxy.config.log.max_space_mb_headroom", "proxy.config.log.logfile_perm",
- "proxy.config.log.hostname", "proxy.config.log.logfile_dir", "proxy.local.log.collation_mode",
- "proxy.config.log.collation_host", "proxy.config.log.collation_port", "proxy.config.log.collation_host_tagged",
- "proxy.config.log.collation_secret", "proxy.config.log.collation_retry_sec", "proxy.config.log.collation_max_send_buffers",
- "proxy.config.log.rolling_enabled", "proxy.config.log.rolling_interval_sec", "proxy.config.log.rolling_offset_hr",
- "proxy.config.log.rolling_size_mb", "proxy.config.log.auto_delete_rolled_files", "proxy.config.log.custom_logs_enabled",
- "proxy.config.log.xml_config_file", "proxy.config.log.hosts_config_file", "proxy.config.log.sampling_frequency",
- "proxy.config.log.file_stat_frequency", "proxy.config.log.space_used_frequency",
+ "proxy.config.log.log_buffer_size",
+ "proxy.config.log.max_secs_per_buffer",
+ "proxy.config.log.max_space_mb_for_logs",
+ "proxy.config.log.max_space_mb_for_orphan_logs",
+ "proxy.config.log.max_space_mb_headroom",
+ "proxy.config.log.logfile_perm",
+ "proxy.config.log.hostname",
+ "proxy.config.log.logfile_dir",
+ "proxy.local.log.collation_mode",
+ "proxy.config.log.collation_host",
+ "proxy.config.log.collation_port",
+ "proxy.config.log.collation_host_tagged",
+ "proxy.config.log.collation_secret",
+ "proxy.config.log.collation_retry_sec",
+ "proxy.config.log.collation_max_send_buffers",
+ "proxy.config.log.rolling_enabled",
+ "proxy.config.log.rolling_interval_sec",
+ "proxy.config.log.rolling_offset_hr",
+ "proxy.config.log.rolling_size_mb",
+ "proxy.config.log.auto_delete_rolled_files",
+ "proxy.config.log.custom_logs_enabled",
+ "proxy.config.log.xml_config_file",
+ "proxy.config.log.hosts_config_file",
+ "proxy.config.log.sampling_frequency",
+ "proxy.config.log.file_stat_frequency",
+ "proxy.config.log.space_used_frequency",
};
-
for (unsigned i = 0; i < countof(names); ++i) {
REC_RegisterConfigUpdateFunc(names[i], &LogConfig::reconfigure, NULL);
}
@@ -643,7 +657,6 @@ LogConfig::register_mgmt_callbacks()
RecRegisterManagerCb(REC_EVENT_ROLL_LOG_FILES, &LogConfig::reconfigure_mgmt_variables, NULL);
}
-
/*-------------------------------------------------------------------------
LogConfig::space_to_write
@@ -851,7 +864,6 @@ LogConfig::update_space_used()
// issue any alarms or warnings about space
//
-
if (!space_to_write(headroom)) {
if (!logging_space_exhausted)
Note("Logging space exhausted, any logs writing to local disk will be dropped!");
@@ -917,7 +929,6 @@ LogConfig::update_space_used()
}
}
-
/*-------------------------------------------------------------------------
LogConfig::read_xml_log_config
diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h
index ba533f6..0d9b98f 100644
--- a/proxy/logging/LogConfig.h
+++ b/proxy/logging/LogConfig.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_CONFIG_H
#define LOG_CONFIG_H
diff --git a/proxy/logging/LogField.cc b/proxy/logging/LogField.cc
index d6d142b..cc57120 100644
--- a/proxy/logging/LogField.cc
+++ b/proxy/logging/LogField.cc
@@ -36,8 +36,8 @@
#include "LogAccess.h"
#include "Log.h"
-const char *container_names[] = {"not-a-container", "cqh", "psh", "pqh", "ssh", "cssh", "ecqh", "epsh", "epqh", "essh", "ecssh",
- "icfg", "scfg", "record", "ms", "msdms", ""};
+const char *container_names[] = {"not-a-container", "cqh", "psh", "pqh", "ssh", "cssh", "ecqh", "epsh", "epqh", "essh",
+ "ecssh", "icfg", "scfg", "record", "ms", "msdms", ""};
const char *aggregate_names[] = {"not-an-agg-op", "COUNT", "SUM", "AVG", "FIRST", "LAST", ""};
@@ -122,7 +122,11 @@ LogSlice::toStrOffset(int strlen, int *offset)
namespace
{
struct cmp_str {
- bool operator()(ts::ConstBuffer a, ts::ConstBuffer b) const { return ptr_len_casecmp(a._ptr, a._size, b._ptr, b._size) < 0; }
+ bool
+ operator()(ts::ConstBuffer a, ts::ConstBuffer b) const
+ {
+ return ptr_len_casecmp(a._ptr, a._size, b._ptr, b._size) < 0;
+ }
};
}
@@ -502,7 +506,8 @@ LogField::display(FILE *fd)
This operator does only care of the name and m_symbol, may need
do check on others layter.
-------------------------------------------------------------------------*/
-bool LogField::operator==(LogField &rhs)
+bool
+LogField::operator==(LogField &rhs)
{
if (strcmp(name(), rhs.name()) || strcmp(symbol(), rhs.symbol())) {
return false;
@@ -524,7 +529,6 @@ LogField::set_aggregate_op(LogField::Aggregate agg_op)
}
}
-
void
LogField::update_aggregate(int64_t val)
{
@@ -569,7 +573,6 @@ LogField::valid_container_name(char *name)
return LogField::NO_CONTAINER;
}
-
LogField::Aggregate
LogField::valid_aggregate_name(char *name)
{
@@ -581,7 +584,6 @@ LogField::valid_aggregate_name(char *name)
return LogField::NO_AGGREGATE;
}
-
bool
LogField::fieldlist_contains_aggregates(char *fieldlist)
{
@@ -597,7 +599,6 @@ LogField::fieldlist_contains_aggregates(char *fieldlist)
return contains_aggregates;
}
-
/*-------------------------------------------------------------------------
LogFieldList
diff --git a/proxy/logging/LogField.h b/proxy/logging/LogField.h
index 7dc23ab..754aa89 100644
--- a/proxy/logging/LogField.h
+++ b/proxy/logging/LogField.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_FIELD_H
#define LOG_FIELD_H
@@ -60,7 +59,6 @@ struct LogSlice {
int toStrOffset(int strlen, int *offset);
};
-
/*-------------------------------------------------------------------------
LogField
@@ -81,7 +79,6 @@ public:
typedef int (*UnmarshalFuncWithMap)(char **buf, char *dest, int len, Ptr<LogFieldAliasMap> map);
typedef void (LogAccess::*SetFunc)(char *buf, int len);
-
enum Type {
sINT = 0,
dINT,
diff --git a/proxy/logging/LogFieldAliasMap.h b/proxy/logging/LogFieldAliasMap.h
index f408f25..752c4ce 100644
--- a/proxy/logging/LogFieldAliasMap.h
+++ b/proxy/logging/LogFieldAliasMap.h
@@ -26,7 +26,6 @@
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
@@ -71,7 +70,6 @@ any memory the map may have allocated.
*****************************************************************************/
-
class LogFieldAliasMap : public RefCountObj
{
public:
@@ -129,9 +127,7 @@ private:
public:
LogFieldAliasTable() : m_min(0), m_max(0), m_entries(0), m_table(0) {}
-
~LogFieldAliasTable() { delete[] m_table; }
-
void init(size_t numPairs, ...);
int
@@ -218,6 +214,5 @@ public:
}
};
-
// LOG_FIELD_ALIAS_MAP_H
#endif
diff --git a/proxy/logging/LogFile.h b/proxy/logging/LogFile.h
index d102b74..6cb0a0a 100644
--- a/proxy/logging/LogFile.h
+++ b/proxy/logging/LogFile.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_FILE_H
#define LOG_FILE_H
diff --git a/proxy/logging/LogFilter.cc b/proxy/logging/LogFilter.cc
index 9bcc9da..592df6a 100644
--- a/proxy/logging/LogFilter.cc
+++ b/proxy/logging/LogFilter.cc
@@ -68,7 +68,6 @@ LogFilter::~LogFilter()
delete m_field;
}
-
/*-------------------------------------------------------------------------
LogFilterString::LogFilterString
-------------------------------------------------------------------------*/
@@ -95,7 +94,6 @@ LogFilterString::_setValues(size_t n, char **value)
}
}
-
LogFilterString::LogFilterString(const char *name, LogField *field, LogFilter::Action action, LogFilter::Operator oper,
char *values)
: LogFilter(name, field, action, oper)
@@ -161,7 +159,8 @@ LogFilterString::~LogFilterString()
-------------------------------------------------------------------------*/
-bool LogFilterString::operator==(LogFilterString &rhs)
+bool
+LogFilterString::operator==(LogFilterString &rhs)
{
if (m_type == rhs.m_type && *m_field == *rhs.m_field && m_action == rhs.m_action && m_operator == rhs.m_operator &&
m_num_values == rhs.m_num_values) {
@@ -246,7 +245,6 @@ LogFilterString::wipe_this_entry(LogAccess *lad)
return cond_satisfied;
}
-
/*-------------------------------------------------------------------------
LogFilterString::toss_this_entry
@@ -485,7 +483,8 @@ LogFilterInt::~LogFilterInt()
-------------------------------------------------------------------------*/
-bool LogFilterInt::operator==(LogFilterInt &rhs)
+bool
+LogFilterInt::operator==(LogFilterInt &rhs)
{
if (m_type == rhs.m_type && *m_field == *rhs.m_field && m_action == rhs.m_action && m_operator == rhs.m_operator &&
m_num_values == rhs.m_num_values) {
@@ -711,7 +710,8 @@ LogFilterIP::~LogFilterIP()
-------------------------------------------------------------------------*/
-bool LogFilterIP::operator==(LogFilterIP &rhs)
+bool
+LogFilterIP::operator==(LogFilterIP &rhs)
{
if (m_type == rhs.m_type && *m_field == *rhs.m_field && m_action == rhs.m_action && m_operator == rhs.m_operator &&
m_num_values == rhs.m_num_values) {
@@ -817,7 +817,6 @@ LogFilterIP::display(FILE *fd)
}
}
-
void
LogFilterIP::display_as_XML(FILE *fd)
{
@@ -884,7 +883,8 @@ LogFilterList::~LogFilterList()
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-bool LogFilterList::operator==(LogFilterList &rhs)
+bool
+LogFilterList::operator==(LogFilterList &rhs)
{
if (m_does_conjunction == rhs.does_conjunction()) {
LogFilter *f = first();
@@ -957,7 +957,6 @@ LogFilterList::wipe_this_entry(LogAccess *lad)
return wipeFlag;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
@@ -999,7 +998,6 @@ LogFilterList::find_by_name(char *name)
return NULL;
}
-
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
diff --git a/proxy/logging/LogFilter.h b/proxy/logging/LogFilter.h
index d252b20..02e4c9b 100644
--- a/proxy/logging/LogFilter.h
+++ b/proxy/logging/LogFilter.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_FILTER_H
#define LOG_FILTER_H
@@ -247,7 +246,6 @@ private:
bool filters_are_equal(LogFilter *filt1, LogFilter *filt2);
-
/*-------------------------------------------------------------------------
LogFilterList
-------------------------------------------------------------------------*/
@@ -306,7 +304,6 @@ private:
LogFilterList &operator=(const LogFilterList &rhs);
};
-
/*-------------------------------------------------------------------------
Inline functions
-------------------------------------------------------------------------*/
diff --git a/proxy/logging/LogHost.cc b/proxy/logging/LogHost.cc
index ad30128..19f567c 100644
--- a/proxy/logging/LogHost.cc
+++ b/proxy/logging/LogHost.cc
@@ -211,7 +211,6 @@ LogHost::disconnect()
m_connected = false;
}
-
void
LogHost::create_orphan_LogFile_object()
{
@@ -427,7 +426,8 @@ LogHostList::display(FILE *fd)
}
}
-bool LogHostList::operator==(LogHostList &rhs)
+bool
+LogHostList::operator==(LogHostList &rhs)
{
LogHost *host;
for (host = first(); host; host = next(host)) {
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index 3afe70d..3ac0acd 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -248,7 +248,6 @@ LogObject::generate_filenames(const char *log_dir, const char *basename, LogFile
m_basename[basename_len - 1] = 0;
}
-
void
LogObject::rename(char *new_name)
{
@@ -261,7 +260,6 @@ LogObject::rename(char *new_name)
m_logFile->change_name(new_name);
}
-
void
LogObject::add_filter(LogFilter *filter, bool copy)
{
@@ -271,7 +269,6 @@ LogObject::add_filter(LogFilter *filter, bool copy)
m_filter_list.add(filter, copy);
}
-
void
LogObject::set_filter_list(const LogFilterList &list, bool copy)
{
@@ -284,7 +281,6 @@ LogObject::set_filter_list(const LogFilterList &list, bool copy)
m_filter_list.set_conjunction(list.does_conjunction());
}
-
void
LogObject::add_loghost(LogHost *host, bool copy)
{
@@ -300,7 +296,6 @@ LogObject::add_loghost(LogHost *host, bool copy)
m_logFile.clear();
}
-
// we conpute the object signature from the fieldlist_str and the printf_str
// of the LogFormat rather than from the format_str because the format_str
// is not part of a LogBuffer header
@@ -328,7 +323,6 @@ LogObject::compute_signature(LogFormat *format, char *filename, unsigned int fla
return signature;
}
-
void
LogObject::display(FILE *fd)
{
@@ -346,7 +340,6 @@ LogObject::display(FILE *fd)
fprintf(fd, "++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
}
-
void
LogObject::displayAsXML(FILE *fd, bool extended)
{
@@ -375,7 +368,6 @@ LogObject::displayAsXML(FILE *fd, bool extended)
fprintf(fd, "</LogObject>\n");
}
-
LogBuffer *
LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed)
{
@@ -479,7 +471,6 @@ LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed)
return buffer;
}
-
int
LogObject::va_log(LogAccess *lad, const char *fmt, va_list ap)
{
@@ -619,7 +610,6 @@ LogObject::log(LogAccess *lad, const char *text_entry)
return Log::LOG_OK;
}
-
void
LogObject::_setup_rolling(Log::RollingEnabledValues rolling_enabled, int rolling_interval_sec, int rolling_offset_hr,
int rolling_size_mb)
@@ -685,7 +675,6 @@ LogObject::_setup_rolling(Log::RollingEnabledValues rolling_enabled, int rolling
}
}
-
unsigned
LogObject::roll_files(long time_now)
{
@@ -745,7 +734,6 @@ LogObject::roll_files(long time_now)
return num_rolled;
}
-
unsigned
LogObject::_roll_files(long last_roll_time, long time_now)
{
@@ -769,7 +757,6 @@ LogObject::_roll_files(long last_roll_time, long time_now)
return num_rolled;
}
-
void
LogObject::check_buffer_expiration(long time_now)
{
@@ -779,7 +766,6 @@ LogObject::check_buffer_expiration(long time_now)
}
}
-
// make sure that we will be able to write the logs to the disk
//
int
@@ -792,7 +778,6 @@ LogObject::do_filesystem_checks()
}
}
-
/*-------------------------------------------------------------------------
TextLogObject::TextLogObject
-------------------------------------------------------------------------*/
@@ -809,7 +794,6 @@ TextLogObject::TextLogObject(const char *name, const char *log_dir, bool timesta
}
}
-
/*-------------------------------------------------------------------------
TextLogObject::write
@@ -833,7 +817,6 @@ TextLogObject::write(const char *format, ...)
return ret_val;
}
-
/*-------------------------------------------------------------------------
TextLogObject::va_write
@@ -849,7 +832,6 @@ TextLogObject::va_write(const char *format, va_list ap)
return this->va_log(NULL, format, ap);
}
-
/*-------------------------------------------------------------------------
LogObjectManager
-------------------------------------------------------------------------*/
@@ -937,7 +919,6 @@ LogObjectManager::_manage_object(LogObject *log_object, bool is_api_object, int
return retVal;
}
-
int
LogObjectManager::_solve_filename_conflicts(LogObject *log_object, int maxConflicts)
{
@@ -1054,7 +1035,6 @@ LogObjectManager::_filename_resolution_abort(const char *filename)
LogUtils::manager_alarm(LogUtils::LOG_ALARM_ERROR, msg, filename, err);
}
-
bool
LogObjectManager::_has_internal_filename_conflict(const char *filename, LogObjectList &objects)
{
@@ -1072,7 +1052,6 @@ LogObjectManager::_has_internal_filename_conflict(const char *filename, LogObjec
return false;
}
-
int
LogObjectManager::_solve_internal_filename_conflicts(LogObject *log_object, int maxConflicts, int fileNum)
{
@@ -1097,7 +1076,6 @@ LogObjectManager::_solve_internal_filename_conflicts(LogObject *log_object, int
return retVal;
}
-
LogObject *
LogObjectManager::get_object_with_signature(uint64_t signature)
{
@@ -1111,7 +1089,6 @@ LogObjectManager::get_object_with_signature(uint64_t signature)
return NULL;
}
-
void
LogObjectManager::check_buffer_expiration(long time_now)
{
@@ -1148,7 +1125,6 @@ LogObjectManager::preproc_buffers(int idx)
return buffers_preproced;
}
-
bool
LogObjectManager::unmanage_api_object(LogObject *logObject)
{
@@ -1169,7 +1145,6 @@ LogObjectManager::unmanage_api_object(LogObject *logObject)
return false;
}
-
void
LogObjectManager::add_filter_to_all(LogFilter *filter)
{
@@ -1178,7 +1153,6 @@ LogObjectManager::add_filter_to_all(LogFilter *filter)
}
}
-
void
LogObjectManager::open_local_pipes()
{
@@ -1193,7 +1167,6 @@ LogObjectManager::open_local_pipes()
}
}
-
void
LogObjectManager::transfer_objects(LogObjectManager &old_mgr)
{
diff --git a/proxy/logging/LogObject.h b/proxy/logging/LogObject.h
index 4f73b6c..abfef3a 100644
--- a/proxy/logging/LogObject.h
+++ b/proxy/logging/LogObject.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_OBJECT_H
#define LOG_OBJECT_H
@@ -72,7 +71,6 @@ private:
public:
LogBufferManager() : _num_flush_buffers(0) {}
-
void
add_to_flush_queue(LogBuffer *buffer)
{
@@ -339,9 +337,7 @@ class RefCounter
{
public:
RefCounter(int *count) : m_count(count) { ink_atomic_increment(m_count, 1); }
-
~RefCounter() { ink_atomic_increment(m_count, -1); }
-
private:
int *m_count;
};
@@ -433,7 +429,8 @@ public:
unsigned get_num_collation_clients() const;
};
-inline bool LogObject::operator==(LogObject &old)
+inline bool
+LogObject::operator==(LogObject &old)
{
if (!receives_remote_data() && !old.receives_remote_data()) {
return (get_signature() == old.get_signature() &&
diff --git a/proxy/logging/LogSock.h b/proxy/logging/LogSock.h
index 489dd48..31c96e1 100644
--- a/proxy/logging/LogSock.h
+++ b/proxy/logging/LogSock.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef LOG_SOCK_H
#define LOG_SOCK_H
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index cfefdf4..8fe5770 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -62,7 +62,6 @@ char error_tags[1024] = "";
char action_tags[1024] = "";
char command_string[512] = "";
-
// Diags *diags = NULL;
DiagsConfig *diagsConfig = NULL;
HttpBodyFactory *body_factory = NULL;
@@ -139,7 +138,6 @@ initialize_process_manager()
// RECP_NON_PERSISTENT);
}
-
/*-------------------------------------------------------------------------
check_lockfile
-------------------------------------------------------------------------*/
diff --git a/proxy/logging/LogUtils.cc b/proxy/logging/LogUtils.cc
index fedae07..4f2d829 100644
--- a/proxy/logging/LogUtils.cc
+++ b/proxy/logging/LogUtils.cc
@@ -47,7 +47,6 @@
#include "LogUtils.h"
#include "LogLimits.h"
-
/*-------------------------------------------------------------------------
LogUtils::timestamp_to_str
@@ -395,7 +394,6 @@ LogUtils::remove_content_type_attributes(char *type_str, int *type_len)
}
}
-
/*-------------------------------------------------------------------------
LogUtils::timestamp_to_hex_str
@@ -458,7 +456,6 @@ LogUtils::seconds_to_next_roll(time_t time_now, int rolling_offset, int rolling_
return ((tr >= sidl ? (tr - sidl) % rolling_interval : (86400 - (sidl - tr)) % rolling_interval));
}
-
// Checks if the file pointed to by full_filename either is a regular
// file or a pipe and has write permission, or, if the file does not
// exist, if the path prefix of full_filename names a directory that
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 4922e15..707adcb 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -55,7 +55,6 @@
#include <unordered_map>
#include <unordered_set>
-
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 600
#endif
@@ -70,7 +69,6 @@ const int DEFAULT_LINE_LEN = 78;
const double LOG10_1024 = 3.0102999566398116;
const int MAX_ORIG_STRING = 4096;
-
// Optimizations for "strcmp()", treat some fixed length (3 or 4 bytes) strings
// as integers.
const int GET_AS_INT = 5522759;
@@ -104,7 +102,6 @@ struct LastState {
};
static LastState last_state;
-
// Store the collected counters and stats, per Origin Server, URL or total
struct StatsCounter {
int64_t count;
@@ -284,7 +281,11 @@ struct OriginStats {
};
struct UrlStats {
- bool operator<(const UrlStats &rhs) const { return req.count > rhs.req.count; } // Reverse order
+ bool
+ operator<(const UrlStats &rhs) const
+ {
+ return req.count > rhs.req.count;
+ } // Reverse order
const char *url;
StatsCounter req;
@@ -302,11 +303,16 @@ struct UrlStats {
///////////////////////////////////////////////////////////////////////////////
// Equal operator for char* (for the hash_map)
struct eqstr {
- inline bool operator()(const char *s1, const char *s2) const { return 0 == strcmp(s1, s2); }
+ inline bool
+ operator()(const char *s1, const char *s2) const
+ {
+ return 0 == strcmp(s1, s2);
+ }
};
struct hash_fnv32 {
- inline uint32_t operator()(const char *s) const
+ inline uint32_t
+ operator()(const char *s) const
{
ATSHash32FNV1a fnv;
@@ -332,7 +338,6 @@ rehash(T &container, N size)
container.rehash(size);
}
-
// LRU class for the URL data
void update_elapsed(ElapsedStats &stat, const int elapsed, const StatsCounter &counter);
@@ -555,7 +560,6 @@ private:
LruStack::iterator _cur;
};
-
///////////////////////////////////////////////////////////////////////////////
// Globals, holding the accumulated stats (ok, I'm lazy ...)
static OriginStats totals;
@@ -672,7 +676,6 @@ CommandLineArgs::parse_arguments(const char **argv)
}
}
-
// Enum for return code levels.
enum ExitLevel {
EXIT_OK = 0,
@@ -686,7 +689,6 @@ struct ExitStatus {
char notice[1024];
ExitStatus() : level(EXIT_OK) { memset(notice, 0, sizeof(notice)); }
-
void
set(ExitLevel l, const char *n = NULL)
{
@@ -709,7 +711,6 @@ struct ExitStatus {
}
};
-
// Enum for parsing a log line
enum ParseStates {
P_STATE_ELAPSED,
@@ -749,7 +750,6 @@ enum URLScheme {
SCHEME_OTHER,
};
-
///////////////////////////////////////////////////////////////////////////////
// Initialize the elapsed field
inline void
@@ -904,7 +904,6 @@ update_results_elapsed(OriginStats *stat, int result, int elapsed, int size)
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Update the "codes" stats for a particular record
inline void
@@ -1052,7 +1051,6 @@ update_codes(OriginStats *stat, int code, int size)
update_counter(stat->codes.c_2xx, size);
}
-
///////////////////////////////////////////////////////////////////////////////
// Update the "methods" stats for a particular record
inline void
@@ -1106,7 +1104,6 @@ update_methods(OriginStats *stat, int method, int size)
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Update the "schemes" stats for a particular record
inline void
@@ -1122,7 +1119,6 @@ update_schemes(OriginStats *stat, int scheme, int size)
update_counter(stat->schemes.other, size);
}
-
///////////////////////////////////////////////////////////////////////////////
// Parse a log buffer
int
@@ -1592,7 +1588,6 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
return 0;
}
-
///////////////////////////////////////////////////////////////////////////////
// Process a file (FD)
int
@@ -1714,7 +1709,6 @@ process_file(int in_fd, off_t offset, unsigned max_age)
return 0;
}
-
///////////////////////////////////////////////////////////////////////////////
// Determine if this "stat" (Origin Server) is worthwhile to produce a
// report for.
@@ -1724,7 +1718,6 @@ use_origin(const OriginStats *stat)
return ((stat->total.count > cl.min_hits) && (NULL != strchr(stat->server, '.')) && (NULL == strchr(stat->server, '%')));
}
-
///////////////////////////////////////////////////////////////////////////////
// Produce a nicely formatted output for a stats collection on a stream
inline void
@@ -1787,7 +1780,6 @@ format_elapsed_line(const char *desc, const ElapsedStats &stat, bool json = fals
}
}
-
void
format_detail_header(const char *desc)
{
@@ -1830,10 +1822,10 @@ format_line(const char *desc, const StatsCounter &stat, const StatsCounter &tota
}
}
-
// Little "helpers" for the vector we use to sort the Origins.
typedef pair<const char *, OriginStats *> OriginPair;
-inline bool operator<(const OriginPair &a, const OriginPair &b)
+inline bool
+operator<(const OriginPair &a, const OriginPair &b)
{
return a.second->total.count > b.second->total.count;
}
@@ -2069,7 +2061,6 @@ print_detail_stats(const OriginStats *stat, bool json = false)
}
}
-
///////////////////////////////////////////////////////////////////////////////
// Little wrapper around exit, to allow us to exit gracefully
void
@@ -2214,7 +2205,6 @@ open_main_log(ExitStatus &status)
return main_fd;
}
-
///////////////////////////////////////////////////////////////////////////////
// main
int
diff --git a/proxy/shared/DiagsConfig.cc b/proxy/shared/DiagsConfig.cc
index e305c1f..0f2459e 100644
--- a/proxy/shared/DiagsConfig.cc
+++ b/proxy/shared/DiagsConfig.cc
@@ -28,7 +28,6 @@
#include "DiagsConfig.h"
#include "P_RecCore.h"
-
//////////////////////////////////////////////////////////////////////////////
//
// void reconfigure_diags()
@@ -38,7 +37,6 @@
//
//////////////////////////////////////////////////////////////////////////////
-
void
DiagsConfig::reconfigure_diags()
{
@@ -50,16 +48,11 @@ DiagsConfig::reconfigure_diags()
static struct {
const char *config_name;
DiagsLevel level;
- } output_records[] = {{"proxy.config.diags.output.diag", DL_Diag},
- {"proxy.config.diags.output.debug", DL_Debug},
- {"proxy.config.diags.output.status", DL_Status},
- {"proxy.config.diags.output.note", DL_Note},
- {"proxy.config.diags.output.warning", DL_Warning},
- {"proxy.config.diags.output.error", DL_Error},
- {"proxy.config.diags.output.fatal", DL_Fatal},
- {"proxy.config.diags.output.alert", DL_Alert},
- {"proxy.config.diags.output.emergency", DL_Emergency},
- {NULL, DL_Undefined}};
+ } output_records[] = {{"proxy.config.diags.output.diag", DL_Diag}, {"proxy.config.diags.output.debug", DL_Debug},
+ {"proxy.config.diags.output.status", DL_Status}, {"proxy.config.diags.output.note", DL_Note},
+ {"proxy.config.diags.output.warning", DL_Warning}, {"proxy.config.diags.output.error", DL_Error},
+ {"proxy.config.diags.output.fatal", DL_Fatal}, {"proxy.config.diags.output.alert", DL_Alert},
+ {"proxy.config.diags.output.emergency", DL_Emergency}, {NULL, DL_Undefined}};
if (!callbacks_established) {
register_diags_callbacks();
@@ -155,7 +148,6 @@ DiagsConfig::reconfigure_diags()
ats_free(at);
}
-
//////////////////////////////////////////////////////////////////////////////
//
// static void *diags_config_callback(void *opaque_token, void *data)
@@ -177,7 +169,6 @@ diags_config_callback(const char * /* name ATS_UNUSED */, RecDataT /* data_type
return (0);
}
-
//////////////////////////////////////////////////////////////////////////////
//
// void Diags::parse_output_string(char *s, DiagsModeOutput *o)
@@ -201,7 +192,6 @@ DiagsConfig::parse_output_string(char *s, DiagsModeOutput *o)
o->to_diagslog = (s && strchr(s, 'L'));
}
-
//////////////////////////////////////////////////////////////////////////////
//
// void Diags::config_norecords()
@@ -265,7 +255,6 @@ DiagsConfig::RegisterDiagConfig()
RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.emergency", "SL", RECU_NULL, RECC_NULL, NULL, REC_SOURCE_DEFAULT);
}
-
DiagsConfig::DiagsConfig(const char *filename, const char *tags, const char *actions, bool use_records) : diags_log(NULL)
{
char diags_logpath[PATH_NAME_MAX];
@@ -320,7 +309,6 @@ DiagsConfig::DiagsConfig(const char *filename, const char *tags, const char *act
reconfigure_diags();
}
-
//////////////////////////////////////////////////////////////////////////////
//
// void DiagsConfig::register_diags_callbacks()
diff --git a/proxy/shared/DiagsConfig.h b/proxy/shared/DiagsConfig.h
index 2ac0f0f..afea022 100644
--- a/proxy/shared/DiagsConfig.h
+++ b/proxy/shared/DiagsConfig.h
@@ -44,5 +44,4 @@ public:
Diags *diags;
};
-
#endif
diff --git a/proxy/shared/Error.cc b/proxy/shared/Error.cc
index a7722bf..cb44d12 100644
--- a/proxy/shared/Error.cc
+++ b/proxy/shared/Error.cc
@@ -40,7 +40,8 @@ ErrorClass::~ErrorClass()
{
}
-void ErrorClass::operator()(const char *aformat_string, ...)
+void
+ErrorClass::operator()(const char *aformat_string, ...)
{
va_list aap;
va_start(aap, aformat_string);
diff --git a/proxy/shared/Error.h b/proxy/shared/Error.h
index 77ca0cd..652401e 100644
--- a/proxy/shared/Error.h
+++ b/proxy/shared/Error.h
@@ -75,7 +75,6 @@ struct FatalClass : public ErrorClass {
FatalClass(const char *afile, int aline, const char *afunction) : ErrorClass(afile, aline, afunction) {}
};
-
//////////////////////////////////////////////////////////////////////////////
//
// RequestFatal Messages
@@ -128,7 +127,6 @@ struct ProcessFatalClass : public FatalClass {
#define ProcessFatal (*(new ProcessFatalClass(__FILE__, __LINE__, __FUNCTION__)))
-
//////////////////////////////////////////////////////////////////////////////
//
// MachineFatal Messages
diff --git a/proxy/shared/InkXml.h b/proxy/shared/InkXml.h
index ec9c7c8..93509e1 100644
--- a/proxy/shared/InkXml.h
+++ b/proxy/shared/InkXml.h
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
#ifndef INK_XML_H
#define INK_XML_H
@@ -191,7 +190,6 @@ private:
public:
NameList() : m_count(0) {}
~NameList() { clear(); }
-
void
enqueue(char *name)
{
diff --git a/proxy/shared/UglyLogStubs.cc b/proxy/shared/UglyLogStubs.cc
index c707286..bbb3d0b 100644
--- a/proxy/shared/UglyLogStubs.cc
+++ b/proxy/shared/UglyLogStubs.cc
@@ -21,7 +21,6 @@
limitations under the License.
*/
-
// This is total BS, because our libraries are riddled with cross dependencies.
// TODO: Clean up the dependency mess, and get rid of this.
diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc
index 3f946fb..406a906 100644
--- a/proxy/spdy/SpdyClientSession.cc
+++ b/proxy/spdy/SpdyClientSession.cc
@@ -60,7 +60,6 @@ SpdyRequest::destroy()
spdyRequestAllocator.free(this);
}
-
void
SpdyRequest::init(SpdyClientSession *sm, int id)
{
@@ -91,7 +90,7 @@ SpdyRequest::clear()
fetch_sm = NULL;
}
- vector<pair<string, string> >().swap(headers);
+ vector<pair<string, string>>().swap(headers);
std::string().swap(url);
std::string().swap(host);
@@ -164,7 +163,6 @@ SpdyClientSession::clear()
vc = NULL;
}
-
if (req_reader) {
TSIOBufferReaderFree(req_reader);
req_reader = NULL;
@@ -227,8 +225,8 @@ SpdyClientSession::state_session_start(int /* event */, void * /* edata */)
{SPDYLAY_SETTINGS_INITIAL_WINDOW_SIZE, SPDYLAY_ID_FLAG_SETTINGS_NONE, spdy_initial_window_size}};
int r;
- this->read_vio = (TSVIO) this->vc->do_io_read(this, INT64_MAX, reinterpret_cast<MIOBuffer *>(this->req_buffer));
- this->write_vio = (TSVIO) this->vc->do_io_write(this, INT64_MAX, reinterpret_cast<IOBufferReader *>(this->resp_reader));
+ this->read_vio = (TSVIO)this->vc->do_io_read(this, INT64_MAX, reinterpret_cast<MIOBuffer *>(this->req_buffer));
+ this->write_vio = (TSVIO)this->vc->do_io_write(this, INT64_MAX, reinterpret_cast<IOBufferReader *>(this->resp_reader));
if (TSIOBufferReaderAvail(this->req_reader) > 0) {
spdy_process_read(TS_EVENT_VCONN_WRITE_READY, this);
@@ -295,7 +293,6 @@ SpdyClientSession::destroy()
spdyClientSessionAllocator.free(this);
}
-
SpdyClientSession *
SpdyClientSession::alloc()
{
diff --git a/proxy/spdy/SpdyClientSession.h b/proxy/spdy/SpdyClientSession.h
index ecf68cd..b089c29 100644
--- a/proxy/spdy/SpdyClientSession.h
+++ b/proxy/spdy/SpdyClientSession.h
@@ -75,7 +75,7 @@ public:
int fetch_data_len;
unsigned delta_window_size;
bool fetch_body_completed;
- vector<pair<string, string> > headers;
+ vector<pair<string, string>> headers;
string url;
string host;
@@ -100,7 +100,6 @@ public:
{
}
-
void init(NetVConnection *netvc);
void clear();
void destroy();
@@ -206,5 +205,4 @@ private:
int state_session_readwrite(int event, void *edata);
};
-
#endif
diff --git a/proxy/spdy/SpdySessionAccept.h b/proxy/spdy/SpdySessionAccept.h
index 95dbb06..2de56b1 100644
--- a/proxy/spdy/SpdySessionAccept.h
+++ b/proxy/spdy/SpdySessionAccept.h
@@ -35,7 +35,6 @@ class SpdySessionAccept : public SessionAccept
public:
explicit SpdySessionAccept(spdy::SessionVersion vers);
~SpdySessionAccept() {}
-
void accept(NetVConnection *, MIOBuffer *, IOBufferReader *);
private:
diff --git a/tools/http_load/http_load.c b/tools/http_load/http_load.c
index 1737d46..95e7d28 100644
--- a/tools/http_load/http_load.c
+++ b/tools/http_load/http_load.c
@@ -70,7 +70,6 @@
/* How many file descriptors to not use. */
#define RESERVED_FDS 3
-
typedef struct {
char *url_str;
int protocol;
@@ -294,7 +293,6 @@ static void *realloc_check(void *ptr, size_t size);
static char *strdup_check(char *str);
static void check(void *ptr);
-
int
main(int argc, char **argv)
{
@@ -605,7 +603,6 @@ main(int argc, char **argv)
/* NOT_REACHED */
}
-
static void
usage(void)
{
@@ -624,7 +621,6 @@ usage(void)
exit(1);
}
-
static void
read_url_file(char *url_file)
{
@@ -751,7 +747,6 @@ read_url_file(char *url_file)
fclose(fp);
}
-
static void
lookup_address(int url_num)
{
@@ -880,7 +875,6 @@ lookup_address(int url_num)
#endif /* USE_IPV6 */
}
-
static void
read_sip_file(char *sip_file)
{
@@ -919,7 +913,6 @@ read_sip_file(char *sip_file)
fclose(fp);
}
-
static void
start_connection(struct timeval *nowP)
{
@@ -994,7 +987,6 @@ start_connection(struct timeval *nowP)
finish(nowP);
}
-
static void
start_socket(int url_num, int cnum, struct timeval *nowP)
{
@@ -1003,7 +995,6 @@ start_socket(int url_num, int cnum, struct timeval *nowP)
int sip_num;
int reusable = connections[cnum].reusable;
-
/* Start filling in the connection slot. */
connections[cnum].url_num = url_num;
connections[cnum].started_at = *nowP;
@@ -1235,7 +1226,6 @@ handle_connect(int cnum, struct timeval *nowP, int double_check)
connections[cnum].header_state = HDST_LINE1_PROTOCOL;
}
-
static void
handle_read(int cnum, struct timeval *nowP)
{
@@ -2764,7 +2754,6 @@ handle_read(int cnum, struct timeval *nowP)
}
}
-
static void
idle_connection(ClientData client_data, struct timeval *nowP __attribute__((unused)))
{
@@ -2791,7 +2780,6 @@ idle_connection(ClientData client_data, struct timeval *nowP __attribute__((unus
++total_timeouts;
}
-
static void
wakeup_connection(ClientData client_data, struct timeval *nowP __attribute__((unused)))
{
@@ -2802,7 +2790,6 @@ wakeup_connection(ClientData client_data, struct timeval *nowP __attribute__((un
connections[cnum].conn_state = CNST_READING;
}
-
static void
close_connection(int cnum)
{
@@ -2887,7 +2874,6 @@ close_connection(int cnum)
}
}
-
static void
progress_report(ClientData client_data __attribute__((unused)), struct timeval *nowP __attribute__((unused)))
{
@@ -2898,7 +2884,6 @@ progress_report(ClientData client_data __attribute__((unused)), struct timeval *
num_connections);
}
-
static void
start_timer(ClientData client_data __attribute__((unused)), struct timeval *nowP __attribute__((unused)))
{
@@ -2907,14 +2892,12 @@ start_timer(ClientData client_data __attribute__((unused)), struct timeval *nowP
(void)tmr_create(nowP, start_timer, JunkClientData, (long)(random() % range_interval) + low_interval, 0);
}
-
static void
end_timer(ClientData client_data __attribute__((unused)), struct timeval *nowP __attribute__((unused)))
{
finish(nowP);
}
-
static void
finish(struct timeval *nowP)
{
@@ -2965,7 +2948,6 @@ finish(struct timeval *nowP)
exit(0);
}
-
static long long
delta_timeval(struct timeval *start, struct timeval *finish)
{
@@ -2974,7 +2956,6 @@ delta_timeval(struct timeval *start, struct timeval *finish)
return delta_secs * (long long)1000000L + delta_usecs;
}
-
static void *
malloc_check(size_t size)
{
@@ -2983,7 +2964,6 @@ malloc_check(size_t size)
return ptr;
}
-
static void *
realloc_check(void *ptr, size_t size)
{
@@ -2992,7 +2972,6 @@ realloc_check(void *ptr, size_t size)
return ptr;
}
-
static char *
strdup_check(char *str)
{
@@ -3001,7 +2980,6 @@ strdup_check(char *str)
return str;
}
-
static void
check(void *ptr)
{
diff --git a/tools/http_load/timers.c b/tools/http_load/timers.c
index 5dd34a1..fcd9f14 100644
--- a/tools/http_load/timers.c
+++ b/tools/http_load/timers.c
@@ -32,7 +32,6 @@
#include "timers.h"
-
#define HASH_SIZE 67
static Timer *timers[HASH_SIZE];
static Timer *free_timers = (Timer *)0;
@@ -40,7 +39,6 @@ static long mstimeout_cache = -1;
ClientData JunkClientData;
-
static unsigned int
hash(Timer *t)
{
@@ -52,7 +50,6 @@ hash(Timer *t)
return ((unsigned int)t->time.tv_sec ^ (unsigned int)t->time.tv_usec) % HASH_SIZE;
}
-
static void
l_add(Timer *t)
{
@@ -92,7 +89,6 @@ l_add(Timer *t)
}
}
-
static void
l_remove(Timer *t)
{
@@ -106,7 +102,6 @@ l_remove(Timer *t)
t->next->prev = t->prev;
}
-
static void
l_resort(Timer *t)
{
@@ -118,7 +113,6 @@ l_resort(Timer *t)
l_add(t);
}
-
void
tmr_init(void)
{
@@ -129,7 +123,6 @@ tmr_init(void)
timers[h] = (Timer *)0;
}
-
Timer *
tmr_create(struct timeval *nowP, TimerProc *timer_proc, ClientData client_data, long msecs, int periodic)
{
@@ -166,7 +159,6 @@ tmr_create(struct timeval *nowP, TimerProc *timer_proc, ClientData client_data,
return t;
}
-
struct timeval *
tmr_timeout(struct timeval *nowP)
{
@@ -181,7 +173,6 @@ tmr_timeout(struct timeval *nowP)
return &timeout;
}
-
long
tmr_mstimeout(struct timeval *nowP)
{
@@ -219,7 +210,6 @@ tmr_mstimeout(struct timeval *nowP)
}
}
-
void
tmr_run(struct timeval *nowP)
{
@@ -254,7 +244,6 @@ tmr_run(struct timeval *nowP)
}
}
-
void
tmr_reset(struct timeval *nowP, Timer *t)
{
@@ -269,7 +258,6 @@ tmr_reset(struct timeval *nowP, Timer *t)
l_resort(t);
}
-
void
tmr_cancel(Timer *t)
{
@@ -282,7 +270,6 @@ tmr_cancel(Timer *t)
t->prev = (Timer *)0;
}
-
void
tmr_cleanup(void)
{
@@ -296,7 +283,6 @@ tmr_cleanup(void)
}
}
-
void
tmr_destroy(void)
{
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index ee276b5..25bc6be 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -2632,7 +2632,7 @@ interval_report()
tag++; \
unsigned char *base = bytes + bucket * BYTES_PER_BUCKET; \
unsigned char *last = bytes + (bucket + 1) * BYTES_PER_BUCKET - BYTES_PER_ENTRY; \
- (void) last; \
+ (void)last; \
\
for (unsigned int x = 0; x < ENTRIES_PER_BUCKET; x++) { \
unsigned char *e = base + x * BYTES_PER_ENTRY;
diff --git a/tools/lighttpd_mod_generator/mod_generator.c b/tools/lighttpd_mod_generator/mod_generator.c
index 8d5ba90..551b105 100644
--- a/tools/lighttpd_mod_generator/mod_generator.c
+++ b/tools/lighttpd_mod_generator/mod_generator.c
@@ -234,7 +234,6 @@ URIHANDLER_FUNC(mod_generator_uri_handler)
return HANDLER_GO_ON;
}
-
URIHANDLER_FUNC(mod_generator_subrequest_handler)
{
(void)p_d;
@@ -242,7 +241,6 @@ URIHANDLER_FUNC(mod_generator_subrequest_handler)
buffer *b;
b = chunkqueue_get_append_buffer(con->write_queue);
-
// get the url information
// int length = strlen(con->uri.path->ptr);
char *start = con->uri.path->ptr;
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 01/02: TS-4164 Update to new clang-format version
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit f2e3fbbdabc395a53a444f8545f0780bca2d0031
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Sat Apr 16 09:47:46 2016 -0600
TS-4164 Update to new clang-format version
---
.clang-format | 85 +++++++++++++++++++++++++++++++++++----------------
tools/clang-format.sh | 28 ++++++++++++-----
2 files changed, 79 insertions(+), 34 deletions(-)
diff --git a/.clang-format b/.clang-format
index 8af2a45..61d0d66 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,62 +1,93 @@
---
Language: Cpp
-# BasedOnStyle: Mozilla
AccessModifierOffset: -2
-ConstructorInitializerIndentWidth: 2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: true
+AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AlwaysBreakAfterDefinitionReturnType: true
-AlwaysBreakTemplateDeclarations: false
+AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterReturnType: AllDefinitions
AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+ AfterClass: true
+ AfterControlStatement: false
+ AfterEnum: false
+ AfterFunction: true
+ AfterNamespace: true
+ AfterObjCDeclaration: false
+ AfterStruct: true
+ AfterUnion: false
+ BeforeCatch: false
+ BeforeElse: false
+ IndentBraces: false
BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Linux
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: false
-BinPackParameters: true
-BinPackArguments: true
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
ColumnLimit: 132
+CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: true
DerivePointerAlignment: false
+DisableFormat: false
ExperimentalAutoDetectBinPacking: false
+ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SortIncludes: false
+IncludeCategories:
+ - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
+ Priority: 2
+ - Regex: '^(<|"(gtest|isl|json)/)'
+ Priority: 3
+ - Regex: '.*'
+ Priority: 1
+IncludeIsMainRegex: '$'
IndentCaseLabels: false
+IndentWidth: 2
IndentWrappedFunctionNames: false
-IndentFunctionDeclarationAfterType: false
-MaxEmptyLinesToKeep: 2
KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
NamespaceIndentation: Inner
+ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: false
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
-PenaltyBreakString: 1000
PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Right
-SpacesBeforeTrailingComments: 1
-Cpp11BracedListStyle: true
-Standard: Cpp03
-IndentWidth: 2
-TabWidth: 8
-UseTab: Never
-BreakBeforeBraces: Linux
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-SpacesInAngles: false
-SpaceInEmptyParentheses: false
-SpacesInCStyleCastParentheses: false
+ReflowComments: true
SpaceAfterCStyleCast: false
-SpacesInContainerLiterals: true
SpaceBeforeAssignmentOperators: true
-ContinuationIndentWidth: 2
-CommentPragmas: '^ IWYU pragma:'
-ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
SpaceBeforeParens: ControlStatements
-DisableFormat: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp11
+TabWidth: 8
+UseTab: Never
+JavaScriptQuotes: Leave
...
diff --git a/tools/clang-format.sh b/tools/clang-format.sh
index aab69a0..f9b9544 100755
--- a/tools/clang-format.sh
+++ b/tools/clang-format.sh
@@ -22,7 +22,10 @@ set -e # exit on error
DIR=${1:-.}
ROOT=${ROOT:-$(git rev-parse --show-toplevel)/.git/fmt}
-URL=${URL:-https://bintray.com/artifact/download/apache/trafficserver/clang-format-20150331.tar.bz2}
+PACKAGE="clang-format-20160415.tar.bz2"
+VERSION="clang-format version 3.9.0 (trunk 265913)"
+
+URL=${URL:-https://bintray.com/artifact/download/apache/trafficserver/${PACKAGE}}
TAR=${TAR:-tar}
CURL=${CURL:-curl}
@@ -50,16 +53,27 @@ esac
mkdir -p ${ROOT}
-if [ ! -e ${FORMAT} ] ; then
+# Note that the two spaces between the hash and ${ARCHIVE) is needed
+if [ ! -e ${FORMAT} -o ! -e ${ROOT}/${PACKAGE} ] ; then
${CURL} -L --progress-bar -o ${ARCHIVE} ${URL}
${TAR} -x -C ${ROOT} -f ${ARCHIVE}
cat > ${ROOT}/sha1 << EOF
-7117c5bed99da43be733427970b4239f4bd8063d ${ARCHIVE}
+d5558924377a6ad5799956cec5b37d4e421e2156 ${ARCHIVE}
EOF
${SHASUM} -c ${ROOT}/sha1
fi
-for file in $(find $DIR -iname \*.[ch] -o -iname \*.cc); do
- echo $file
- ${FORMAT} -i $file
-done
+
+# Make sure we only run this with our exact version
+ver=$(${FORMAT} --version)
+if [ "$ver" != "$VERSION" ]; then
+ echo "Wrong version of clang-format!"
+ echo "See https://bintray.com/apache/trafficserver/clang-format-tools/view for a newer version,"
+ echo "or alternatively, undefine the FORMAT environment variable"
+ exit 1
+else
+ for file in $(find $DIR -iname \*.[ch] -o -iname \*.cc); do
+ echo $file
+ ${FORMAT} -i $file
+ done
+fi
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.