Skip to content

Commit e38d103

Browse files
authored
Merge pull request swiftlang#32539 from 3405691582/ClangFormat_CommandLine
2 parents 0a53c62 + bb2bd64 commit e38d103

File tree

1 file changed

+31
-29
lines changed

1 file changed

+31
-29
lines changed

stdlib/public/stubs/CommandLine.cpp

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#include <vector>
18-
#include <string>
1917
#include <cassert>
2018
#include <climits>
2119
#include <cstdarg>
2220
#include <cstdint>
2321
#include <cstdio>
2422
#include <cstdlib>
2523
#include <cstring>
24+
#include <string>
25+
#include <vector>
2626

2727
#include "swift/Runtime/Debug.h"
2828

29-
#include "../SwiftShims/RuntimeStubs.h"
3029
#include "../SwiftShims/GlobalObjects.h"
30+
#include "../SwiftShims/RuntimeStubs.h"
3131

3232
#if defined(_WIN32)
3333
#define WIN32_LEAN_AND_MEAN
@@ -52,7 +52,7 @@ extern "C" char ***_NSGetArgv(void);
5252
extern "C" int *_NSGetArgc(void);
5353

5454
SWIFT_RUNTIME_STDLIB_API
55-
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
55+
char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
5656
assert(outArgLen != nullptr);
5757

5858
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -65,7 +65,7 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
6565
}
6666
#elif defined(__linux__) || defined(__CYGWIN__)
6767
SWIFT_RUNTIME_STDLIB_API
68-
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
68+
char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
6969
assert(outArgLen != nullptr);
7070

7171
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -75,8 +75,8 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
7575

7676
FILE *cmdline = fopen("/proc/self/cmdline", "rb");
7777
if (!cmdline) {
78-
swift::fatalError(0,
79-
"Fatal error: Unable to open interface to '/proc/self/cmdline'.\n");
78+
swift::fatalError(
79+
0, "Fatal error: Unable to open interface to '/proc/self/cmdline'.\n");
8080
}
8181
char *arg = nullptr;
8282
size_t size = 0;
@@ -95,11 +95,11 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
9595

9696
return outBuf;
9797
}
98-
#elif defined (_WIN32)
98+
#elif defined(_WIN32)
9999
#include <stdlib.h>
100100

101101
SWIFT_RUNTIME_STDLIB_API
102-
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
102+
char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
103103
assert(outArgLen != nullptr);
104104

105105
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -109,7 +109,6 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
109109

110110
*outArgLen = 0;
111111

112-
113112
LPWSTR *szArgList;
114113
int nArgs;
115114
szArgList = CommandLineToArgvW(GetCommandLineW(), &nArgs);
@@ -118,17 +117,17 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
118117

119118
std::vector<char *> argv;
120119
for (int i = 0; i < nArgs; ++i) {
121-
int szBufferSize = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS,
122-
szArgList[i], -1, nullptr, 0,
123-
nullptr, nullptr);
120+
int szBufferSize =
121+
WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, szArgList[i], -1,
122+
nullptr, 0, nullptr, nullptr);
124123
if (szBufferSize == 0) {
125124
for (char *arg : argv)
126125
free(arg);
127126
return nullptr;
128127
}
129128

130-
char *buffer = static_cast<char *>(calloc(static_cast<size_t>(szBufferSize),
131-
sizeof(char)));
129+
char *buffer = static_cast<char *>(
130+
calloc(static_cast<size_t>(szBufferSize), sizeof(char)));
132131
if (buffer == nullptr) {
133132
for (char *arg : argv)
134133
free(arg);
@@ -157,13 +156,13 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
157156
}
158157
#elif defined(__FreeBSD__)
159158
#include <errno.h>
160-
#include <unistd.h>
161-
#include <sys/types.h>
162159
#include <sys/param.h>
163160
#include <sys/sysctl.h>
161+
#include <sys/types.h>
162+
#include <unistd.h>
164163

165164
SWIFT_RUNTIME_STDLIB_API
166-
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
165+
char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
167166
assert(outArgLen != nullptr);
168167

169168
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -172,7 +171,7 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
172171
}
173172

174173
char *argPtr = nullptr; // or use ARG_MAX? 8192 is used in LLDB though..
175-
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, getpid() };
174+
int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_ARGS, getpid()};
176175
size_t argPtrSize = 0;
177176
for (int i = 0; i < 3 && !argPtr; ++i) { // give up after 3 tries
178177
if (sysctl(mib, 4, nullptr, &argPtrSize, nullptr, 0) != -1) {
@@ -188,8 +187,10 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
188187
}
189188
}
190189
if (!argPtr)
191-
swift::fatalError(0, "Fatal error: Could not retrieve commandline "
192-
"arguments: sysctl: %s.\n", strerror(errno));
190+
swift::fatalError(0,
191+
"Fatal error: Could not retrieve commandline "
192+
"arguments: sysctl: %s.\n",
193+
strerror(errno));
193194

194195
char *curPtr = argPtr;
195196
char *endPtr = argPtr + argPtrSize;
@@ -203,16 +204,16 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
203204
outBuf[argvec.size()] = nullptr;
204205

205206
free(argPtr);
206-
207+
207208
return outBuf;
208209
}
209210
#elif defined(__wasi__)
211+
#include <stdlib.h>
210212
#include <wasi/api.h>
211213
#include <wasi/libc.h>
212-
#include <stdlib.h>
213214

214215
SWIFT_RUNTIME_STDLIB_API
215-
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
216+
char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
216217
assert(outArgLen != nullptr);
217218

218219
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -225,7 +226,8 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
225226
size_t argv_buf_size;
226227
size_t argc;
227228
err = __wasi_args_sizes_get(&argc, &argv_buf_size);
228-
if (err != __WASI_ERRNO_SUCCESS) return nullptr;
229+
if (err != __WASI_ERRNO_SUCCESS)
230+
return nullptr;
229231

230232
size_t num_ptrs = argc + 1;
231233
char *argv_buf = (char *)malloc(argv_buf_size);
@@ -280,14 +282,14 @@ char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
280282
}
281283
#else // Add your favorite OS's command line arg grabber here.
282284
SWIFT_RUNTIME_STDLIB_API
283-
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
285+
char **_swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
284286
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
285287
*outArgLen = _swift_stdlib_ProcessOverrideUnsafeArgc;
286288
return _swift_stdlib_ProcessOverrideUnsafeArgv;
287289
}
288-
289-
swift::fatalError(0,
290+
291+
swift::fatalError(
292+
0,
290293
"Fatal error: Command line arguments not supported on this platform.\n");
291294
}
292295
#endif
293-

0 commit comments

Comments
 (0)