diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2020-06-03 13:51:01 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-06-11 01:11:50 +0000 |
| commit | c08a726e61157ae501c28cf7e222e16d49954fbf (patch) | |
| tree | 50e0cdc58f93a42dcba3a594051f9def44c457b8 /src/mongo/s | |
| parent | f664f948ad0876f0537958cb5ab29a857f1e4924 (diff) | |
| download | mongo-c08a726e61157ae501c28cf7e222e16d49954fbf.tar.gz | |
SERVER-48367 Remove all _envp usage
Diffstat (limited to 'src/mongo/s')
| -rw-r--r-- | src/mongo/s/mongos.cpp | 9 | ||||
| -rw-r--r-- | src/mongo/s/mongos_main.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/s/mongos_main.h | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/mongo/s/mongos.cpp b/src/mongo/s/mongos.cpp index d9cc1790464..131cbd4ee73 100644 --- a/src/mongo/s/mongos.cpp +++ b/src/mongo/s/mongos.cpp @@ -39,12 +39,11 @@ // WindowsCommandLine object converts these wide character strings to a UTF-8 coded equivalent // and makes them available through the argv() and envp() members. This enables mongoSMain() // to process UTF-8 encoded arguments and environment variables without regard to platform. -int wmain(int argc, wchar_t* argvW[], wchar_t* envpW[]) { - mongo::WindowsCommandLine wcl(argc, argvW, envpW); - mongo::exitCleanly(mongo::mongos_main(argc, wcl.argv(), wcl.envp())); +int wmain(int argc, wchar_t* argvW[]) { + mongo::exitCleanly(mongo::mongos_main(argc, mongo::WindowsCommandLine(argc, argvW).argv())); } #else -int main(int argc, char* argv[], char** envp) { - mongo::exitCleanly(mongo::mongos_main(argc, argv, envp)); +int main(int argc, char* argv[]) { + mongo::exitCleanly(mongo::mongos_main(argc, argv)); } #endif diff --git a/src/mongo/s/mongos_main.cpp b/src/mongo/s/mongos_main.cpp index 6894950f899..f045dd9b115 100644 --- a/src/mongo/s/mongos_main.cpp +++ b/src/mongo/s/mongos_main.cpp @@ -914,7 +914,7 @@ MONGO_INITIALIZER_GENERAL(setSSLManagerType, MONGO_NO_PREREQUISITES, ("SSLManage } // namespace -ExitCode mongos_main(int argc, char* argv[], char** envp) { +ExitCode mongos_main(int argc, char* argv[]) { setMongos(); if (argc < 1) @@ -923,7 +923,7 @@ ExitCode mongos_main(int argc, char* argv[], char** envp) { setupSignalHandlers(); - Status status = runGlobalInitializers(argc, argv, envp); + Status status = runGlobalInitializers(std::vector<std::string>(argv, argv + argc)); if (!status.isOK()) { LOGV2_FATAL_OPTIONS( 22865, diff --git a/src/mongo/s/mongos_main.h b/src/mongo/s/mongos_main.h index e68edc33563..37dd9512824 100644 --- a/src/mongo/s/mongos_main.h +++ b/src/mongo/s/mongos_main.h @@ -31,6 +31,6 @@ namespace mongo { -ExitCode mongos_main(int argc, char* argv[], char** envp); +ExitCode mongos_main(int argc, char* argv[]); } // namespace mongo |