Skip to content

Commit 5dad41f

Browse files
committed
[NFC] Modernize Casts
C++ static_cast is far safer than C-style casts.
1 parent 9855496 commit 5dad41f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

stdlib/public/stubs/CommandLine.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
8989
}
9090
fclose(cmdline);
9191
*outArgLen = argvec.size();
92-
char **outBuf = (char **)calloc(argvec.size() + 1, sizeof(char *));
92+
auto outBuf = static_cast<char **>(calloc(argvec.size() + 1, sizeof(char *)));
9393
std::copy(argvec.begin(), argvec.end(), outBuf);
9494
outBuf[argvec.size()] = nullptr;
9595

@@ -175,7 +175,7 @@ char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
175175
size_t argPtrSize = 0;
176176
for (int i = 0; i < 3 && !argPtr; ++i) { // give up after 3 tries
177177
if (sysctl(mib, 4, nullptr, &argPtrSize, nullptr, 0) != -1) {
178-
argPtr = (char *)malloc(argPtrSize);
178+
argPtr = static_cast<char *>(malloc(argPtrSize));
179179
if (sysctl(mib, 4, argPtr, &argPtrSize, nullptr, 0) == -1) {
180180
free(argPtr);
181181
argPtr = nullptr;
@@ -199,7 +199,7 @@ char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
199199
for (; curPtr < endPtr; curPtr += strlen(curPtr) + 1)
200200
argvec.push_back(strdup(curPtr));
201201
*outArgLen = argvec.size();
202-
char **outBuf = (char **)calloc(argvec.size() + 1, sizeof(char *));
202+
auto outBuf = static_cast<char **>(calloc(argvec.size() + 1, sizeof(char *)));
203203
std::copy(argvec.begin(), argvec.end(), outBuf);
204204
outBuf[argvec.size()] = nullptr;
205205

@@ -230,8 +230,8 @@ char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
230230
return nullptr;
231231

232232
size_t num_ptrs = argc + 1;
233-
char *argv_buf = (char *)malloc(argv_buf_size);
234-
char **argv = (char **)calloc(num_ptrs, sizeof(char *));
233+
char *argv_buf = static_cast<char *>(alloc(argv_buf_size));
234+
char **argv = static_cast<char **>(calloc(num_ptrs, sizeof(char *)));
235235

236236
err = __wasi_args_get((uint8_t **)argv, (uint8_t *)argv_buf);
237237
if (err != __WASI_ERRNO_SUCCESS) {

0 commit comments

Comments
 (0)