Restoring authorship annotation for <albert@yandex-team.ru>. Commit 2 of 2.

8 files changed, 63 insertions, 63 deletions

diff --git a/library/cpp/getopt/small/last_getopt.cpp b/library/cpp/getopt/small/last_getopt.cpp
index 510d089382..30669b2c5a 100644
--- a/library/cpp/getopt/small/last_getopt.cpp
+++ b/library/cpp/getopt/small/last_getopt.cpp
@@ -1,9 +1,9 @@
 #include "last_getopt.h"
 
-namespace NLastGetopt { 
+namespace NLastGetopt {
     void PrintUsageAndExit(const TOptsParser* parser) {
         parser->PrintUsage();
         exit(0);
     }
- 
+
 }
diff --git a/library/cpp/getopt/small/last_getopt.h b/library/cpp/getopt/small/last_getopt.h
index a338d2cc56..07687bc914 100644
--- a/library/cpp/getopt/small/last_getopt.h
+++ b/library/cpp/getopt/small/last_getopt.h
@@ -22,14 +22,14 @@ namespace NLastGetopt {
     public:
         using TContainer = Container;
         using TValue = typename TContainer::value_type;
- 
+
         explicit TOptRangeSplitHandler(TContainer* target, const char elementsDelim, const char rangesDelim)
             : Target(target)
             , ElementsDelim(elementsDelim)
             , RangesDelim(rangesDelim)
         {
         }
- 
+
         void HandleOpt(const TOptsParser* parser) override {
             const TStringBuf curval(parser->CurValOrDef());
             if (curval.IsInited()) {
@@ -54,7 +54,7 @@ namespace NLastGetopt {
         TContainer* Target;
         char ElementsDelim;
         char RangesDelim;
-    }; 
+    };
 
     template <class Container>
     struct TOptSplitHandler: public IOptHandler {
diff --git a/library/cpp/getopt/small/last_getopt_support.h b/library/cpp/getopt/small/last_getopt_support.h
index 7d8cdfba55..17bed3e614 100644
--- a/library/cpp/getopt/small/last_getopt_support.h
+++ b/library/cpp/getopt/small/last_getopt_support.h
@@ -36,13 +36,13 @@ namespace NLastGetopt {
         class THandlerFunctor0
            : public IOptHandler {
             TpFunc Func_;
- 
+
         public:
             THandlerFunctor0(TpFunc func)
                 : Func_(func)
             {
             }
- 
+
             void HandleOpt(const TOptsParser*) override {
                 Func_();
             }
@@ -54,7 +54,7 @@ namespace NLastGetopt {
             TpFunc Func_;
             const TpArg Def_;
             const bool HasDef_;
- 
+
         public:
             THandlerFunctor1(TpFunc func)
                 : Func_(func)
@@ -73,7 +73,7 @@ namespace NLastGetopt {
 
             void HandleOpt(const TOptsParser* parser) override;
         };
- 
+
         template <typename TpFunc>
         class THandlerFunctor1<TpFunc, const TOptsParser*>
            : public IOptHandler {
@@ -84,7 +84,7 @@ namespace NLastGetopt {
                 : Func_(func)
             {
             }
- 
+
             void HandleOpt(const TOptsParser* parser) override {
                 Func_(parser);
             }
@@ -105,7 +105,7 @@ namespace NLastGetopt {
                 *Target_ = val;
             }
         };
- 
+
         template <typename TpTarget, typename TpFunc, typename TpVal = TpTarget>
         class TStoreMappedResultFunctor {
         private:
diff --git a/library/cpp/getopt/small/opt.cpp b/library/cpp/getopt/small/opt.cpp
index 356439eb38..744501765c 100644
--- a/library/cpp/getopt/small/opt.cpp
+++ b/library/cpp/getopt/small/opt.cpp
@@ -27,13 +27,13 @@ void Opt::Init(int argc, char* argv[], const char* optString, const Ion* longOpt
         TOpt* opt;
         if ((unsigned)o->val < 0x80 && isalnum(o->val)) {
             opt = &Opts_->CharOption(char(o->val));
-            opt->AddLongName(o->name); 
+            opt->AddLongName(o->name);
         } else {
             Opts_->AddLongOption(o->name);
             opt = const_cast<TOpt*>(&Opts_->GetLongOption(o->name));
         }
         opt->HasArg_ = EHasArg(o->has_arg);
-        opt->UserValue(o); 
+        opt->UserValue(o);
     }
     Opts_->AllowSingleDashForLong_ = longOnly;
     Opts_->AllowPlusForLong_ = true;
@@ -68,7 +68,7 @@ int Opt::Get(int* longOptionIndex) {
             return EOF;
         } else {
             Arg = (char*)OptsParser_->CurVal();
-            if (!OptsParser_->CurOpt()) { 
+            if (!OptsParser_->CurOpt()) {
                 // possible if RETURN_IN_ORDER
                 return 1;
             } else {
@@ -76,7 +76,7 @@ int Opt::Get(int* longOptionIndex) {
                 if (longOptionIndex) {
                     *longOptionIndex = int(ion - Ions_);
                 }
-                char c = OptsParser_->CurOpt()->GetCharOr0(); 
+                char c = OptsParser_->CurOpt()->GetCharOr0();
                 return c != 0 ? c : ion->val;
             }
         }
@@ -89,7 +89,7 @@ int Opt::Get(int* longOptionIndex) {
 }
 
 void Opt::DummyHelp(IOutputStream& os) {
-    Opts_->PrintUsage(GetProgramName(), os); 
+    Opts_->PrintUsage(GetProgramName(), os);
 }
 
 int Opt::GetArgC() const {
diff --git a/library/cpp/getopt/small/opt.h b/library/cpp/getopt/small/opt.h
index 404965c0d7..ecb57439bc 100644
--- a/library/cpp/getopt/small/opt.h
+++ b/library/cpp/getopt/small/opt.h
@@ -129,7 +129,7 @@ int opt_get_number(int& argc, char* argv[]);
     }                     \
     break;
 
-#define OPTION_HANDLE(opt, handle) \ 
+#define OPTION_HANDLE(opt, handle) \
     OPTION_HANDLE_BEGIN(opt)       \
     handle;                        \
     OPTION_HANDLE_END
diff --git a/library/cpp/getopt/small/posix_getopt.cpp b/library/cpp/getopt/small/posix_getopt.cpp
index bbe89080a5..bd06f3499f 100644
--- a/library/cpp/getopt/small/posix_getopt.cpp
+++ b/library/cpp/getopt/small/posix_getopt.cpp
@@ -29,13 +29,13 @@ namespace NLastGetopt {
                 TOpt* opt;
                 if ((unsigned)o->val < 0x80 && isalnum(o->val)) {
                     opt = &Opts->CharOption(char(o->val));
-                    opt->AddLongName(o->name); 
+                    opt->AddLongName(o->name);
                 } else {
                     Opts->AddLongOption(o->name);
                     opt = const_cast<TOpt*>(&Opts->GetLongOption(o->name));
                 }
                 opt->HasArg_ = EHasArg(o->has_arg);
-                opt->UserValue(o->flag); 
+                opt->UserValue(o->flag);
             }
 
             OptsParser.Reset(new TOptsParser(&*Opts, argc, (const char**)argv));
diff --git a/library/cpp/getopt/ut/last_getopt_ut.cpp b/library/cpp/getopt/ut/last_getopt_ut.cpp
index fcdd8dcbf1..c99a1d053d 100644
--- a/library/cpp/getopt/ut/last_getopt_ut.cpp
+++ b/library/cpp/getopt/ut/last_getopt_ut.cpp
@@ -50,35 +50,35 @@ struct TOptsParserTester {
 
     void AcceptOption() {
         Accept();
-        UNIT_ASSERT(!!Parser_->CurOpt()); 
+        UNIT_ASSERT(!!Parser_->CurOpt());
     }
 
     void AcceptOption(char c) {
         AcceptOption();
-        UNIT_ASSERT(Parser_->CurOpt()->CharIs(c)); 
+        UNIT_ASSERT(Parser_->CurOpt()->CharIs(c));
     }
 
     void AcceptOption(const TString& optName) {
         AcceptOption();
-        UNIT_ASSERT(Parser_->CurOpt()->NameIs(optName)); 
+        UNIT_ASSERT(Parser_->CurOpt()->NameIs(optName));
     }
 
     template <typename TOpt>
     void AcceptOptionWithValue(TOpt optName, const TString& value) {
         AcceptOption(optName);
-        UNIT_ASSERT_VALUES_EQUAL_C(value, Parser_->CurValStr(), "; option " << optName); 
+        UNIT_ASSERT_VALUES_EQUAL_C(value, Parser_->CurValStr(), "; option " << optName);
     }
 
     template <typename TOpt>
     void AcceptOptionWithoutValue(TOpt optName) {
         AcceptOption(optName);
-        UNIT_ASSERT_C(!Parser_->CurVal(), ": opt " << optName << " must have no param"); 
+        UNIT_ASSERT_C(!Parser_->CurVal(), ": opt " << optName << " must have no param");
     }
 
     void AcceptFreeArgInOrder(const TString& expected) {
         Accept();
-        UNIT_ASSERT(!Parser_->CurOpt()); 
-        UNIT_ASSERT_VALUES_EQUAL(expected, Parser_->CurValStr()); 
+        UNIT_ASSERT(!Parser_->CurOpt());
+        UNIT_ASSERT_VALUES_EQUAL(expected, Parser_->CurValStr());
     }
 
     size_t Pos_;
@@ -159,7 +159,7 @@ Y_UNIT_TEST_SUITE(TLastGetoptTests) {
         UNIT_ASSERT(r.Has('l'));
         UNIT_ASSERT(!r.Has('h'));
 
-        UNIT_ASSERT_VALUES_EQUAL(2u, r.GetFreeArgs().size()); 
+        UNIT_ASSERT_VALUES_EQUAL(2u, r.GetFreeArgs().size());
         UNIT_ASSERT_VALUES_EQUAL(2u, r.GetFreeArgCount());
         UNIT_ASSERT_VALUES_EQUAL("/etc", r.GetFreeArgs()[0]);
         UNIT_ASSERT_VALUES_EQUAL("/tmp/etc", r.GetFreeArgs()[1]);
@@ -372,7 +372,7 @@ Y_UNIT_TEST_SUITE(TLastGetoptTests) {
 
         tester.AcceptEndOfOptions();
 
-        UNIT_ASSERT_VALUES_EQUAL(1u, tester.Parser_->Pos_); 
+        UNIT_ASSERT_VALUES_EQUAL(1u, tester.Parser_->Pos_);
     }
 
     Y_UNIT_TEST(TestExpectedUnknownCharOption) {
@@ -451,7 +451,7 @@ Y_UNIT_TEST_SUITE(TLastGetoptTests) {
         UNIT_ASSERT_VALUES_EQUAL(42, a);
         UNIT_ASSERT_VALUES_EQUAL(0, b);
         UNIT_ASSERT(e == REQUIRED_ARGUMENT);
-        UNIT_ASSERT_VALUES_EQUAL(12345u, c); 
+        UNIT_ASSERT_VALUES_EQUAL(12345u, c);
     }
 
     Y_UNIT_TEST(TestSetFlag) {
@@ -519,61 +519,61 @@ Y_UNIT_TEST_SUITE(TLastGetoptTests) {
 
     Y_UNIT_TEST(TestRequiredOpts) {
         TOptsNoDefault opts;
-        TOpt& opt_d = opts.AddCharOption('d'); 
- 
-        // test 'not required' 
-        // makes sure that the problem will only be in 'required' 
+        TOpt& opt_d = opts.AddCharOption('d');
+
+        // test 'not required'
+        // makes sure that the problem will only be in 'required'
         TOptsParseResultTestWrapper r1(&opts, V({"cmd"}));
- 
-        // test 'required' 
-        opt_d.Required(); 
+
+        // test 'required'
+        opt_d.Required();
         UNIT_ASSERT_EXCEPTION(
             TOptsParseResultTestWrapper(&opts, V({"cmd"})),
             TUsageException);
- 
+
         TOptsParseResultTestWrapper r3(&opts, V({"cmd", "-d11"}));
-        UNIT_ASSERT_VALUES_EQUAL("11", r3.Get('d')); 
-    } 
- 
+        UNIT_ASSERT_VALUES_EQUAL("11", r3.Get('d'));
+    }
+
     class HandlerStoreTrue {
         bool* Flag;
 
-    public: 
+    public:
         HandlerStoreTrue(bool* flag)
-            : Flag(flag) 
+            : Flag(flag)
         {
         }
         void operator()() {
-            *Flag = true; 
-        } 
-    }; 
+            *Flag = true;
+        }
+    };
     Y_UNIT_TEST(TestHandlers) {
-        { 
+        {
             TOptsNoDefault opts;
-            bool flag = false; 
-            opts.AddLongOption("flag").Handler0(HandlerStoreTrue(&flag)).NoArgument(); 
+            bool flag = false;
+            opts.AddLongOption("flag").Handler0(HandlerStoreTrue(&flag)).NoArgument();
             TOptsParseResultTestWrapper r(&opts, V({"cmd", "--flag"}));
-            UNIT_ASSERT(flag); 
-        } 
-        { 
+            UNIT_ASSERT(flag);
+        }
+        {
             TOptsNoDefault opts;
-            unsigned uval = 5; 
-            double fval = 0.0; 
-            opts.AddLongOption("flag1").RequiredArgument().StoreResult(&uval); 
-            opts.AddLongOption("flag2").RequiredArgument().StoreResultT<int>(&uval); 
+            unsigned uval = 5;
+            double fval = 0.0;
+            opts.AddLongOption("flag1").RequiredArgument().StoreResult(&uval);
+            opts.AddLongOption("flag2").RequiredArgument().StoreResultT<int>(&uval);
             opts.AddLongOption("flag3").RequiredArgument().StoreMappedResult(&fval, (double (*)(double))fabs);
             opts.AddLongOption("flag4").RequiredArgument().StoreMappedResult(&fval, (double (*)(double))sqrt);
             UNIT_ASSERT_EXCEPTION(
                 TOptsParseResultTestWrapper(&opts, V({"cmd", "--flag3", "-2.0", "--flag1", "-1"})),
                 yexception);
-            UNIT_ASSERT_VALUES_EQUAL(uval, 5u); 
-            UNIT_ASSERT_VALUES_EQUAL(fval, 2.0); 
+            UNIT_ASSERT_VALUES_EQUAL(uval, 5u);
+            UNIT_ASSERT_VALUES_EQUAL(fval, 2.0);
             TOptsParseResultTestWrapper r1(&opts, V({"cmd", "--flag4", "9.0", "--flag2", "-1"}));
-            UNIT_ASSERT_VALUES_EQUAL(uval, Max<unsigned>()); 
-            UNIT_ASSERT_VALUES_EQUAL(fval, 3.0); 
-        } 
-    } 
- 
+            UNIT_ASSERT_VALUES_EQUAL(uval, Max<unsigned>());
+            UNIT_ASSERT_VALUES_EQUAL(fval, 3.0);
+        }
+    }
+
     Y_UNIT_TEST(TestTitleAndPrintUsage) {
         TOpts opts;
         const char* prog = "my_program";
diff --git a/library/cpp/getopt/ut/opt2_ut.cpp b/library/cpp/getopt/ut/opt2_ut.cpp
index 9322f24e51..0e7464747c 100644
--- a/library/cpp/getopt/ut/opt2_ut.cpp
+++ b/library/cpp/getopt/ut/opt2_ut.cpp
@@ -35,7 +35,7 @@ Y_UNIT_TEST_SUITE(Opt2Test) {
         UNIT_ASSERT_VALUES_EQUAL(8, d);
         UNIT_ASSERT_VALUES_EQUAL((void*)edef, e);
 
-        UNIT_ASSERT_VALUES_EQUAL(2u, opt.Pos.size()); 
+        UNIT_ASSERT_VALUES_EQUAL(2u, opt.Pos.size());
         UNIT_ASSERT_STRINGS_EQUAL("zz", opt.Pos.at(0));
         UNIT_ASSERT_VALUES_EQUAL((void*)argv[2], opt.Pos.at(0));
         UNIT_ASSERT_STRINGS_EQUAL("ww", opt.Pos.at(1));