aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/getopt
diff options
context:
space:
mode:
authorchegoryu <chegoryu@yandex-team.ru>2022-02-10 16:49:47 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:49:47 +0300
commit767f05356832cfac686778897626e124d257dbc8 (patch)
tree5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp/getopt
parente4b93027b4c6dbd741ebd637f0b5db1d583ee93f (diff)
downloadydb-767f05356832cfac686778897626e124d257dbc8.tar.gz
Restoring authorship annotation for <chegoryu@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'library/cpp/getopt')
-rw-r--r--library/cpp/getopt/small/modchooser.cpp22
-rw-r--r--library/cpp/getopt/ut/modchooser_ut.cpp48
2 files changed, 35 insertions, 35 deletions
diff --git a/library/cpp/getopt/small/modchooser.cpp b/library/cpp/getopt/small/modchooser.cpp
index 8aaea9c9d6..2fa5cfd070 100644
--- a/library/cpp/getopt/small/modchooser.cpp
+++ b/library/cpp/getopt/small/modchooser.cpp
@@ -206,7 +206,7 @@ int TModChooser::Run(const int argc, const char** argv) const {
if (shiftArgs) {
TString firstArg;
- TVector<const char*> nargv(Reserve(argc));
+ TVector<const char*> nargv(Reserve(argc));
if (PrintShortCommandInUsage) {
firstArg = modeIter->second->Name;
@@ -219,26 +219,26 @@ int TModChooser::Run(const int argc, const char** argv) const {
for (int i = 2; i < argc; ++i) {
nargv.push_back(argv[i]);
}
- // According to the standard, "argv[argc] shall be a null pointer" (5.1.2.2.1).
- // http://www.open-std.org/JTC1/SC22/WG14/www/docs/n1336
- nargv.push_back(nullptr);
+ // According to the standard, "argv[argc] shall be a null pointer" (5.1.2.2.1).
+ // http://www.open-std.org/JTC1/SC22/WG14/www/docs/n1336
+ nargv.push_back(nullptr);
- return (*modeIter->second->Main)(nargv.size() - 1, nargv.data());
+ return (*modeIter->second->Main)(nargv.size() - 1, nargv.data());
} else {
return (*modeIter->second->Main)(argc, argv);
}
}
int TModChooser::Run(const TVector<TString>& argv) const {
- TVector<const char*> nargv(Reserve(argv.size() + 1));
+ TVector<const char*> nargv(Reserve(argv.size() + 1));
for (auto& arg : argv) {
nargv.push_back(arg.c_str());
}
- // According to the standard, "argv[argc] shall be a null pointer" (5.1.2.2.1).
- // http://www.open-std.org/JTC1/SC22/WG14/www/docs/n1336
- nargv.push_back(nullptr);
-
- return Run(nargv.size() - 1, nargv.data());
+ // According to the standard, "argv[argc] shall be a null pointer" (5.1.2.2.1).
+ // http://www.open-std.org/JTC1/SC22/WG14/www/docs/n1336
+ nargv.push_back(nullptr);
+
+ return Run(nargv.size() - 1, nargv.data());
}
size_t TModChooser::TMode::CalculateFullNameLen() const {
diff --git a/library/cpp/getopt/ut/modchooser_ut.cpp b/library/cpp/getopt/ut/modchooser_ut.cpp
index fee4298270..a14c8a5853 100644
--- a/library/cpp/getopt/ut/modchooser_ut.cpp
+++ b/library/cpp/getopt/ut/modchooser_ut.cpp
@@ -4,33 +4,33 @@
#include <util/stream/str.h>
-void ValidateArgcArgv(int argc, const char** argv) {
- UNIT_ASSERT_EQUAL(argc, 1);
- UNIT_ASSERT_EQUAL(argv[argc], nullptr);
-}
-
-int One(int argc, const char** argv) {
- ValidateArgcArgv(argc, argv);
+void ValidateArgcArgv(int argc, const char** argv) {
+ UNIT_ASSERT_EQUAL(argc, 1);
+ UNIT_ASSERT_EQUAL(argv[argc], nullptr);
+}
+
+int One(int argc, const char** argv) {
+ ValidateArgcArgv(argc, argv);
return 1;
}
-int Two(int argc, const char** argv) {
- ValidateArgcArgv(argc, argv);
+int Two(int argc, const char** argv) {
+ ValidateArgcArgv(argc, argv);
return 2;
}
-int Three(int argc, const char** argv) {
- ValidateArgcArgv(argc, argv);
+int Three(int argc, const char** argv) {
+ ValidateArgcArgv(argc, argv);
return 3;
}
-int Four(int argc, const char** argv) {
- ValidateArgcArgv(argc, argv);
+int Four(int argc, const char** argv) {
+ ValidateArgcArgv(argc, argv);
return 4;
}
-int Five(int argc, const char** argv) {
- ValidateArgcArgv(argc, argv);
+int Five(int argc, const char** argv) {
+ ValidateArgcArgv(argc, argv);
return 5;
}
@@ -46,25 +46,25 @@ Y_UNIT_TEST_SUITE(TModChooserTest) {
chooser.AddMode(NAMES[idx], FUNCTIONS[idx], NAMES[idx]);
}
- // test argc, argv
+ // test argc, argv
for (size_t idx = 0; idx < Y_ARRAY_SIZE(NAMES); ++idx) {
int argc = 2;
- const char* argv[] = {"UNITTEST", NAMES[idx], nullptr};
+ const char* argv[] = {"UNITTEST", NAMES[idx], nullptr};
UNIT_ASSERT_EQUAL(static_cast<int>(idx) + 1, chooser.Run(argc, argv));
}
-
- // test TVector<TString> argv
- for (size_t idx = 0; idx < Y_ARRAY_SIZE(NAMES); ++idx) {
- const TVector<TString> argv = {"UNITTEST", NAMES[idx]};
- UNIT_ASSERT_EQUAL(static_cast<int>(idx) + 1, chooser.Run(argv));
- }
+
+ // test TVector<TString> argv
+ for (size_t idx = 0; idx < Y_ARRAY_SIZE(NAMES); ++idx) {
+ const TVector<TString> argv = {"UNITTEST", NAMES[idx]};
+ UNIT_ASSERT_EQUAL(static_cast<int>(idx) + 1, chooser.Run(argv));
+ }
}
Y_UNIT_TEST(TestHelpMessage) {
TModChooser chooser;
int argc = 2;
- const char* argv[] = {"UNITTEST", "-?", nullptr};
+ const char* argv[] = {"UNITTEST", "-?", nullptr};
chooser.Run(argc, argv);
}