This is an automated email from the ASF dual-hosted git repository.
dmeden 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 cf93613ae5 Cleanup - Use C++ style cast instead of the C style. Part 2
(#12159)
cf93613ae5 is described below
commit cf93613ae5538ebbc44fbd26f4fcb1b19ea4b520
Author: Damian Meden <[email protected]>
AuthorDate: Tue Apr 8 12:21:26 2025 +0200
Cleanup - Use C++ style cast instead of the C style. Part 2 (#12159)
Also, "modernize" some code.
---
src/api/InkAPITest.cc | 12 ++++++------
src/api/InkIOCoreAPI.cc | 2 +-
src/iocore/aio/test_AIO.cc | 2 +-
src/iocore/cache/CacheHosting.cc | 4 ++--
src/iocore/cache/CacheProcessor.cc | 6 +++---
src/iocore/net/Socks.cc | 2 +-
src/proxy/Plugin.cc | 2 +-
src/proxy/hdrs/URL.cc | 6 +++---
src/proxy/hdrs/unit_tests/test_Huffmancode.cc | 4 ++--
src/records/RecConfigParse.cc | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/api/InkAPITest.cc b/src/api/InkAPITest.cc
index a2e0a4f7ee..7cd4074fd4 100644
--- a/src/api/InkAPITest.cc
+++ b/src/api/InkAPITest.cc
@@ -2567,7 +2567,7 @@ REGRESSION_TEST(SDK_API_TSContDataGet)(RegressionTest
*test, int /* atype ATS_UN
my_data->data1 = 1;
my_data->data2 = 2;
- TSContDataSet(contp, (void *)my_data);
+ TSContDataSet(contp, static_cast<void *>(my_data));
TSContScheduleOnPool(contp, 0, TS_THREAD_POOL_NET);
}
@@ -3789,10 +3789,10 @@ REGRESSION_TEST(SDK_API_TSUrl)(RegressionTest *test,
int /* atype ATS_UNUSED */,
const char *fragment = "yyy";
const char *fragment_get;
char *url_expected_string;
- char *url_string_from_1 = (char *)nullptr;
- char *url_string_from_2 = (char *)nullptr;
- char *url_string_from_3 = (char *)nullptr;
- char *url_string_from_print = (char *)nullptr;
+ char *url_string_from_1{nullptr};
+ char *url_string_from_2{nullptr};
+ char *url_string_from_3{nullptr};
+ char *url_string_from_print{nullptr};
int url_expected_length;
int url_length_from_1;
int url_length_from_2;
@@ -6478,7 +6478,7 @@ REGRESSION_TEST(SDK_API_TSTextLog)(RegressionTest *test,
int /* atype ATS_UNUSED
same log file name. */
ats_scoped_str tmp(RecConfigReadLogDir());
snprintf(logname, sizeof(logname), "RegressionTestLog%d.log",
static_cast<int>(getpid()));
- snprintf(fullpath_logname, sizeof(fullpath_logname), "%s/%s", (const char
*)tmp, logname);
+ snprintf(fullpath_logname, sizeof(fullpath_logname), "%s/%s", tmp.get(),
logname);
unlink(fullpath_logname);
retVal = TSTextLogObjectCreate(logname, TS_LOG_MODE_ADD_TIMESTAMP, &ts_log);
diff --git a/src/api/InkIOCoreAPI.cc b/src/api/InkIOCoreAPI.cc
index 47cf585a4b..f5f6455fbe 100644
--- a/src/api/InkIOCoreAPI.cc
+++ b/src/api/InkIOCoreAPI.cc
@@ -568,7 +568,7 @@ TSIOBufferBlockReadStart(TSIOBufferBlock blockp,
TSIOBufferReader readerp, int64
}
}
- return (const char *)p;
+ return static_cast<const char *>(p);
}
int64_t
diff --git a/src/iocore/aio/test_AIO.cc b/src/iocore/aio/test_AIO.cc
index 1016b3a969..79a1e9c8aa 100644
--- a/src/iocore/aio/test_AIO.cc
+++ b/src/iocore/aio/test_AIO.cc
@@ -371,7 +371,7 @@ read_config(const char *config_filename)
while (!fin.eof()) {
field_name[0] = '\0';
fin >> field_name;
- if (0) {}
+ if (false) {}
PARAM(hotset_size)
PARAM(hotset_frequency)
PARAM(touch_data)
diff --git a/src/iocore/cache/CacheHosting.cc b/src/iocore/cache/CacheHosting.cc
index 4e7f5bbef9..ab8e3b23aa 100644
--- a/src/iocore/cache/CacheHosting.cc
+++ b/src/iocore/cache/CacheHosting.cc
@@ -607,10 +607,10 @@ ConfigVolumes::read_config_file()
if (ec) {
switch (ec.value()) {
case ENOENT:
- Warning("Cannot open the config file: %s - %s", (const char
*)config_path, strerror(ec.value()));
+ Warning("Cannot open the config file: %s - %s", config_path.get(),
strerror(ec.value()));
break;
default:
- Error("%s failed to load: %s", (const char *)config_path,
strerror(ec.value()));
+ Error("%s failed to load: %s", config_path.get(), strerror(ec.value()));
return;
}
}
diff --git a/src/iocore/cache/CacheProcessor.cc
b/src/iocore/cache/CacheProcessor.cc
index 7b759c1b1f..73094fdeb8 100644
--- a/src/iocore/cache/CacheProcessor.cc
+++ b/src/iocore/cache/CacheProcessor.cc
@@ -928,11 +928,11 @@ cplist_reconfigure()
}
if (config_vol->size < 128) {
Warning("the size of volume %d (%" PRId64 ") is less than the minimum
required volume size %d", config_vol->number,
- (int64_t)config_vol->size, 128);
+ static_cast<int64_t>(config_vol->size), 128);
Warning("volume %d is not created", config_vol->number);
}
- Dbg(dbg_ctl_cache_hosting, "Volume: %d Size: %" PRId64 " Ramcache: %d",
config_vol->number, (int64_t)config_vol->size,
- config_vol->ramcache_enabled);
+ Dbg(dbg_ctl_cache_hosting, "Volume: %d Size: %" PRId64 " Ramcache: %d",
config_vol->number,
+ static_cast<int64_t>(config_vol->size),
config_vol->ramcache_enabled);
}
cplist_update();
diff --git a/src/iocore/net/Socks.cc b/src/iocore/net/Socks.cc
index e5e1445339..b3da07c1a7 100644
--- a/src/iocore/net/Socks.cc
+++ b/src/iocore/net/Socks.cc
@@ -489,7 +489,7 @@ loadSocksConfiguration(socks_conf_struct *socks_conf_stuff)
SocksServerConfig::startup();
config_pathname =
RecConfigReadConfigPath("proxy.config.socks.socks_config_file");
- Dbg(dbg_ctl_Socks, "Socks Config File: %s", (const char *)config_pathname);
+ Dbg(dbg_ctl_Socks, "Socks Config File: %s", config_pathname.get());
if (!config_pathname) {
Error("SOCKS Config: could not read config file name. SOCKS Turned off");
diff --git a/src/proxy/Plugin.cc b/src/proxy/Plugin.cc
index c705194558..1514fda7a5 100644
--- a/src/proxy/Plugin.cc
+++ b/src/proxy/Plugin.cc
@@ -213,7 +213,7 @@ plugin_expand(char *arg)
char *str = nullptr;
if (*arg != '$') {
- return (char *)nullptr;
+ return nullptr;
}
// skip the $ character
arg += 1;
diff --git a/src/proxy/hdrs/URL.cc b/src/proxy/hdrs/URL.cc
index 430d886f81..fed4266e6b 100644
--- a/src/proxy/hdrs/URL.cc
+++ b/src/proxy/hdrs/URL.cc
@@ -1187,7 +1187,7 @@ url_is_strictly_compliant(const char *start, const char
*end)
{
for (const char *i = start; i < end; ++i) {
if (!ParseRules::is_uri(*i)) {
- Dbg(dbg_ctl_http, "Non-RFC compliant character [0x%.2X] found in URL",
(unsigned char)*i);
+ Dbg(dbg_ctl_http, "Non-RFC compliant character [0x%.2X] found in URL",
static_cast<unsigned char>(*i));
return false;
}
}
@@ -1204,11 +1204,11 @@ url_is_mostly_compliant(const char *start, const char
*end)
{
for (const char *i = start; i < end; ++i) {
if (isspace(*i)) {
- Dbg(dbg_ctl_http, "Whitespace character [0x%.2X] found in URL",
(unsigned char)*i);
+ Dbg(dbg_ctl_http, "Whitespace character [0x%.2X] found in URL",
static_cast<unsigned char>(*i));
return false;
}
if (!isprint(*i)) {
- Dbg(dbg_ctl_http, "Non-printable character [0x%.2X] found in URL",
(unsigned char)*i);
+ Dbg(dbg_ctl_http, "Non-printable character [0x%.2X] found in URL",
static_cast<unsigned char>(*i));
return false;
}
}
diff --git a/src/proxy/hdrs/unit_tests/test_Huffmancode.cc
b/src/proxy/hdrs/unit_tests/test_Huffmancode.cc
index 4223447213..9726eadda7 100644
--- a/src/proxy/hdrs/unit_tests/test_Huffmancode.cc
+++ b/src/proxy/hdrs/unit_tests/test_Huffmancode.cc
@@ -69,12 +69,12 @@ void
random_test()
{
const int size = 1024;
- char *dst_start = (char *)malloc(size * 2);
+ char *dst_start = static_cast<char *>(malloc(size * 2));
char string[size];
for (char &i : string) {
// coverity[dont_call]
long num = lrand48();
- i = (char)num;
+ i = static_cast<char>(num);
}
const uint8_t *src = (const uint8_t *)string;
uint32_t src_len = sizeof(string);
diff --git a/src/records/RecConfigParse.cc b/src/records/RecConfigParse.cc
index 24d02b66c2..0819137f7d 100644
--- a/src/records/RecConfigParse.cc
+++ b/src/records/RecConfigParse.cc
@@ -119,7 +119,7 @@ RecConfigOverrideFromEnvironment(const char *name, const
char *value)
}
}
- envval = getenv((const char *)envname);
+ envval = getenv(envname.get());
if (envval) {
return envval;
} else if (RecConfigOverrideFromRunroot(name)) {
