You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2018/05/02 22:48:49 UTC
[trafficserver] branch master updated: Ran clang-tidy with
modernize-deprecated-headers
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new b4871cb Ran clang-tidy with modernize-deprecated-headers
b4871cb is described below
commit b4871cb6cb9427d0cc36147a35d20fa3eae6096b
Author: Bryan Call <bc...@apache.org>
AuthorDate: Tue May 1 11:05:42 2018 -0700
Ran clang-tidy with modernize-deprecated-headers
---
cmd/traffic_cache_tool/CacheTool.cc | 8 ++++----
cmd/traffic_cache_tool/Command.cc | 2 +-
cmd/traffic_top/stats.h | 2 +-
example/cppapi/websocket/WebSocket.h | 2 +-
example/disable_http2/disable_http2.cc | 2 +-
iocore/net/SSLNetVConnection.cc | 2 +-
lib/cppapi/include/atscppapi/Stat.h | 2 +-
lib/cppapi/include/atscppapi/Transaction.h | 2 +-
lib/cppapi/include/atscppapi/Url.h | 2 +-
lib/cppapi/include/atscppapi/utils.h | 2 +-
lib/ts/Allocator.h | 2 +-
lib/ts/BaseLogFile.h | 6 +++---
lib/ts/BufferWriter.h | 2 +-
lib/ts/BufferWriterFormat.cc | 4 ++--
lib/ts/BufferWriterForward.h | 2 +-
lib/ts/ConsistentHash.h | 2 +-
lib/ts/Diags.h | 2 +-
lib/ts/Hash.h | 4 ++--
lib/ts/HashFNV.h | 2 +-
lib/ts/InkErrno.h | 2 +-
lib/ts/List.h | 2 +-
lib/ts/Map.h | 4 ++--
lib/ts/ParseRules.h | 2 +-
lib/ts/SimpleTokenizer.h | 6 +++---
lib/ts/TestBox.h | 2 +-
lib/ts/TextBuffer.h | 3 +--
lib/ts/Trie.h | 6 +++---
lib/ts/ink_atomic.h | 8 ++++----
lib/ts/ink_file.h | 2 +-
lib/ts/ink_hrtime.h | 4 ++--
lib/ts/ink_memory.h | 6 +++---
lib/ts/ink_mutex.h | 3 +--
lib/ts/ink_sprintf.h | 4 ++--
lib/ts/ink_string++.h | 2 +-
lib/ts/ink_string.h | 2 +-
lib/ts/ink_thread.h | 4 ++--
lib/ts/ink_uuid.h | 2 +-
lib/tsconfig/IntrusivePtr.h | 2 +-
lib/tsconfig/TsValue.h | 12 ++++++------
mgmt/Alarms.h | 4 ++--
mgmt/FileManager.h | 2 +-
mgmt/api/CoreAPI.h | 2 +-
mgmt/api/GenericParser.h | 2 +-
mgmt/api/include/mgmtapi.h | 5 ++---
mgmt/utils/MgmtMarshall.h | 2 +-
plugins/background_fetch/configs.h | 2 +-
plugins/background_fetch/rules.h | 2 +-
plugins/compress/misc.h | 4 ++--
plugins/esi/lib/ComponentBase.h | 2 +-
plugins/esi/lib/DocNode.h | 2 +-
plugins/esi/lib/Expression.h | 2 +-
plugins/esi/lib/FailureInfo.h | 2 +-
plugins/esi/lib/Utils.h | 2 +-
plugins/experimental/collapsed_connection/MurmurHash3.h | 2 +-
.../collapsed_connection/P_collapsed_connection.h | 2 +-
plugins/experimental/geoip_acl/acl.h | 4 ++--
plugins/experimental/inliner/cache-handler.h | 2 +-
plugins/experimental/inliner/cache.h | 2 +-
plugins/experimental/inliner/chunk-decoder.h | 2 +-
plugins/experimental/inliner/fetcher.h | 2 +-
plugins/experimental/inliner/ts.h | 2 +-
plugins/experimental/inliner/vconnection.h | 2 +-
plugins/experimental/money_trace/money_trace.h | 2 +-
plugins/experimental/mp4/mp4_common.h | 8 ++++----
plugins/experimental/mp4/mp4_meta.h | 10 +++++-----
plugins/experimental/multiplexer/chunk-decoder.h | 2 +-
plugins/experimental/multiplexer/dispatch.h | 2 +-
plugins/experimental/multiplexer/fetcher.h | 2 +-
plugins/experimental/multiplexer/original-request.h | 2 +-
plugins/experimental/multiplexer/ts.h | 2 +-
plugins/experimental/mysql_remap/lib/dictionary.h | 6 +++---
plugins/experimental/mysql_remap/lib/iniparser.h | 6 +++---
plugins/experimental/sslheaders/sslheaders.h | 2 +-
plugins/experimental/tls_bridge/tls_bridge.cc | 2 +-
plugins/header_rewrite/statement.h | 2 +-
plugins/s3_auth/unit-tests/test_aws_auth_v4.cc | 2 +-
plugins/xdebug/xdebug.cc | 2 +-
proxy/ControlMatcher.h | 2 +-
proxy/CoreUtils.h | 8 ++++----
proxy/hdrs/HTTP.h | 2 +-
proxy/hdrs/HdrToken.h | 2 +-
proxy/http/HttpConfig.h | 6 +++---
proxy/http2/HuffmanCodec.h | 4 ++--
proxy/logging/Log.h | 2 +-
proxy/logging/LogFieldAliasMap.h | 4 ++--
proxy/logging/LogFile.h | 4 ++--
proxy/logging/LogUtils.h | 2 +-
87 files changed, 135 insertions(+), 138 deletions(-)
diff --git a/cmd/traffic_cache_tool/CacheTool.cc b/cmd/traffic_cache_tool/CacheTool.cc
index 49e8cf2..09126ce 100644
--- a/cmd/traffic_cache_tool/CacheTool.cc
+++ b/cmd/traffic_cache_tool/CacheTool.cc
@@ -28,15 +28,15 @@
#include <map>
#include <getopt.h>
#include <system_error>
-#include <string.h>
+#include <cstring>
#include <fcntl.h>
-#include <ctype.h>
+#include <cctype>
#include <cstring>
#include <vector>
#include <unordered_set>
-#include <time.h>
+#include <ctime>
#include <bitset>
-#include <inttypes.h>
+#include <cinttypes>
#include <ts/ink_memory.h>
#include <ts/ink_file.h>
diff --git a/cmd/traffic_cache_tool/Command.cc b/cmd/traffic_cache_tool/Command.cc
index ae04ac1..1fe7a73 100644
--- a/cmd/traffic_cache_tool/Command.cc
+++ b/cmd/traffic_cache_tool/Command.cc
@@ -24,7 +24,7 @@
#include "Command.h"
#include <new>
#include <algorithm>
-#include <string.h>
+#include <cstring>
#include <sstream>
namespace ts
diff --git a/cmd/traffic_top/stats.h b/cmd/traffic_top/stats.h
index 59bd17b..7dc3d97 100644
--- a/cmd/traffic_top/stats.h
+++ b/cmd/traffic_top/stats.h
@@ -28,7 +28,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <inttypes.h>
+#include <cinttypes>
#include <sys/time.h>
#include "mgmtapi.h"
diff --git a/example/cppapi/websocket/WebSocket.h b/example/cppapi/websocket/WebSocket.h
index 7c6d0dd..01f835e 100644
--- a/example/cppapi/websocket/WebSocket.h
+++ b/example/cppapi/websocket/WebSocket.h
@@ -27,7 +27,7 @@
#include <atscppapi/InterceptPlugin.h>
#include <string>
-#include <stddef.h>
+#include <cstddef>
#include "WSBuffer.h"
diff --git a/example/disable_http2/disable_http2.cc b/example/disable_http2/disable_http2.cc
index 6c4ce52..d21b107 100644
--- a/example/disable_http2/disable_http2.cc
+++ b/example/disable_http2/disable_http2.cc
@@ -30,7 +30,7 @@
#include <unordered_map>
#include <unordered_set>
#include <string>
-#include <string.h>
+#include <cstring>
#include <openssl/ssl.h>
#define PLUGIN_NAME "disable_http2"
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 2a74fc2..892d002 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -36,7 +36,7 @@
#include <climits>
#include <string>
-#include <stdbool.h>
+
#if TS_USE_TLS_ASYNC
#include <openssl/async.h>
#endif
diff --git a/lib/cppapi/include/atscppapi/Stat.h b/lib/cppapi/include/atscppapi/Stat.h
index baca44b..856a20b 100644
--- a/lib/cppapi/include/atscppapi/Stat.h
+++ b/lib/cppapi/include/atscppapi/Stat.h
@@ -22,7 +22,7 @@
#pragma once
#include <atscppapi/noncopyable.h>
-#include <stdint.h>
+#include <cstdint>
#include <string>
namespace atscppapi
diff --git a/lib/cppapi/include/atscppapi/Transaction.h b/lib/cppapi/include/atscppapi/Transaction.h
index b110550..eb9fed9 100644
--- a/lib/cppapi/include/atscppapi/Transaction.h
+++ b/lib/cppapi/include/atscppapi/Transaction.h
@@ -22,7 +22,7 @@
#pragma once
#include <sys/socket.h>
-#include <stdint.h>
+#include <cstdint>
#include <list>
#include <memory>
#include "atscppapi/Request.h"
diff --git a/lib/cppapi/include/atscppapi/Url.h b/lib/cppapi/include/atscppapi/Url.h
index eb897f8..1e81e89 100644
--- a/lib/cppapi/include/atscppapi/Url.h
+++ b/lib/cppapi/include/atscppapi/Url.h
@@ -22,7 +22,7 @@
#pragma once
#include <string>
-#include <stdint.h>
+#include <cstdint>
#include <atscppapi/noncopyable.h>
namespace atscppapi
diff --git a/lib/cppapi/include/atscppapi/utils.h b/lib/cppapi/include/atscppapi/utils.h
index fbd5e9c..c6d5215 100644
--- a/lib/cppapi/include/atscppapi/utils.h
+++ b/lib/cppapi/include/atscppapi/utils.h
@@ -27,7 +27,7 @@
#include <string>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <stdint.h>
+#include <cstdint>
#ifndef ATSCPPAPI_UNUSED
#ifdef __GNUC__
diff --git a/lib/ts/Allocator.h b/lib/ts/Allocator.h
index 5ca9477..c831426 100644
--- a/lib/ts/Allocator.h
+++ b/lib/ts/Allocator.h
@@ -40,7 +40,7 @@
#pragma once
#include <new>
-#include <stdlib.h>
+#include <cstdlib>
#include "ts/ink_queue.h"
#include "ts/ink_defs.h"
#include "ts/ink_resource.h"
diff --git a/lib/ts/BaseLogFile.h b/lib/ts/BaseLogFile.h
index db1c9c9..38f6a49 100644
--- a/lib/ts/BaseLogFile.h
+++ b/lib/ts/BaseLogFile.h
@@ -24,10 +24,10 @@
#pragma once
-#include <stdarg.h>
-#include <stdio.h>
+#include <cstdarg>
+#include <cstdio>
#include <sys/time.h>
-#include <stdint.h>
+#include <cstdint>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/lib/ts/BufferWriter.h b/lib/ts/BufferWriter.h
index 5e9e80f..f76885b 100644
--- a/lib/ts/BufferWriter.h
+++ b/lib/ts/BufferWriter.h
@@ -23,7 +23,7 @@
#pragma once
-#include <stdlib.h>
+#include <cstdlib>
#include <utility>
#include <cstring>
#include <vector>
diff --git a/lib/ts/BufferWriterFormat.cc b/lib/ts/BufferWriterFormat.cc
index 585d48f..8adb5ff 100644
--- a/lib/ts/BufferWriterFormat.cc
+++ b/lib/ts/BufferWriterFormat.cc
@@ -22,10 +22,10 @@
*/
#include <ts/BufferWriter.h>
-#include <ctype.h>
+#include <cctype>
#include <ctime>
#include <cmath>
-#include <math.h>
+#include <cmath>
#include <array>
namespace
diff --git a/lib/ts/BufferWriterForward.h b/lib/ts/BufferWriterForward.h
index 05510d6..882e85a 100644
--- a/lib/ts/BufferWriterForward.h
+++ b/lib/ts/BufferWriterForward.h
@@ -23,7 +23,7 @@
#pragma once
-#include <stdlib.h>
+#include <cstdlib>
#include <utility>
#include <cstring>
#include <vector>
diff --git a/lib/ts/ConsistentHash.h b/lib/ts/ConsistentHash.h
index e99f449..9946776 100644
--- a/lib/ts/ConsistentHash.h
+++ b/lib/ts/ConsistentHash.h
@@ -22,7 +22,7 @@
#pragma once
#include "Hash.h"
-#include <stdint.h>
+#include <cstdint>
#include <iostream>
#include <map>
diff --git a/lib/ts/Diags.h b/lib/ts/Diags.h
index 473a445..eadf4d5 100644
--- a/lib/ts/Diags.h
+++ b/lib/ts/Diags.h
@@ -33,7 +33,7 @@
#pragma once
-#include <stdarg.h>
+#include <cstdarg>
#include "ink_mutex.h"
#include "Regex.h"
#include "ink_apidefs.h"
diff --git a/lib/ts/Hash.h b/lib/ts/Hash.h
index cba742b..68879a9 100644
--- a/lib/ts/Hash.h
+++ b/lib/ts/Hash.h
@@ -22,8 +22,8 @@
#pragma once
#include <cstddef>
-#include <stdint.h>
-#include <ctype.h>
+#include <cstdint>
+#include <cctype>
struct ATSHashBase {
virtual void update(const void *, size_t) = 0;
diff --git a/lib/ts/HashFNV.h b/lib/ts/HashFNV.h
index e285869..a548069 100644
--- a/lib/ts/HashFNV.h
+++ b/lib/ts/HashFNV.h
@@ -28,7 +28,7 @@
#pragma once
#include "ts/Hash.h"
-#include <stdint.h>
+#include <cstdint>
struct ATSHash32FNV1a : ATSHash32 {
ATSHash32FNV1a(void);
diff --git a/lib/ts/InkErrno.h b/lib/ts/InkErrno.h
index f4bfe5a..083e8a1 100644
--- a/lib/ts/InkErrno.h
+++ b/lib/ts/InkErrno.h
@@ -28,7 +28,7 @@
*/
#pragma once
-#include <errno.h>
+#include <cerrno>
#define INK_START_ERRNO 20000
diff --git a/lib/ts/List.h b/lib/ts/List.h
index d059b53..d3ae4db 100644
--- a/lib/ts/List.h
+++ b/lib/ts/List.h
@@ -53,7 +53,7 @@
#pragma once
-#include <stdint.h>
+#include <cstdint>
#include "ts/ink_assert.h"
#include "ts/ink_queue.h"
diff --git a/lib/ts/Map.h b/lib/ts/Map.h
index 68c1a21..a46a262 100644
--- a/lib/ts/Map.h
+++ b/lib/ts/Map.h
@@ -23,8 +23,8 @@
#pragma once
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
#include <unistd.h>
#include <sys/types.h>
diff --git a/lib/ts/ParseRules.h b/lib/ts/ParseRules.h
index 17674b6..166f6c3 100644
--- a/lib/ts/ParseRules.h
+++ b/lib/ts/ParseRules.h
@@ -23,7 +23,7 @@
#pragma once
-#include <string.h>
+#include <cstring>
#include "ts/ink_defs.h"
#include "ts/ink_apidefs.h"
diff --git a/lib/ts/SimpleTokenizer.h b/lib/ts/SimpleTokenizer.h
index 15e2e52..cebf6f3 100644
--- a/lib/ts/SimpleTokenizer.h
+++ b/lib/ts/SimpleTokenizer.h
@@ -23,9 +23,9 @@
#pragma once
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
#include "ts/ink_memory.h"
/*-----------------------------------------------------------------------------
diff --git a/lib/ts/TestBox.h b/lib/ts/TestBox.h
index cf8a1d3..bbb9a03 100644
--- a/lib/ts/TestBox.h
+++ b/lib/ts/TestBox.h
@@ -23,7 +23,7 @@
#pragma once
-#include <stdarg.h>
+#include <cstdarg>
#include "ts/ink_apidefs.h"
#include "ts/Regression.h"
diff --git a/lib/ts/TextBuffer.h b/lib/ts/TextBuffer.h
index 6a6d8f2..2be7c11 100644
--- a/lib/ts/TextBuffer.h
+++ b/lib/ts/TextBuffer.h
@@ -35,8 +35,7 @@
#include "ts/ink_memory.h"
#include "ts/ink_apidefs.h"
-#include <stdarg.h>
-
+#include <cstdarg>
class TextBuffer
{
public:
diff --git a/lib/ts/Trie.h b/lib/ts/Trie.h
index 4dadd3a..e371c95 100644
--- a/lib/ts/Trie.h
+++ b/lib/ts/Trie.h
@@ -22,9 +22,9 @@
*/
#pragma once
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include "ts/List.h"
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index 263eb8b..683bb96 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -36,10 +36,10 @@
#pragma once
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdint>
+#include <cassert>
#include "ts/ink_defs.h"
#include "ts/ink_apidefs.h"
diff --git a/lib/ts/ink_file.h b/lib/ts/ink_file.h
index d17e908..2ec514c 100644
--- a/lib/ts/ink_file.h
+++ b/lib/ts/ink_file.h
@@ -33,7 +33,7 @@
#include "ts/ink_config.h"
-#include <stdio.h>
+#include <cstdio>
#include <sys/types.h>
#include <dirent.h>
diff --git a/lib/ts/ink_hrtime.h b/lib/ts/ink_hrtime.h
index 1dc511c..7acc296 100644
--- a/lib/ts/ink_hrtime.h
+++ b/lib/ts/ink_hrtime.h
@@ -32,9 +32,9 @@
#include "ts/ink_config.h"
#include "ts/ink_assert.h"
-#include <time.h>
+#include <ctime>
#include <sys/time.h>
-#include <stdlib.h>
+#include <cstdlib>
typedef int64_t ink_hrtime;
int squid_timestamp_to_buf(char *buf, unsigned int buf_size, long timestamp_sec, long timestamp_usec);
diff --git a/lib/ts/ink_memory.h b/lib/ts/ink_memory.h
index c397d50..42c5518 100644
--- a/lib/ts/ink_memory.h
+++ b/lib/ts/ink_memory.h
@@ -22,10 +22,10 @@
*/
#pragma once
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
#include <strings.h>
-#include <inttypes.h>
+#include <cinttypes>
#include <string>
#include "ts/string_view.h"
diff --git a/lib/ts/ink_mutex.h b/lib/ts/ink_mutex.h
index 27e6352..c54a4b8 100644
--- a/lib/ts/ink_mutex.h
+++ b/lib/ts/ink_mutex.h
@@ -36,8 +36,7 @@
#include "ts/ink_error.h"
#include <pthread.h>
-#include <stdlib.h>
-
+#include <cstdlib>
typedef pthread_mutex_t ink_mutex;
void ink_mutex_init(ink_mutex *m);
diff --git a/lib/ts/ink_sprintf.h b/lib/ts/ink_sprintf.h
index 5840d59..fd67c1f 100644
--- a/lib/ts/ink_sprintf.h
+++ b/lib/ts/ink_sprintf.h
@@ -33,8 +33,8 @@
#pragma once
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
#include "ts/ink_apidefs.h"
#include "ts/ink_defs.h"
diff --git a/lib/ts/ink_string++.h b/lib/ts/ink_string++.h
index 181e91f..126ca25 100644
--- a/lib/ts/ink_string++.h
+++ b/lib/ts/ink_string++.h
@@ -31,7 +31,7 @@
****************************************************************************/
#pragma once
-#include <stdio.h>
+#include <cstdio>
#include <strings.h>
/***********************************************************************
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index f4d3ad3..92e0ced 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -31,7 +31,7 @@
#pragma once
-#include <stdio.h>
+#include <cstdio>
#include <memory.h>
#include <strings.h>
diff --git a/lib/ts/ink_thread.h b/lib/ts/ink_thread.h
index 71b2047..d9484f6 100644
--- a/lib/ts/ink_thread.h
+++ b/lib/ts/ink_thread.h
@@ -40,7 +40,7 @@
#if defined(POSIX_THREAD)
#include <pthread.h>
-#include <signal.h>
+#include <csignal>
#include <semaphore.h>
#if HAVE_PTHREAD_NP_H
@@ -91,7 +91,7 @@ typedef struct timespec ink_timestruc;
typedef timestruc_t ink_timestruc;
#endif
-#include <errno.h>
+#include <cerrno>
#include "ts/ink_mutex.h"
#include "ts/ink_assert.h"
diff --git a/lib/ts/ink_uuid.h b/lib/ts/ink_uuid.h
index efb729e..b016403 100644
--- a/lib/ts/ink_uuid.h
+++ b/lib/ts/ink_uuid.h
@@ -23,7 +23,7 @@
*/
#pragma once
-#include <stdio.h>
+#include <cstdio>
#include "ts/apidefs.h"
#include "ts/ink_memory.h"
diff --git a/lib/tsconfig/IntrusivePtr.h b/lib/tsconfig/IntrusivePtr.h
index 77366ab..1db5054 100644
--- a/lib/tsconfig/IntrusivePtr.h
+++ b/lib/tsconfig/IntrusivePtr.h
@@ -32,7 +32,7 @@
*/
#include <sys/types.h>
-#include <assert.h>
+#include <cassert>
#include <functional>
namespace ts
diff --git a/lib/tsconfig/TsValue.h b/lib/tsconfig/TsValue.h
index 2d8dec5..db8fc3f 100644
--- a/lib/tsconfig/TsValue.h
+++ b/lib/tsconfig/TsValue.h
@@ -24,12 +24,12 @@
limitations under the License.
*/
-# include <string.h>
-# include <ts/TsBuffer.h>
-# include <tsconfig/NumericType.h>
-# include <tsconfig/IntrusivePtr.h>
-# include <tsconfig/Errata.h>
-# include <vector>
+#include <cstring>
+#include <ts/TsBuffer.h>
+#include <tsconfig/NumericType.h>
+#include <tsconfig/IntrusivePtr.h>
+#include <tsconfig/Errata.h>
+#include <vector>
namespace ts { namespace config {
diff --git a/mgmt/Alarms.h b/mgmt/Alarms.h
index ec9249e..158eada 100644
--- a/mgmt/Alarms.h
+++ b/mgmt/Alarms.h
@@ -35,8 +35,8 @@
#ifndef _ALARMS_H
#define _ALARMS_H
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
#include "ts/ink_hash_table.h"
#include "ts/ink_mutex.h"
diff --git a/mgmt/FileManager.h b/mgmt/FileManager.h
index 4739dc5..b81efc3 100644
--- a/mgmt/FileManager.h
+++ b/mgmt/FileManager.h
@@ -30,7 +30,7 @@
*
****************************************************************************/
-#include <stdio.h>
+#include <cstdio>
#include "ts/ink_hash_table.h"
#include "ts/List.h"
diff --git a/mgmt/api/CoreAPI.h b/mgmt/api/CoreAPI.h
index a1c0573..cea8ab8 100644
--- a/mgmt/api/CoreAPI.h
+++ b/mgmt/api/CoreAPI.h
@@ -23,7 +23,7 @@
#pragma once
-#include <stdarg.h> // for va_list
+#include <cstdarg> // for va_list
#include "ts/ink_llqueue.h"
#include "MgmtDefs.h" // MgmtInt, MgmtFloat, etc
diff --git a/mgmt/api/GenericParser.h b/mgmt/api/GenericParser.h
index b4bce9d..2d8df3b 100644
--- a/mgmt/api/GenericParser.h
+++ b/mgmt/api/GenericParser.h
@@ -28,7 +28,7 @@
***************************************************************************/
#pragma once
-#include <string.h>
+#include <cstring>
#include "ts/ink_assert.h"
#include "ts/Tokenizer.h"
#include "ts/List.h"
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index 83f6fc8..9ed9d86 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -27,9 +27,8 @@
#pragma once
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
+#include <cstdint>
+#include <cstddef>
/***************************************************************************
* System Specific Items
diff --git a/mgmt/utils/MgmtMarshall.h b/mgmt/utils/MgmtMarshall.h
index 45ff200..11c3d92 100644
--- a/mgmt/utils/MgmtMarshall.h
+++ b/mgmt/utils/MgmtMarshall.h
@@ -23,7 +23,7 @@
#pragma once
-#include <stdarg.h>
+#include <cstdarg>
#define MAX_TIME_WAIT 60 // num secs for a timeout on a select call (remote only)
diff --git a/plugins/background_fetch/configs.h b/plugins/background_fetch/configs.h
index 4b9df4e..645717d 100644
--- a/plugins/background_fetch/configs.h
+++ b/plugins/background_fetch/configs.h
@@ -24,7 +24,7 @@
#pragma once
-#include <stdlib.h>
+#include <cstdlib>
#include "rules.h"
#include "ts/ink_atomic.h"
diff --git a/plugins/background_fetch/rules.h b/plugins/background_fetch/rules.h
index 7c0fd77..43ac668 100644
--- a/plugins/background_fetch/rules.h
+++ b/plugins/background_fetch/rules.h
@@ -24,7 +24,7 @@
#pragma once
-#include <stdlib.h>
+#include <cstdlib>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/plugins/compress/misc.h b/plugins/compress/misc.h
index af0164c..a42c3e8 100644
--- a/plugins/compress/misc.h
+++ b/plugins/compress/misc.h
@@ -25,8 +25,8 @@
#include <zlib.h>
#include <ts/ts.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
#if HAVE_BROTLI_ENCODE_H
#include <brotli/encode.h>
diff --git a/plugins/esi/lib/ComponentBase.h b/plugins/esi/lib/ComponentBase.h
index f03d3a5..b6d6cc2 100644
--- a/plugins/esi/lib/ComponentBase.h
+++ b/plugins/esi/lib/ComponentBase.h
@@ -24,7 +24,7 @@
#ifndef _ESI_COMPONENT_BASE_H
#define _ESI_COMPONENT_BASE_H
-#include <stdio.h>
+#include <cstdio>
#include <string>
namespace EsiLib
diff --git a/plugins/esi/lib/DocNode.h b/plugins/esi/lib/DocNode.h
index 82a8139..824f904 100644
--- a/plugins/esi/lib/DocNode.h
+++ b/plugins/esi/lib/DocNode.h
@@ -24,7 +24,7 @@
#ifndef _FETCHER_DOC_NODE_H
#define _FETCHER_DOC_NODE_H
-#include <stdint.h>
+#include <cstdint>
#include <list>
#include <string>
diff --git a/plugins/esi/lib/Expression.h b/plugins/esi/lib/Expression.h
index aa49738..af7a8f1 100644
--- a/plugins/esi/lib/Expression.h
+++ b/plugins/esi/lib/Expression.h
@@ -26,7 +26,7 @@
#define _ESI_EXPRESSION_H
#include <string>
-#include <stdlib.h>
+#include <cstdlib>
#include "ComponentBase.h"
#include "Variables.h"
diff --git a/plugins/esi/lib/FailureInfo.h b/plugins/esi/lib/FailureInfo.h
index ec3cac5..3140576 100644
--- a/plugins/esi/lib/FailureInfo.h
+++ b/plugins/esi/lib/FailureInfo.h
@@ -23,7 +23,7 @@
#ifndef FAILURE_INFO_H
#define FAILURE_INFO_H
-#include <time.h>
+#include <ctime>
#include <vector>
#include <map>
#include <sys/time.h>
diff --git a/plugins/esi/lib/Utils.h b/plugins/esi/lib/Utils.h
index 004f3b6..39b68af 100644
--- a/plugins/esi/lib/Utils.h
+++ b/plugins/esi/lib/Utils.h
@@ -32,7 +32,7 @@
#include <string>
#include <map>
#include <list>
-#include <ctype.h>
+#include <cctype>
namespace EsiLib
{
diff --git a/plugins/experimental/collapsed_connection/MurmurHash3.h b/plugins/experimental/collapsed_connection/MurmurHash3.h
index 21d6ce1..3d74173 100644
--- a/plugins/experimental/collapsed_connection/MurmurHash3.h
+++ b/plugins/experimental/collapsed_connection/MurmurHash3.h
@@ -6,7 +6,7 @@
#define _MURMURHASH3_H_
//-----------------------------------------------------------------------------
-#include <stdint.h>
+#include <cstdint>
//-----------------------------------------------------------------------------
diff --git a/plugins/experimental/collapsed_connection/P_collapsed_connection.h b/plugins/experimental/collapsed_connection/P_collapsed_connection.h
index 2cef66e..44dffbf 100644
--- a/plugins/experimental/collapsed_connection/P_collapsed_connection.h
+++ b/plugins/experimental/collapsed_connection/P_collapsed_connection.h
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include <stdint.h>
+#include <cstdint>
#include <map>
#include <list>
#include <utility>
diff --git a/plugins/experimental/geoip_acl/acl.h b/plugins/experimental/geoip_acl/acl.h
index 23eb5b8..89125b7 100644
--- a/plugins/experimental/geoip_acl/acl.h
+++ b/plugins/experimental/geoip_acl/acl.h
@@ -15,8 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <arpa/inet.h>
#include <ts/ts.h>
diff --git a/plugins/experimental/inliner/cache-handler.h b/plugins/experimental/inliner/cache-handler.h
index 3999711..1e4dc00 100644
--- a/plugins/experimental/inliner/cache-handler.h
+++ b/plugins/experimental/inliner/cache-handler.h
@@ -27,7 +27,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <assert.h>
+#include <cassert>
#include "cache.h"
#include "fetcher.h"
diff --git a/plugins/experimental/inliner/cache.h b/plugins/experimental/inliner/cache.h
index 1d23d44..b4d98b9 100644
--- a/plugins/experimental/inliner/cache.h
+++ b/plugins/experimental/inliner/cache.h
@@ -23,7 +23,7 @@
#ifndef CACHE_H
#define CACHE_H
-#include <assert.h>
+#include <cassert>
#include <string>
#include "ts.h"
diff --git a/plugins/experimental/inliner/chunk-decoder.h b/plugins/experimental/inliner/chunk-decoder.h
index 09cfddb..11ad6c1 100644
--- a/plugins/experimental/inliner/chunk-decoder.h
+++ b/plugins/experimental/inliner/chunk-decoder.h
@@ -44,7 +44,7 @@
#define CHUNK_DECODER_H
#include <ts/ts.h>
-#include <inttypes.h>
+#include <cinttypes>
class ChunkDecoder
{
diff --git a/plugins/experimental/inliner/fetcher.h b/plugins/experimental/inliner/fetcher.h
index 3676205..14f842d 100644
--- a/plugins/experimental/inliner/fetcher.h
+++ b/plugins/experimental/inliner/fetcher.h
@@ -49,7 +49,7 @@
#include <limits>
#include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
#include "chunk-decoder.h"
#include "ts.h"
diff --git a/plugins/experimental/inliner/ts.h b/plugins/experimental/inliner/ts.h
index 2c35c33..42dc7b5 100644
--- a/plugins/experimental/inliner/ts.h
+++ b/plugins/experimental/inliner/ts.h
@@ -23,7 +23,7 @@
#ifndef TS_H
#define TS_H
-#include <assert.h>
+#include <cassert>
#include <limits>
#include <list>
#include <memory>
diff --git a/plugins/experimental/inliner/vconnection.h b/plugins/experimental/inliner/vconnection.h
index 97ce512..537508b 100644
--- a/plugins/experimental/inliner/vconnection.h
+++ b/plugins/experimental/inliner/vconnection.h
@@ -23,7 +23,7 @@
#ifndef VCONNECTION_H
#define VCONNECTION_H
-#include <assert.h>
+#include <cassert>
#include "ts.h"
diff --git a/plugins/experimental/money_trace/money_trace.h b/plugins/experimental/money_trace/money_trace.h
index 5a9347c..6f2b015 100644
--- a/plugins/experimental/money_trace/money_trace.h
+++ b/plugins/experimental/money_trace/money_trace.h
@@ -21,7 +21,7 @@
#define __MONEY_TRACE_H
#include <random>
-#include <time.h>
+#include <ctime>
#include "ts/ts.h"
#include "ts/remap.h"
diff --git a/plugins/experimental/mp4/mp4_common.h b/plugins/experimental/mp4/mp4_common.h
index b14f841..df821ea 100644
--- a/plugins/experimental/mp4/mp4_common.h
+++ b/plugins/experimental/mp4/mp4_common.h
@@ -19,11 +19,11 @@
#ifndef _MP4_COMMON_H
#define _MP4_COMMON_H
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
#include <unistd.h>
-#include <inttypes.h>
+#include <cinttypes>
#include <ts/ts.h>
#include <ts/experimental.h>
diff --git a/plugins/experimental/mp4/mp4_meta.h b/plugins/experimental/mp4/mp4_meta.h
index 90b2d46..a85df5d 100644
--- a/plugins/experimental/mp4/mp4_meta.h
+++ b/plugins/experimental/mp4/mp4_meta.h
@@ -19,13 +19,13 @@
#ifndef _MP4_META_H
#define _MP4_META_H
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stddef.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
+#include <cstddef>
#include <unistd.h>
#include <getopt.h>
-#include <inttypes.h>
+#include <cinttypes>
#include <ts/ts.h>
diff --git a/plugins/experimental/multiplexer/chunk-decoder.h b/plugins/experimental/multiplexer/chunk-decoder.h
index 9a5e9d0..f950a45 100644
--- a/plugins/experimental/multiplexer/chunk-decoder.h
+++ b/plugins/experimental/multiplexer/chunk-decoder.h
@@ -24,7 +24,7 @@
#define CHUNK_DECODER_H
#include <ts/ts.h>
-#include <inttypes.h>
+#include <cinttypes>
/** Class to handle state for decoding chunked data.
*/
diff --git a/plugins/experimental/multiplexer/dispatch.h b/plugins/experimental/multiplexer/dispatch.h
index 7c6912d..33bf60e 100644
--- a/plugins/experimental/multiplexer/dispatch.h
+++ b/plugins/experimental/multiplexer/dispatch.h
@@ -23,7 +23,7 @@
#ifndef DISPATCH_H
#define DISPATCH_H
-#include <assert.h>
+#include <cassert>
#include <memory>
#include <string>
#include <ts/ts.h>
diff --git a/plugins/experimental/multiplexer/fetcher.h b/plugins/experimental/multiplexer/fetcher.h
index 02feeb7..43423d0 100644
--- a/plugins/experimental/multiplexer/fetcher.h
+++ b/plugins/experimental/multiplexer/fetcher.h
@@ -28,7 +28,7 @@
#include <limits>
#include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
#include "chunk-decoder.h"
#include "ts.h"
diff --git a/plugins/experimental/multiplexer/original-request.h b/plugins/experimental/multiplexer/original-request.h
index 3814267..3325724 100644
--- a/plugins/experimental/multiplexer/original-request.h
+++ b/plugins/experimental/multiplexer/original-request.h
@@ -23,7 +23,7 @@
#ifndef ORIGINAL_REQUEST_H
#define ORIGINAL_REQUEST_H
-#include <assert.h>
+#include <cassert>
#include <string>
#include <ts/ts.h>
diff --git a/plugins/experimental/multiplexer/ts.h b/plugins/experimental/multiplexer/ts.h
index a9e3d59..a1aa7cf 100644
--- a/plugins/experimental/multiplexer/ts.h
+++ b/plugins/experimental/multiplexer/ts.h
@@ -22,7 +22,7 @@
*/
#ifndef TS_H
#define TS_H
-#include <assert.h>
+#include <cassert>
#include <cstring>
#include <limits>
#include <list>
diff --git a/plugins/experimental/mysql_remap/lib/dictionary.h b/plugins/experimental/mysql_remap/lib/dictionary.h
index 1f784e4..31a9f41 100644
--- a/plugins/experimental/mysql_remap/lib/dictionary.h
+++ b/plugins/experimental/mysql_remap/lib/dictionary.h
@@ -48,9 +48,9 @@
Includes
---------------------------------------------------------------------------*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include <unistd.h>
/*---------------------------------------------------------------------------
diff --git a/plugins/experimental/mysql_remap/lib/iniparser.h b/plugins/experimental/mysql_remap/lib/iniparser.h
index d9bb650..546a41f 100644
--- a/plugins/experimental/mysql_remap/lib/iniparser.h
+++ b/plugins/experimental/mysql_remap/lib/iniparser.h
@@ -42,9 +42,9 @@
Includes
---------------------------------------------------------------------------*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
/*
* The following #include is necessary on many Unixes but not Linux.
diff --git a/plugins/experimental/sslheaders/sslheaders.h b/plugins/experimental/sslheaders/sslheaders.h
index 1a7f7ee..b7b66dd 100644
--- a/plugins/experimental/sslheaders/sslheaders.h
+++ b/plugins/experimental/sslheaders/sslheaders.h
@@ -18,7 +18,7 @@
#include <ts/ts.h>
#include <ts/remap.h>
-#include <string.h>
+#include <cstring>
#include <list>
#include <string>
diff --git a/plugins/experimental/tls_bridge/tls_bridge.cc b/plugins/experimental/tls_bridge/tls_bridge.cc
index 1577f92..2c6d996 100644
--- a/plugins/experimental/tls_bridge/tls_bridge.cc
+++ b/plugins/experimental/tls_bridge/tls_bridge.cc
@@ -19,7 +19,7 @@
#include "ts/ts.h"
#include <atomic>
#include <vector>
-#include <inttypes.h>
+#include <cinttypes>
#include "ts/TextView.h"
#include "regex.h"
diff --git a/plugins/header_rewrite/statement.h b/plugins/header_rewrite/statement.h
index 92384be..83ce00f 100644
--- a/plugins/header_rewrite/statement.h
+++ b/plugins/header_rewrite/statement.h
@@ -23,7 +23,7 @@
#pragma once
#include <string>
-#include <time.h>
+#include <ctime>
#include <vector>
#include "ts/ts.h"
diff --git a/plugins/s3_auth/unit-tests/test_aws_auth_v4.cc b/plugins/s3_auth/unit-tests/test_aws_auth_v4.cc
index a75b6bf..7dd4f60 100644
--- a/plugins/s3_auth/unit-tests/test_aws_auth_v4.cc
+++ b/plugins/s3_auth/unit-tests/test_aws_auth_v4.cc
@@ -21,7 +21,7 @@
* @brief Unit tests for functions implementing S3 auth version 4
*/
-#include <string.h>
+#include <cstring>
#include <openssl/hmac.h> /* EVP_MAX_MD_SIZE */
#define CATCH_CONFIG_MAIN /* include main function */
#include <catch.hpp> /* catch unit-test framework */
diff --git a/plugins/xdebug/xdebug.cc b/plugins/xdebug/xdebug.cc
index 7258a4d..785648d 100644
--- a/plugins/xdebug/xdebug.cc
+++ b/plugins/xdebug/xdebug.cc
@@ -17,7 +17,7 @@
*/
#include <cstdlib>
-#include <stdio.h>
+#include <cstdio>
#include <cstdio>
#include <strings.h>
#include <sstream>
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 4a02a15..40d53dc 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -99,7 +99,7 @@
#include "URL.h"
#ifdef HAVE_CTYPE_H
-#include <ctype.h>
+#include <cctype>
#endif
#define SignalError(_buf, _already) \
diff --git a/proxy/CoreUtils.h b/proxy/CoreUtils.h
index 4f0450d..120aa75 100644
--- a/proxy/CoreUtils.h
+++ b/proxy/CoreUtils.h
@@ -31,12 +31,12 @@
#pragma once
#if defined(linux)
-#include <stdio.h>
+#include <cstdio>
#include <sys/procfs.h>
#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
+#include <cstdlib>
+#include <cstring>
+#include <cassert>
#include <elf.h>
#include "ts/DynArray.h"
diff --git a/proxy/hdrs/HTTP.h b/proxy/hdrs/HTTP.h
index 1d7e107..d229da4 100644
--- a/proxy/hdrs/HTTP.h
+++ b/proxy/hdrs/HTTP.h
@@ -23,7 +23,7 @@
#pragma once
-#include <assert.h>
+#include <cassert>
#include "ts/Arena.h"
#include "ts/CryptoHash.h"
#include "MIME.h"
diff --git a/proxy/hdrs/HdrToken.h b/proxy/hdrs/HdrToken.h
index 0489417..acaa1a0 100644
--- a/proxy/hdrs/HdrToken.h
+++ b/proxy/hdrs/HdrToken.h
@@ -23,7 +23,7 @@
#pragma once
-#include <assert.h>
+#include <cassert>
#include <sys/types.h>
#include "ts/ink_assert.h"
#include "ts/ink_atomic.h"
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 833034c..8411fc6 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -33,12 +33,12 @@
****************************************************************************/
#pragma once
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
#include <bitset>
#ifdef HAVE_CTYPE_H
-#include <ctype.h>
+#include <cctype>
#endif
#include "ts/ink_platform.h"
diff --git a/proxy/http2/HuffmanCodec.h b/proxy/http2/HuffmanCodec.h
index 1d05ad9..2c4644c 100644
--- a/proxy/http2/HuffmanCodec.h
+++ b/proxy/http2/HuffmanCodec.h
@@ -23,8 +23,8 @@
#pragma once
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
void hpack_huffman_init();
void hpack_huffman_fin();
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index 297d798..cdf0e56 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -51,7 +51,7 @@
#pragma once
-#include <stdarg.h>
+#include <cstdarg>
#include "ts/ink_platform.h"
#include "ts/EventNotify.h"
#include "ts/ink_hash_table.h"
diff --git a/proxy/logging/LogFieldAliasMap.h b/proxy/logging/LogFieldAliasMap.h
index 271df7c..45a464b 100644
--- a/proxy/logging/LogFieldAliasMap.h
+++ b/proxy/logging/LogFieldAliasMap.h
@@ -28,8 +28,8 @@
#pragma once
-#include <stdarg.h>
-#include <string.h>
+#include <cstdarg>
+#include <cstring>
#include "ts/ink_platform.h"
#include "ts/Ptr.h"
diff --git a/proxy/logging/LogFile.h b/proxy/logging/LogFile.h
index 9424a4d..1b72d6a 100644
--- a/proxy/logging/LogFile.h
+++ b/proxy/logging/LogFile.h
@@ -23,8 +23,8 @@
#pragma once
-#include <stdarg.h>
-#include <stdio.h>
+#include <cstdarg>
+#include <cstdio>
#include "ts/ink_platform.h"
#include "LogBufferSink.h"
diff --git a/proxy/logging/LogUtils.h b/proxy/logging/LogUtils.h
index e8814a8..7d7be5f 100644
--- a/proxy/logging/LogUtils.h
+++ b/proxy/logging/LogUtils.h
@@ -22,7 +22,7 @@
*/
#pragma once
-#include "time.h"
+#include <ctime>
#include "ts/ink_platform.h"
#include "ts/Arena.h"
--
To stop receiving notification emails like this one, please contact
bcall@apache.org.