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 2023/09/27 16:24:05 UTC
[trafficserver] branch master updated: Ran clang-tidy over the example plugins (#10532)
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 60672a746c Ran clang-tidy over the example plugins (#10532)
60672a746c is described below
commit 60672a746ce4eec3201681b3f704a331914f3411
Author: Bryan Call <bc...@apache.org>
AuthorDate: Wed Sep 27 09:23:59 2023 -0700
Ran clang-tidy over the example plugins (#10532)
---
example/plugins/c-api/add_header/add_header.cc | 10 ++---
.../c-api/append_transform/append_transform.cc | 14 +++---
example/plugins/c-api/basic_auth/basic_auth.cc | 12 ++---
.../c-api/bnull_transform/bnull_transform.cc | 14 +++---
example/plugins/c-api/denylist_0/denylist_0.cc | 8 ++--
example/plugins/c-api/denylist_1/denylist_1.cc | 27 ++++++-----
example/plugins/c-api/file_1/file_1.cc | 2 +-
example/plugins/c-api/hello/hello.cc | 2 +-
.../c-api/lifecycle_plugin/lifecycle_plugin.cc | 6 +--
.../plugins/c-api/null_transform/null_transform.cc | 12 ++---
.../plugins/c-api/output_header/output_header.cc | 8 ++--
example/plugins/c-api/protocol/Protocol.cc | 4 +-
example/plugins/c-api/protocol/TxnSM.cc | 52 +++++++++++-----------
example/plugins/c-api/protocol/TxnSM.h | 7 ++-
example/plugins/c-api/query_remap/query_remap.cc | 28 ++++++------
example/plugins/c-api/redirect_1/redirect_1.cc | 8 ++--
.../plugins/c-api/replace_header/replace_header.cc | 8 ++--
.../plugins/c-api/request_buffer/request_buffer.cc | 16 +++----
.../c-api/response_header_1/response_header_1.cc | 10 ++---
example/plugins/c-api/secure_link/secure_link.cc | 18 ++++----
example/plugins/c-api/server_push/server_push.cc | 12 ++---
.../c-api/server_transform/server_transform.cc | 28 ++++++------
.../plugins/c-api/session_hooks/session_hooks.cc | 6 +--
example/plugins/c-api/thread_1/thread_1.cc | 6 +--
example/plugins/c-api/thread_pool/psi.cc | 34 +++++++-------
example/plugins/c-api/thread_pool/thread.cc | 2 +-
example/plugins/c-api/thread_pool/thread.h | 17 ++++---
example/plugins/c-api/version/version.cc | 2 +-
28 files changed, 185 insertions(+), 188 deletions(-)
diff --git a/example/plugins/c-api/add_header/add_header.cc b/example/plugins/c-api/add_header/add_header.cc
index 993a856afc..151a6ce161 100644
--- a/example/plugins/c-api/add_header/add_header.cc
+++ b/example/plugins/c-api/add_header/add_header.cc
@@ -32,9 +32,9 @@
* ith MIME header to be added to the client request
*/
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -108,7 +108,7 @@ done:
static int
add_header_plugin(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_REQUEST_HDR:
@@ -138,7 +138,7 @@ TSPluginInit(int argc, const char *argv[])
}
if (argc < 2) {
- TSError("[%s] Usage: %s \"name1: value1\" \"name2: value2\" ...>", PLUGIN_NAME, argv[0]);
+ TSError(R"([%s] Usage: %s "name1: value1" "name2: value2" ...>)", PLUGIN_NAME, argv[0]);
goto error;
}
diff --git a/example/plugins/c-api/append_transform/append_transform.cc b/example/plugins/c-api/append_transform/append_transform.cc
index 90c772d91d..929cbad3ad 100644
--- a/example/plugins/c-api/append_transform/append_transform.cc
+++ b/example/plugins/c-api/append_transform/append_transform.cc
@@ -36,9 +36,9 @@
*
*/
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
+#include <climits>
+#include <cstdio>
+#include <cstring>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -47,12 +47,12 @@
#define ASSERT_SUCCESS(_x) TSAssert((_x) == TS_SUCCESS)
-typedef struct {
+struct MyData {
TSVIO output_vio;
TSIOBuffer output_buffer;
TSIOBufferReader output_reader;
int append_needed;
-} MyData;
+};
static TSIOBuffer append_buffer;
static TSIOBufferReader append_buffer_reader;
@@ -63,7 +63,7 @@ my_data_alloc()
{
MyData *data;
- data = (MyData *)TSmalloc(sizeof(MyData));
+ data = static_cast<MyData *>(TSmalloc(sizeof(MyData)));
TSReleaseAssert(data);
data->output_vio = nullptr;
@@ -291,7 +291,7 @@ transform_add(TSHttpTxn txnp)
static int
transform_plugin(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_RESPONSE_HDR:
diff --git a/example/plugins/c-api/basic_auth/basic_auth.cc b/example/plugins/c-api/basic_auth/basic_auth.cc
index 581cf5d0e5..2cb92eb86c 100644
--- a/example/plugins/c-api/basic_auth/basic_auth.cc
+++ b/example/plugins/c-api/basic_auth/basic_auth.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <unistd.h>
@@ -46,7 +46,7 @@ base64_decode(const char *input)
;
}
- output = obuf = (char *)TSmalloc((len * 6) / 8 + 3);
+ output = obuf = static_cast<char *>(TSmalloc((len * 6) / 8 + 3));
while (len > 0) {
*output++ = decode(0) << 2 | decode(1) >> 4;
@@ -193,7 +193,7 @@ done:
static int
auth_plugin(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_OS_DNS:
@@ -236,8 +236,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
for (i = '0'; i <= '9'; i++) {
base64_codes[i] = cc++;
}
- base64_codes[unsigned('+')] = cc++;
- base64_codes[unsigned('/')] = cc++;
+ base64_codes[static_cast<unsigned>('+')] = cc++;
+ base64_codes[static_cast<unsigned>('/')] = cc++;
TSHttpHookAdd(TS_HTTP_OS_DNS_HOOK, TSContCreate(auth_plugin, nullptr));
}
diff --git a/example/plugins/c-api/bnull_transform/bnull_transform.cc b/example/plugins/c-api/bnull_transform/bnull_transform.cc
index 02def68ff8..d1e86e7a0e 100644
--- a/example/plugins/c-api/bnull_transform/bnull_transform.cc
+++ b/example/plugins/c-api/bnull_transform/bnull_transform.cc
@@ -34,7 +34,7 @@
/* set tab stops to four. */
-#include <stdio.h>
+#include <cstdio>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -45,19 +45,19 @@
#define STATE_BUFFER_DATA 0
#define STATE_OUTPUT_DATA 1
-typedef struct {
+struct MyData {
int state;
TSVIO output_vio;
TSIOBuffer output_buffer;
TSIOBufferReader output_reader;
-} MyData;
+};
static MyData *
my_data_alloc()
{
MyData *data;
- data = (MyData *)TSmalloc(sizeof(MyData));
+ data = static_cast<MyData *>(TSmalloc(sizeof(MyData)));
data->state = STATE_BUFFER_DATA;
data->output_vio = nullptr;
data->output_buffer = nullptr;
@@ -182,7 +182,7 @@ handle_transform(TSCont contp)
private data structure pointer is null, then we'll create it
and initialize its internals. */
- data = (MyData *)TSContDataGet(contp);
+ data = static_cast<MyData *>(TSContDataGet(contp));
if (!data) {
data = my_data_alloc();
TSContDataSet(contp, data);
@@ -210,7 +210,7 @@ bnull_transform(TSCont contp, TSEvent event, void *edata ATS_UNUSED)
call to TSVConnClose. */
if (TSVConnClosedGet(contp)) {
- my_data_destroy((MyData *)TSContDataGet(contp));
+ my_data_destroy(static_cast<MyData *>(TSContDataGet(contp)));
TSContDestroy(contp);
} else {
switch (event) {
@@ -282,7 +282,7 @@ transform_add(TSHttpTxn txnp)
static int
transform_plugin(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_RESPONSE_HDR:
diff --git a/example/plugins/c-api/denylist_0/denylist_0.cc b/example/plugins/c-api/denylist_0/denylist_0.cc
index da9e7a0c58..121bd35eb3 100644
--- a/example/plugins/c-api/denylist_0/denylist_0.cc
+++ b/example/plugins/c-api/denylist_0/denylist_0.cc
@@ -30,8 +30,8 @@
*
*/
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <ts/ts.h>
#define PLUGIN_NAME "denylist_0"
@@ -132,7 +132,7 @@ done:
static int
denylist_plugin(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_OS_DNS:
@@ -162,7 +162,7 @@ TSPluginInit(int argc, const char *argv[])
nsites = argc - 1;
if (nsites > 0) {
- sites = (char **)TSmalloc(sizeof(char *) * nsites);
+ sites = static_cast<char **>(TSmalloc(sizeof(char *) * nsites));
for (int i = 0; i < nsites; i++) {
sites[i] = TSstrdup(argv[i + 1]);
diff --git a/example/plugins/c-api/denylist_1/denylist_1.cc b/example/plugins/c-api/denylist_1/denylist_1.cc
index 7e20f31439..5c1f74fc80 100644
--- a/example/plugins/c-api/denylist_1/denylist_1.cc
+++ b/example/plugins/c-api/denylist_1/denylist_1.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -47,19 +47,18 @@ enum calling_func {
READ_BLOCKLIST,
};
-typedef struct contp_data {
+struct cdata {
calling_func cf;
TSHttpTxn txnp;
-
-} cdata;
+};
static void
destroy_continuation(TSHttpTxn txnp, TSCont contp)
{
cdata *cd = nullptr;
- cd = (cdata *)TSContDataGet(contp);
+ cd = static_cast<cdata *>(TSContDataGet(contp));
if (cd != nullptr) {
TSfree(cd);
}
@@ -162,7 +161,7 @@ handle_response(TSHttpTxn txnp, TSCont contp ATS_UNUSED)
goto done;
}
- buf = (char *)TSmalloc(4096);
+ buf = static_cast<char *>(TSmalloc(4096));
url_str = TSUrlStringGet(bufp, url_loc, &url_length);
snprintf(buf, 4096, "You are forbidden from accessing \"%s\"\n", url_str);
@@ -233,12 +232,12 @@ denylist_plugin(TSCont contp, TSEvent event, void *edata)
switch (event) {
case TS_EVENT_HTTP_TXN_START:
- txnp = (TSHttpTxn)edata;
+ txnp = static_cast<TSHttpTxn>(edata);
handle_txn_start(contp, txnp);
return 0;
case TS_EVENT_HTTP_OS_DNS:
if (contp != global_contp) {
- cd = (cdata *)TSContDataGet(contp);
+ cd = static_cast<cdata *>(TSContDataGet(contp));
cd->cf = HANDLE_DNS;
handle_dns(cd->txnp, contp);
return 0;
@@ -246,14 +245,14 @@ denylist_plugin(TSCont contp, TSEvent event, void *edata)
break;
}
case TS_EVENT_HTTP_TXN_CLOSE:
- txnp = (TSHttpTxn)edata;
+ txnp = static_cast<TSHttpTxn>(edata);
if (contp != global_contp) {
destroy_continuation(txnp, contp);
}
break;
case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
if (contp != global_contp) {
- cd = (cdata *)TSContDataGet(contp);
+ cd = static_cast<cdata *>(TSContDataGet(contp));
cd->cf = HANDLE_RESPONSE;
handle_response(cd->txnp, contp);
return 0;
@@ -266,7 +265,7 @@ denylist_plugin(TSCont contp, TSEvent event, void *edata)
edata. We need to decide, in which function did the MutexLock
failed and call that function again */
if (contp != global_contp) {
- cd = (cdata *)TSContDataGet(contp);
+ cd = static_cast<cdata *>(TSContDataGet(contp));
switch (cd->cf) {
case HANDLE_DNS:
handle_dns(cd->txnp, contp);
@@ -294,9 +293,9 @@ handle_txn_start(TSCont contp ATS_UNUSED, TSHttpTxn txnp)
TSCont txn_contp;
cdata *cd;
- txn_contp = TSContCreate((TSEventFunc)denylist_plugin, TSMutexCreate());
+ txn_contp = TSContCreate(static_cast<TSEventFunc>(denylist_plugin), TSMutexCreate());
/* create the data that'll be associated with the continuation */
- cd = (cdata *)TSmalloc(sizeof(cdata));
+ cd = static_cast<cdata *>(TSmalloc(sizeof(cdata)));
TSContDataSet(txn_contp, cd);
cd->txnp = txnp;
diff --git a/example/plugins/c-api/file_1/file_1.cc b/example/plugins/c-api/file_1/file_1.cc
index dc9357f39a..8cb6a27f92 100644
--- a/example/plugins/c-api/file_1/file_1.cc
+++ b/example/plugins/c-api/file_1/file_1.cc
@@ -33,7 +33,7 @@
*
*/
-#include <stdio.h>
+#include <cstdio>
#include <ts/ts.h>
#define PLUGIN_NAME "file_1"
diff --git a/example/plugins/c-api/hello/hello.cc b/example/plugins/c-api/hello/hello.cc
index f61f72fce8..340c804bf3 100644
--- a/example/plugins/c-api/hello/hello.cc
+++ b/example/plugins/c-api/hello/hello.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include <stdio.h>
+#include <cstdio>
#include "ts/ts.h"
diff --git a/example/plugins/c-api/lifecycle_plugin/lifecycle_plugin.cc b/example/plugins/c-api/lifecycle_plugin/lifecycle_plugin.cc
index 734eee68cc..8d14a24993 100644
--- a/example/plugins/c-api/lifecycle_plugin/lifecycle_plugin.cc
+++ b/example/plugins/c-api/lifecycle_plugin/lifecycle_plugin.cc
@@ -25,9 +25,9 @@
* of response body content
*/
-#include <stdio.h>
+#include <cstdio>
#include <unistd.h>
-#include <inttypes.h>
+#include <cinttypes>
#include <ts/ts.h>
#define PLUGIN_NAME "lifecycle"
@@ -51,7 +51,7 @@ CallbackHandler(TSCont, TSEvent id, void *data)
Dbg(dbg_ctl, "Cache ready");
break;
case TS_EVENT_LIFECYCLE_MSG: {
- TSPluginMsg *msg = (TSPluginMsg *)data;
+ TSPluginMsg *msg = static_cast<TSPluginMsg *>(data);
Dbg(dbg_ctl, "Message to '%s' - %zu bytes of data", msg->tag, msg->data_size);
if (msg->data_size == 0) {
Dbg(dbg_ctl, "Message data is not available");
diff --git a/example/plugins/c-api/null_transform/null_transform.cc b/example/plugins/c-api/null_transform/null_transform.cc
index 9039f4da8e..00e9929bd1 100644
--- a/example/plugins/c-api/null_transform/null_transform.cc
+++ b/example/plugins/c-api/null_transform/null_transform.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include <stdio.h>
+#include <cstdio>
#include <unistd.h>
-#include <inttypes.h>
+#include <cinttypes>
#include "ts/ts.h"
@@ -34,18 +34,18 @@ namespace
DbgCtl dbg_ctl{PLUGIN_NAME};
}
-typedef struct {
+struct MyData {
TSVIO output_vio;
TSIOBuffer output_buffer;
TSIOBufferReader output_reader;
-} MyData;
+};
static MyData *
my_data_alloc()
{
MyData *data;
- data = (MyData *)TSmalloc(sizeof(MyData));
+ data = static_cast<MyData *>(TSmalloc(sizeof(MyData)));
data->output_vio = nullptr;
data->output_buffer = nullptr;
data->output_reader = nullptr;
@@ -279,7 +279,7 @@ transform_add(TSHttpTxn txnp)
static int
transform_plugin(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
Dbg(dbg_ctl, "Entering transform_plugin()");
switch (event) {
diff --git a/example/plugins/c-api/output_header/output_header.cc b/example/plugins/c-api/output_header/output_header.cc
index a9a3599980..a442d0d1b1 100644
--- a/example/plugins/c-api/output_header/output_header.cc
+++ b/example/plugins/c-api/output_header/output_header.cc
@@ -31,8 +31,8 @@
* Note: tested on Solaris only.
*/
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <unistd.h>
#include "ts/ts.h"
@@ -89,7 +89,7 @@ handle_dns(TSHttpTxn txnp, TSCont contp ATS_UNUSED)
/* Allocate the string with an extra byte for the string
terminator */
- output_string = (char *)TSmalloc(total_avail + 1);
+ output_string = static_cast<char *>(TSmalloc(total_avail + 1));
output_len = 0;
/* We need to loop over all the buffer blocks to make
@@ -140,7 +140,7 @@ done:
static int
hdr_plugin(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_OS_DNS:
diff --git a/example/plugins/c-api/protocol/Protocol.cc b/example/plugins/c-api/protocol/Protocol.cc
index ab3fb9e5b5..ebe69af71e 100644
--- a/example/plugins/c-api/protocol/Protocol.cc
+++ b/example/plugins/c-api/protocol/Protocol.cc
@@ -24,7 +24,7 @@
#include "Protocol.h"
#include "TxnSM.h"
#include "tscore/ink_defs.h"
-#include <math.h>
+#include <cmath>
#define RETRY_TIME 10
@@ -57,7 +57,7 @@ accept_handler(TSCont contp, TSEvent event, void *edata)
/* Create a new mutex for the TxnSM, which is going
to handle the incoming request. */
pmutex = TSMutexCreate();
- txn_sm = TxnSMCreate(pmutex, (TSVConn)edata, server_port);
+ txn_sm = TxnSMCreate(pmutex, static_cast<TSVConn>(edata), server_port);
/* This is no reason for not grabbing the lock.
So skip the routine which handle LockTry failure case. */
diff --git a/example/plugins/c-api/protocol/TxnSM.cc b/example/plugins/c-api/protocol/TxnSM.cc
index dd923d3e49..ef4ce6136d 100644
--- a/example/plugins/c-api/protocol/TxnSM.cc
+++ b/example/plugins/c-api/protocol/TxnSM.cc
@@ -72,7 +72,7 @@ TSCacheKey CacheKeyCreate(char *file_name);
int
main_handler(TSCont contp, TSEvent event, void *data)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
TxnSMHandler q_current_handler = txn_sm->q_current_handler;
Dbg(dbg_ctl, "main_handler (contp %p event %d)", contp, event);
@@ -82,7 +82,7 @@ main_handler(TSCont contp, TSEvent event, void *data)
return prepare_to_die(contp);
}
- if (q_current_handler != (TxnSMHandler)&state_interface_with_server) {
+ if (q_current_handler != reinterpret_cast<TxnSMHandler>(&state_interface_with_server)) {
if (event == TS_EVENT_VCONN_EOS) {
return prepare_to_die(contp);
}
@@ -100,7 +100,7 @@ TxnSMCreate(TSMutex pmutex, TSVConn client_vc, int server_port)
TSCont contp;
TxnSM *txn_sm;
- txn_sm = (TxnSM *)TSmalloc(sizeof(TxnSM));
+ txn_sm = static_cast<TxnSM *>(TSmalloc(sizeof(TxnSM)));
txn_sm->q_mutex = pmutex;
txn_sm->q_pending_action = nullptr;
@@ -126,7 +126,7 @@ TxnSMCreate(TSMutex pmutex, TSVConn client_vc, int server_port)
txn_sm->q_server_request_buffer_reader = nullptr;
/* Char buffers to store client request and server response. */
- txn_sm->q_client_request = (char *)TSmalloc(sizeof(char) * (MAX_REQUEST_LENGTH + 1));
+ txn_sm->q_client_request = static_cast<char *>(TSmalloc(sizeof(char) * (MAX_REQUEST_LENGTH + 1)));
memset(txn_sm->q_client_request, '\0', (sizeof(char) * (MAX_REQUEST_LENGTH + 1)));
txn_sm->q_server_response = nullptr;
txn_sm->q_server_response_length = 0;
@@ -136,8 +136,8 @@ TxnSMCreate(TSMutex pmutex, TSVConn client_vc, int server_port)
txn_sm->q_cache_read_buffer = nullptr;
txn_sm->q_cache_read_buffer_reader = nullptr;
- txn_sm->q_server_name = (char *)TSmalloc(sizeof(char) * (MAX_SERVER_NAME_LENGTH + 1));
- txn_sm->q_file_name = (char *)TSmalloc(sizeof(char) * (MAX_FILE_NAME_LENGTH + 1));
+ txn_sm->q_server_name = static_cast<char *>(TSmalloc(sizeof(char) * (MAX_SERVER_NAME_LENGTH + 1)));
+ txn_sm->q_file_name = static_cast<char *>(TSmalloc(sizeof(char) * (MAX_FILE_NAME_LENGTH + 1)));
txn_sm->q_key = nullptr;
txn_sm->q_magic = TXN_SM_ALIVE;
@@ -154,7 +154,7 @@ TxnSMCreate(TSMutex pmutex, TSVConn client_vc, int server_port)
int
state_start(TSCont contp, TSEvent event ATS_UNUSED, void *data ATS_UNUSED)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
if (!txn_sm->q_client_vc) {
return prepare_to_die(contp);
@@ -190,7 +190,7 @@ state_start(TSCont contp, TSEvent event ATS_UNUSED, void *data ATS_UNUSED)
int
state_interface_with_client(TSCont contp, TSEvent event, TSVIO vio)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_interface_with_client");
@@ -211,7 +211,7 @@ state_read_request_from_client(TSCont contp, TSEvent event, TSVIO vio ATS_UNUSED
{
int bytes_read;
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_read_request_from_client");
@@ -226,7 +226,7 @@ state_read_request_from_client(TSCont contp, TSEvent event, TSVIO vio ATS_UNUSED
/* Check if the request is fully read, if so, do cache lookup. */
if (strstr(txn_sm->q_client_request, "\r\n\r\n") != nullptr) {
- temp_buf = (char *)TSmalloc(sizeof(char) * (strlen(txn_sm->q_client_request) + 1));
+ temp_buf = static_cast<char *>(TSmalloc(sizeof(char) * (strlen(txn_sm->q_client_request) + 1)));
memcpy(temp_buf, txn_sm->q_client_request, strlen(txn_sm->q_client_request));
temp_buf[strlen(txn_sm->q_client_request)] = '\0';
@@ -264,7 +264,7 @@ state_read_request_from_client(TSCont contp, TSEvent event, TSVIO vio ATS_UNUSED
int
state_handle_cache_lookup(TSCont contp, TSEvent event, TSVConn vc)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
int64_t response_size;
int ret_val;
@@ -361,7 +361,7 @@ load_buffer_cache_data(TxnSM *txn_sm)
int
state_handle_cache_read_response(TSCont contp, TSEvent event, TSVIO vio ATS_UNUSED)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_handle_cache_read_response");
@@ -411,7 +411,7 @@ state_handle_cache_read_response(TSCont contp, TSEvent event, TSVIO vio ATS_UNUS
int
state_handle_cache_prepare_for_write(TSCont contp, TSEvent event, TSVConn vc)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_handle_cache_prepare_for_write");
@@ -435,7 +435,7 @@ state_handle_cache_prepare_for_write(TSCont contp, TSEvent event, TSVConn vc)
int
state_build_and_send_request(TSCont contp, TSEvent event ATS_UNUSED, void *data ATS_UNUSED)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_build_and_send_request");
@@ -476,7 +476,7 @@ state_build_and_send_request(TSCont contp, TSEvent event ATS_UNUSED, void *data
int
state_dns_lookup(TSCont contp, TSEvent event, TSHostLookupResult host_info)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_dns_lookup");
@@ -509,7 +509,7 @@ state_dns_lookup(TSCont contp, TSEvent event, TSHostLookupResult host_info)
int
state_connect_to_server(TSCont contp, TSEvent event, TSVConn vc)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_connect_to_server");
@@ -535,7 +535,7 @@ state_connect_to_server(TSCont contp, TSEvent event, TSVConn vc)
int
state_send_request_to_server(TSCont contp, TSEvent event, TSVIO vio)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_send_request_to_server");
@@ -560,7 +560,7 @@ state_send_request_to_server(TSCont contp, TSEvent event, TSVIO vio)
int
state_interface_with_server(TSCont contp, TSEvent event, TSVIO vio)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_interface_with_server");
@@ -641,7 +641,7 @@ state_interface_with_server(TSCont contp, TSEvent event, TSVIO vio)
int
state_read_response_from_server(TSCont contp, TSEvent event ATS_UNUSED, TSVIO vio ATS_UNUSED)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
int bytes_read = 0;
Dbg(dbg_ctl, "enter state_read_response_from_server");
@@ -677,7 +677,7 @@ state_read_response_from_server(TSCont contp, TSEvent event ATS_UNUSED, TSVIO vi
int
state_write_to_cache(TSCont contp, TSEvent event, TSVIO vio)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_write_to_cache");
@@ -735,7 +735,7 @@ state_write_to_cache(TSCont contp, TSEvent event, TSVIO vio)
int
state_send_response_to_client(TSCont contp, TSEvent event, TSVIO vio)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_send_response_to_client");
@@ -774,7 +774,7 @@ state_send_response_to_client(TSCont contp, TSEvent event, TSVIO vio)
int
prepare_to_die(TSCont contp)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter prepare_to_die");
if (txn_sm->q_client_vc) {
@@ -804,7 +804,7 @@ prepare_to_die(TSCont contp)
int
state_done(TSCont contp, TSEvent event ATS_UNUSED, TSVIO vio ATS_UNUSED)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
Dbg(dbg_ctl, "enter state_done");
@@ -900,7 +900,7 @@ send_response_to_client(TSCont contp)
Dbg(dbg_ctl, "enter send_response_to_client");
- txn_sm = (TxnSM *)TSContDataGet(contp);
+ txn_sm = static_cast<TxnSM *>(TSContDataGet(contp));
response_len = TSIOBufferReaderAvail(txn_sm->q_client_response_buffer_reader);
Dbg(dbg_ctl, " . resp_len is %d", response_len);
@@ -925,7 +925,7 @@ get_info_from_buffer(TSIOBufferReader the_reader)
read_avail = TSIOBufferReaderAvail(the_reader);
- info = (char *)TSmalloc(sizeof(char) * read_avail);
+ info = static_cast<char *>(TSmalloc(sizeof(char) * read_avail));
if (info == nullptr) {
return nullptr;
}
@@ -934,7 +934,7 @@ get_info_from_buffer(TSIOBufferReader the_reader)
/* Read the data out of the reader */
while (read_avail > 0) {
TSIOBufferBlock blk = TSIOBufferReaderStart(the_reader);
- char *buf = (char *)TSIOBufferBlockReadStart(blk, the_reader, &read_done);
+ char *buf = const_cast<char *>(TSIOBufferBlockReadStart(blk, the_reader, &read_done));
memcpy(info, buf, read_done);
if (read_done > 0) {
TSIOBufferReaderConsume(the_reader, read_done);
diff --git a/example/plugins/c-api/protocol/TxnSM.h b/example/plugins/c-api/protocol/TxnSM.h
index d74de56fee..9e81647b03 100644
--- a/example/plugins/c-api/protocol/TxnSM.h
+++ b/example/plugins/c-api/protocol/TxnSM.h
@@ -25,7 +25,7 @@
#include "Protocol.h"
-typedef int (*TxnSMHandler)(TSCont contp, TSEvent event, void *data);
+using TxnSMHandler = int (*)(TSCont, TSEvent, void *);
TSCont TxnSMCreate(TSMutex pmutex, TSVConn client_vc, int server_port);
@@ -34,7 +34,7 @@ TSCont TxnSMCreate(TSMutex pmutex, TSVConn client_vc, int server_port);
#define TXN_SM_ZERO 0x00001111
/* The Txn State Machine */
-typedef struct _TxnSM {
+struct TxnSM {
unsigned int q_magic;
TSMutex q_mutex;
@@ -76,5 +76,4 @@ typedef struct _TxnSM {
TSVIO q_cache_write_vio;
TSIOBuffer q_cache_read_buffer;
TSIOBufferReader q_cache_read_buffer_reader;
-
-} TxnSM;
+};
diff --git a/example/plugins/c-api/query_remap/query_remap.cc b/example/plugins/c-api/query_remap/query_remap.cc
index 3d43a4f75d..8e195d2bec 100644
--- a/example/plugins/c-api/query_remap/query_remap.cc
+++ b/example/plugins/c-api/query_remap/query_remap.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdint>
#include "ts/ts.h"
#include "ts/remap.h"
@@ -39,12 +39,12 @@ DbgCtl dbg_ctl{PLUGIN_NAME};
/* function prototypes */
uint32_t hash_fnv32(char *buf, size_t len);
-typedef struct _query_remap_info {
+struct query_remap_info {
char *param_name;
size_t param_len;
char **hosts;
int num_hosts;
-} query_remap_info;
+};
TSReturnCode
TSRemapInit(TSRemapInterface *api_info ATS_UNUSED, char *errbuf ATS_UNUSED, int errbuf_size ATS_UNUSED)
@@ -73,12 +73,12 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf ATS_UNUSED, i
2: query param to hash
3,4,... : server hostnames
*/
- query_remap_info *qri = (query_remap_info *)TSmalloc(sizeof(query_remap_info));
+ query_remap_info *qri = static_cast<query_remap_info *>(TSmalloc(sizeof(query_remap_info)));
qri->param_name = TSstrdup(argv[2]);
qri->param_len = strlen(qri->param_name);
qri->num_hosts = argc - 3;
- qri->hosts = (char **)TSmalloc(qri->num_hosts * sizeof(char *));
+ qri->hosts = static_cast<char **>(TSmalloc(qri->num_hosts * sizeof(char *)));
Dbg(dbg_ctl, " - Hash using query parameter [%s] with %d hosts", qri->param_name, qri->num_hosts);
@@ -99,7 +99,7 @@ TSRemapDeleteInstance(void *ih)
Dbg(dbg_ctl, "deleting instance %p", ih);
if (ih) {
- query_remap_info *qri = (query_remap_info *)ih;
+ query_remap_info *qri = static_cast<query_remap_info *>(ih);
if (qri->param_name) {
TSfree(qri->param_name);
}
@@ -116,7 +116,7 @@ TSRemapDeleteInstance(void *ih)
TSRemapStatus
TSRemapDoRemap(void *ih, TSHttpTxn rh ATS_UNUSED, TSRemapRequestInfo *rri)
{
- query_remap_info *qri = (query_remap_info *)ih;
+ query_remap_info *qri = static_cast<query_remap_info *>(ih);
if (!qri || !rri) {
TSError("[%s] null private data or RRI", PLUGIN_NAME);
@@ -137,11 +137,11 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh ATS_UNUSED, TSRemapRequestInfo *rri)
/* parse query parameters */
for (key = strtok_r(q, "&", &s); key != nullptr;) {
char *val = strchr(key, '=');
- if (val && (size_t)(val - key) == qri->param_len && !strncmp(key, qri->param_name, qri->param_len)) {
+ if (val && static_cast<size_t>(val - key) == qri->param_len && !strncmp(key, qri->param_name, qri->param_len)) {
++val;
/* the param key matched the configured param_name
hash the param value to pick a host */
- hostidx = hash_fnv32(val, strlen(val)) % (uint32_t)qri->num_hosts;
+ hostidx = hash_fnv32(val, strlen(val)) % static_cast<uint32_t>(qri->num_hosts);
Dbg(dbg_ctl, "modifying host based on %s", key);
break;
}
@@ -174,11 +174,11 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh ATS_UNUSED, TSRemapRequestInfo *rri)
uint32_t
hash_fnv32(char *buf, size_t len)
{
- uint32_t hval = (uint32_t)0x811c9dc5; /* FNV1_32_INIT */
+ uint32_t hval = static_cast<uint32_t>(0x811c9dc5); /* FNV1_32_INIT */
for (; len > 0; --len) {
- hval *= (uint32_t)0x01000193; /* FNV_32_PRIME */
- hval ^= (uint32_t)*buf++;
+ hval *= static_cast<uint32_t>(0x01000193); /* FNV_32_PRIME */
+ hval ^= static_cast<uint32_t>(*buf++);
}
return hval;
diff --git a/example/plugins/c-api/redirect_1/redirect_1.cc b/example/plugins/c-api/redirect_1/redirect_1.cc
index c7b435ad9d..094b19a45c 100644
--- a/example/plugins/c-api/redirect_1/redirect_1.cc
+++ b/example/plugins/c-api/redirect_1/redirect_1.cc
@@ -32,8 +32,8 @@
*
*/
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <unistd.h>
#include <netinet/in.h>
@@ -216,7 +216,7 @@ done:
static int
redirect_plugin(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_REQUEST_HDR:
@@ -241,7 +241,7 @@ redirect_plugin(TSCont contp, TSEvent event, void *edata)
*/
void
-init_stats(void)
+init_stats()
{
/* noncoupled: */
redirect_count_connect =
diff --git a/example/plugins/c-api/replace_header/replace_header.cc b/example/plugins/c-api/replace_header/replace_header.cc
index 8da7a0dfea..75184c20de 100644
--- a/example/plugins/c-api/replace_header/replace_header.cc
+++ b/example/plugins/c-api/replace_header/replace_header.cc
@@ -32,9 +32,9 @@
*
*
*/
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -83,7 +83,7 @@ done:
static int
replace_header_plugin(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_RESPONSE_HDR:
diff --git a/example/plugins/c-api/request_buffer/request_buffer.cc b/example/plugins/c-api/request_buffer/request_buffer.cc
index cf6cc3b560..8ebb60c923 100644
--- a/example/plugins/c-api/request_buffer/request_buffer.cc
+++ b/example/plugins/c-api/request_buffer/request_buffer.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include "ts/ts.h"
#include "tscore/ink_assert.h"
@@ -49,7 +49,7 @@ request_body_get(TSHttpTxn txnp, int *len)
return nullptr;
}
- ret = (char *)TSmalloc(sizeof(char) * read_avail);
+ ret = static_cast<char *>(TSmalloc(sizeof(char) * read_avail));
int64_t consumed = 0;
int64_t data_len = 0;
@@ -63,7 +63,7 @@ request_body_get(TSHttpTxn txnp, int *len)
}
TSIOBufferReaderFree(post_buffer_reader);
- *len = (int)consumed;
+ *len = static_cast<int>(consumed);
return ret;
}
@@ -71,7 +71,7 @@ static int
request_buffer_plugin(TSCont contp, TSEvent event, void *edata)
{
Dbg(dbg_ctl, "request_buffer_plugin starting, event[%d]", event);
- TSHttpTxn txnp = (TSHttpTxn)(edata);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
if (event == TS_EVENT_HTTP_REQUEST_BUFFER_READ_COMPLETE) {
int len = 0;
char *body = request_body_get(txnp, &len);
@@ -96,7 +96,7 @@ is_post_request(TSHttpTxn txnp)
}
int method_len = 0;
const char *method = TSHttpHdrMethodGet(req_bufp, req_loc, &method_len);
- if (method_len != (int)strlen(TS_HTTP_METHOD_POST) || strncasecmp(method, TS_HTTP_METHOD_POST, method_len) != 0) {
+ if (method_len != static_cast<int>(strlen(TS_HTTP_METHOD_POST)) || strncasecmp(method, TS_HTTP_METHOD_POST, method_len) != 0) {
TSHandleMLocRelease(req_bufp, TS_NULL_MLOC, req_loc);
return false;
}
@@ -108,7 +108,7 @@ static int
global_plugin(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
{
Dbg(dbg_ctl, "transform_plugin starting");
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_REQUEST_HDR:
diff --git a/example/plugins/c-api/response_header_1/response_header_1.cc b/example/plugins/c-api/response_header_1/response_header_1.cc
index 04ef565641..5cdcb3db1e 100644
--- a/example/plugins/c-api/response_header_1/response_header_1.cc
+++ b/example/plugins/c-api/response_header_1/response_header_1.cc
@@ -36,10 +36,10 @@
limitations under the License.
*/
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+#include <ctime>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -206,7 +206,7 @@ modify_header(TSHttpTxn txnp)
static int
modify_response_header_plugin(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_RESPONSE_HDR:
diff --git a/example/plugins/c-api/secure_link/secure_link.cc b/example/plugins/c-api/secure_link/secure_link.cc
index 31351bb761..baa1c2f0dc 100644
--- a/example/plugins/c-api/secure_link/secure_link.cc
+++ b/example/plugins/c-api/secure_link/secure_link.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ctime>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -41,10 +41,10 @@ namespace
DbgCtl dbg_ctl{PLUGIN_NAME};
}
-typedef struct {
+struct secure_link_info {
char *secret;
uint8_t strict;
-} secure_link_info;
+};
TSRemapStatus
TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
@@ -56,7 +56,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
struct sockaddr_in *in;
const char *qh, *ph, *ip;
unsigned char md[MD5_DIGEST_LENGTH];
- secure_link_info *sli = (secure_link_info *)ih;
+ secure_link_info *sli = static_cast<secure_link_info *>(ih);
char *token = nullptr, *tokenptr = nullptr, *expire = nullptr, *expireptr = nullptr, *path = nullptr;
char *s, *ptr, *saveptr = nullptr, *val, hash[32] = "";
@@ -175,7 +175,7 @@ TSRemapNewInstance(int argc, char **argv, void **ih, char *errbuf, int errbuf_si
(void)errbuf;
(void)errbuf_size;
- sli = (secure_link_info *)TSmalloc(sizeof(secure_link_info));
+ sli = static_cast<secure_link_info *>(TSmalloc(sizeof(secure_link_info)));
sli->secret = nullptr;
sli->strict = 0;
@@ -209,7 +209,7 @@ TSRemapNewInstance(int argc, char **argv, void **ih, char *errbuf, int errbuf_si
void
TSRemapDeleteInstance(void *ih)
{
- secure_link_info *sli = (secure_link_info *)ih;
+ secure_link_info *sli = static_cast<secure_link_info *>(ih);
TSfree(sli->secret);
TSfree(sli);
diff --git a/example/plugins/c-api/server_push/server_push.cc b/example/plugins/c-api/server_push/server_push.cc
index 9e2d1af92e..b17c3d0ba7 100644
--- a/example/plugins/c-api/server_push/server_push.cc
+++ b/example/plugins/c-api/server_push/server_push.cc
@@ -31,9 +31,9 @@
*
*
*/
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -72,17 +72,17 @@ server_push_plugin(TSCont contp, TSEvent event, void *edata)
switch (event) {
case TS_EVENT_HTTP_SSN_START:
- ssnp = (TSHttpSsn)edata;
+ ssnp = static_cast<TSHttpSsn>(edata);
TSHttpSsnHookAdd(ssnp, TS_HTTP_TXN_START_HOOK, contp);
TSHttpSsnReenable(ssnp, TS_EVENT_HTTP_CONTINUE);
break;
case TS_EVENT_HTTP_TXN_START:
- txnp = (TSHttpTxn)edata;
+ txnp = static_cast<TSHttpTxn>(edata);
TSHttpTxnHookAdd(txnp, TS_HTTP_READ_REQUEST_HDR_HOOK, contp);
TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
break;
case TS_EVENT_HTTP_READ_REQUEST_HDR:
- txnp = (TSHttpTxn)edata;
+ txnp = static_cast<TSHttpTxn>(edata);
if (should_push(txnp)) {
TSHttpTxnServerPush(txnp, url, strlen(url));
}
diff --git a/example/plugins/c-api/server_transform/server_transform.cc b/example/plugins/c-api/server_transform/server_transform.cc
index 96a8ffd84a..e34ad1c296 100644
--- a/example/plugins/c-api/server_transform/server_transform.cc
+++ b/example/plugins/c-api/server_transform/server_transform.cc
@@ -41,8 +41,8 @@
limitations under the License.
*/
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
#include <netinet/in.h>
@@ -63,7 +63,7 @@ DbgCtl dbg_ctl{PLUGIN_NAME};
#define STATE_READ 5
#define STATE_BYPASS 6
-typedef struct {
+struct TransformData {
int state;
TSHttpTxn txn;
@@ -80,7 +80,7 @@ typedef struct {
TSVIO server_vio;
int content_length;
-} TransformData;
+};
static int transform_handler(TSCont contp, TSEvent event, void *edata);
@@ -95,7 +95,7 @@ transform_create(TSHttpTxn txnp)
contp = TSTransformCreate(transform_handler, txnp);
- data = (TransformData *)TSmalloc(sizeof(TransformData));
+ data = static_cast<TransformData *>(TSmalloc(sizeof(TransformData)));
data->state = STATE_BUFFER;
data->txn = txnp;
data->input_buf = nullptr;
@@ -169,7 +169,7 @@ transform_connect(TSCont contp, TransformData *data)
temp = TSIOBufferCreate();
tempReader = TSIOBufferReaderAlloc(temp);
- TSIOBufferWrite(temp, (const char *)&content_length, sizeof(int));
+ TSIOBufferWrite(temp, reinterpret_cast<const char *>(&content_length), sizeof(int));
TSIOBufferCopy(temp, data->input_reader, content_length, 0);
TSIOBufferReaderFree(data->input_reader);
@@ -189,7 +189,7 @@ transform_connect(TSCont contp, TransformData *data)
ip_addr.sin_addr.s_addr = server_ip; /* Should be in network byte order */
ip_addr.sin_port = server_port;
Dbg(dbg_ctl, "net connect.");
- action = TSNetConnect(contp, (struct sockaddr const *)&ip_addr);
+ action = TSNetConnect(contp, reinterpret_cast<struct sockaddr const *>(&ip_addr));
if (!TSActionDone(action)) {
data->pending_action = action;
@@ -240,7 +240,7 @@ transform_read(TSCont contp, TransformData *data)
data->input_reader = nullptr;
data->server_vio = TSVConnRead(data->server_vc, contp, data->output_buf, data->content_length);
- data->output_vc = TSTransformOutputVConnGet((TSVConn)contp);
+ data->output_vc = TSTransformOutputVConnGet(static_cast<TSVConn>(contp));
if (data->output_vc == nullptr) {
TSError("[%s] TSTransformOutputVConnGet returns null", PLUGIN_NAME);
} else {
@@ -271,7 +271,7 @@ transform_bypass(TSCont contp, TransformData *data)
}
TSIOBufferReaderConsume(data->input_reader, sizeof(int));
- data->output_vc = TSTransformOutputVConnGet((TSVConn)contp);
+ data->output_vc = TSTransformOutputVConnGet(static_cast<TSVConn>(contp));
if (data->output_vc == nullptr) {
TSError("[%s] TSTransformOutputVConnGet returns null", PLUGIN_NAME);
} else {
@@ -361,7 +361,7 @@ transform_connect_event(TSCont contp, TransformData *data, TSEvent event, void *
Dbg(dbg_ctl, "connected");
data->pending_action = nullptr;
- data->server_vc = (TSVConn)edata;
+ data->server_vc = static_cast<TSVConn>(edata);
return transform_write(contp, data);
case TS_EVENT_NET_CONNECT_FAILED:
Dbg(dbg_ctl, "connect failed");
@@ -413,7 +413,7 @@ transform_read_status_event(TSCont contp, TransformData *data, TSEvent event, vo
buf_ptr = &data->content_length;
while (read_nbytes > 0) {
TSIOBufferBlock blk = TSIOBufferReaderStart(data->output_reader);
- char *buf = (char *)TSIOBufferBlockReadStart(blk, data->output_reader, &avail);
+ char *buf = const_cast<char *>(TSIOBufferBlockReadStart(blk, data->output_reader, &avail));
int64_t read_ndone = (avail >= read_nbytes) ? read_nbytes : avail;
memcpy(buf_ptr, buf, read_ndone);
@@ -421,7 +421,7 @@ transform_read_status_event(TSCont contp, TransformData *data, TSEvent event, vo
TSIOBufferReaderConsume(data->output_reader, read_ndone);
read_nbytes -= read_ndone;
/* move ptr frwd by read_ndone bytes */
- buf_ptr = (char *)buf_ptr + read_ndone;
+ buf_ptr = static_cast<char *>(buf_ptr) + read_ndone;
}
}
return transform_read(contp, data);
@@ -508,7 +508,7 @@ transform_handler(TSCont contp, TSEvent event, void *edata)
TransformData *data;
int val = 0;
- data = (TransformData *)TSContDataGet(contp);
+ data = static_cast<TransformData *>(TSContDataGet(contp));
if (data == nullptr) {
TSError("[%s] Didn't get Continuation's Data, ignoring event", PLUGIN_NAME);
return 0;
@@ -599,7 +599,7 @@ server_response_ok(TSHttpTxn txnp)
static int
transform_plugin(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_REQUEST_HDR:
diff --git a/example/plugins/c-api/session_hooks/session_hooks.cc b/example/plugins/c-api/session_hooks/session_hooks.cc
index e314451980..d504276cf7 100644
--- a/example/plugins/c-api/session_hooks/session_hooks.cc
+++ b/example/plugins/c-api/session_hooks/session_hooks.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include <stdio.h>
+#include <cstdio>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -65,13 +65,13 @@ ssn_handler(TSCont contp, TSEvent event, void *edata)
switch (event) {
case TS_EVENT_HTTP_SSN_START:
- ssnp = (TSHttpSsn)edata;
+ ssnp = static_cast<TSHttpSsn>(edata);
handle_session(ssnp, contp);
TSHttpSsnReenable(ssnp, TS_EVENT_HTTP_CONTINUE);
return 0;
case TS_EVENT_HTTP_TXN_START:
- txnp = (TSHttpTxn)edata;
+ txnp = static_cast<TSHttpTxn>(edata);
txn_handler(txnp, contp);
TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
return 0;
diff --git a/example/plugins/c-api/thread_1/thread_1.cc b/example/plugins/c-api/thread_1/thread_1.cc
index d7b73d5d85..2344b314e8 100644
--- a/example/plugins/c-api/thread_1/thread_1.cc
+++ b/example/plugins/c-api/thread_1/thread_1.cc
@@ -23,8 +23,8 @@
limitations under the License.
*/
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include "ts/ts.h"
#include "tscore/ink_defs.h"
@@ -34,7 +34,7 @@
static void *
reenable_txn(void *data)
{
- TSHttpTxn txnp = (TSHttpTxn)data;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(data);
TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
return nullptr;
}
diff --git a/example/plugins/c-api/thread_pool/psi.cc b/example/plugins/c-api/thread_pool/psi.cc
index 2b9c0f3d09..fc8fc54cc2 100644
--- a/example/plugins/c-api/thread_pool/psi.cc
+++ b/example/plugins/c-api/thread_pool/psi.cc
@@ -31,10 +31,10 @@
limitations under the License.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <climits>
+#include <cstring>
#include <sys/param.h>
#include "ts/ts.h"
@@ -58,18 +58,18 @@
#define MIME_FIELD_XPSI "X-Psi"
-typedef enum {
+enum PluginState {
STATE_READ_DATA = 1,
STATE_READ_PSI = 2,
STATE_DUMP_PSI = 3,
-} PluginState;
+};
-typedef enum {
+enum ParseState {
PARSE_SEARCH,
PARSE_EXTRACT,
-} ParseState;
+};
-typedef struct {
+struct ContData {
unsigned int magic;
TSVIO output_vio;
TSIOBuffer output_buffer;
@@ -85,18 +85,18 @@ typedef struct {
PluginState state;
int transform_bytes;
-} ContData;
+};
-typedef struct {
+struct TryLockData {
TSCont contp;
TSEvent event;
-} TryLockData;
+};
-typedef enum {
+enum StrOperationResult {
STR_SUCCESS,
STR_PARTIAL,
STR_FAIL,
-} StrOperationResult;
+};
extern Queue job_queue;
@@ -124,7 +124,7 @@ cont_data_alloc()
{
ContData *data;
- data = (ContData *)TSmalloc(sizeof(ContData));
+ data = static_cast<ContData *>(TSmalloc(sizeof(ContData)));
data->magic = MAGIC_ALIVE;
data->output_vio = nullptr;
data->output_buffer = nullptr;
@@ -931,7 +931,7 @@ transform_add(TSHttpTxn txnp)
static int
read_response_handler(TSCont contp ATS_UNUSED, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
switch (event) {
case TS_EVENT_HTTP_READ_RESPONSE_HDR:
@@ -988,7 +988,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
init_queue(&job_queue);
for (i = 0; i < NB_THREADS; i++) {
- char *thread_name = (char *)TSmalloc(64);
+ char *thread_name = static_cast<char *>(TSmalloc(64));
snprintf(thread_name, 64, "Thread[%d]", i);
if (!TSThreadCreate(thread_loop, thread_name)) {
TSError("[%s] Failed creating threads", PLUGIN_NAME);
diff --git a/example/plugins/c-api/thread_pool/thread.cc b/example/plugins/c-api/thread_pool/thread.cc
index c53e6dedf8..a22b1895fe 100644
--- a/example/plugins/c-api/thread_pool/thread.cc
+++ b/example/plugins/c-api/thread_pool/thread.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include <stdio.h>
+#include <cstdio>
#include <pthread.h>
#include "ts/ts.h"
diff --git a/example/plugins/c-api/thread_pool/thread.h b/example/plugins/c-api/thread_pool/thread.h
index 9949ff9d7e..487e2ec9d2 100644
--- a/example/plugins/c-api/thread_pool/thread.h
+++ b/example/plugins/c-api/thread_pool/thread.h
@@ -32,31 +32,30 @@
will log error messages. This should be tuned based on your application */
#define MAX_JOBS_ALARM 1000
-typedef int (*ExecFunc)(TSCont, void *);
+using ExecFunc = int (*)(TSCont, void *);
/* Structure that contains all information for a job execution */
-typedef struct {
+struct Job {
unsigned int magic;
TSCont cont; /* Continuation to call once job is done */
ExecFunc func; /* Job function */
void *data; /* Any data to pass to the job function */
-} Job;
+};
/* Implementation of the queue for jobs */
-struct cell_rec {
+struct Cell {
unsigned int magic;
void *ptr_data;
- struct cell_rec *ptr_next;
- struct cell_rec *ptr_prev;
+ struct Cell *ptr_next;
+ struct Cell *ptr_prev;
};
-typedef struct cell_rec Cell;
-typedef struct {
+struct Queue {
Cell *head;
Cell *tail;
int nb_elem;
TSMutex mutex;
-} Queue;
+};
/* queue manipulation functions */
void init_queue(Queue *q);
diff --git a/example/plugins/c-api/version/version.cc b/example/plugins/c-api/version/version.cc
index 53d88a3bb1..3fd2db7391 100644
--- a/example/plugins/c-api/version/version.cc
+++ b/example/plugins/c-api/version/version.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include <stdio.h>
+#include <cstdio>
#include <ts/ts.h>
#define PLUGIN_NAME "version"