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

5 files changed, 122 insertions, 122 deletions

diff --git a/util/folder/path.cpp b/util/folder/path.cpp
index 0e162cd7f62..bfe0c67d687 100644
--- a/util/folder/path.cpp
+++ b/util/folder/path.cpp
@@ -363,7 +363,7 @@ void TFsPath::DeleteIfExists() const {
     }
 }
 
-void TFsPath::MkDir(const int mode) const { 
+void TFsPath::MkDir(const int mode) const {
     CheckDefined();
     if (!Exists()) {
         int r = Mkdir(this->c_str(), mode);
@@ -378,11 +378,11 @@ void TFsPath::MkDir(const int mode) const {
     }
 }
 
-void TFsPath::MkDirs(const int mode) const { 
+void TFsPath::MkDirs(const int mode) const {
     CheckDefined();
     if (!Exists()) {
-        Parent().MkDirs(mode); 
-        MkDir(mode); 
+        Parent().MkDirs(mode);
+        MkDir(mode);
     }
 }
 
diff --git a/util/folder/path.h b/util/folder/path.h
index e562786c5c9..2fb4d6b4ef3 100644
--- a/util/folder/path.h
+++ b/util/folder/path.h
@@ -10,7 +10,7 @@
 #include <util/string/cast.h>
 #include <util/system/fstat.h>
 #include <util/system/platform.h>
-#include <util/system/sysstat.h> 
+#include <util/system/sysstat.h>
 #include <util/system/yassert.h>
 
 #include <utility>
@@ -135,22 +135,22 @@ public:
 
     TFsPath Child(const TString& name) const;
 
-    /** 
-     * @brief create this directory 
-     * 
-     * @param mode specifies permissions to use as described in mkdir(2), makes sense only on Unix-like systems. 
+    /**
+     * @brief create this directory
+     *
+     * @param mode specifies permissions to use as described in mkdir(2), makes sense only on Unix-like systems.
      *
      * Nothing to do if dir exists.
-     */ 
-    void MkDir(const int mode = MODE0777) const; 
-
-    /** 
-     * @brief create this directory and all parent directories as needed 
-     * 
-     * @param mode specifies permissions to use as described in mkdir(2), makes sense only on Unix-like systems. 
-     */ 
-    void MkDirs(const int mode = MODE0777) const; 
- 
+     */
+    void MkDir(const int mode = MODE0777) const;
+
+    /**
+     * @brief create this directory and all parent directories as needed
+     *
+     * @param mode specifies permissions to use as described in mkdir(2), makes sense only on Unix-like systems.
+     */
+    void MkDirs(const int mode = MODE0777) const;
+
     // XXX: rewrite to return iterator
     void List(TVector<TFsPath>& children) const;
     void ListNames(TVector<TString>& children) const;
diff --git a/util/folder/path_ut.cpp b/util/folder/path_ut.cpp
index fb07bd96077..e6a34510164 100644
--- a/util/folder/path_ut.cpp
+++ b/util/folder/path_ut.cpp
@@ -248,21 +248,21 @@ Y_UNIT_TEST_SUITE(TFsPathTests) {
         UNIT_ASSERT_VALUES_EQUAL(expected, children);
     }
 
-#ifdef _unix_ 
+#ifdef _unix_
     Y_UNIT_TEST(MkDirMode) {
-        TTestDirectory td("MkDirMode"); 
-        TFsPath subDir = td.Child("subdir"); 
-        const int mode = MODE0775; 
-        subDir.MkDir(mode); 
-        TFileStat stat; 
-        UNIT_ASSERT(subDir.Stat(stat)); 
-        // mkdir(2) places umask(2) on mode argument. 
-        const int mask = Umask(0); 
-        Umask(mask); 
+        TTestDirectory td("MkDirMode");
+        TFsPath subDir = td.Child("subdir");
+        const int mode = MODE0775;
+        subDir.MkDir(mode);
+        TFileStat stat;
+        UNIT_ASSERT(subDir.Stat(stat));
+        // mkdir(2) places umask(2) on mode argument.
+        const int mask = Umask(0);
+        Umask(mask);
         UNIT_ASSERT_VALUES_EQUAL(stat.Mode& MODE0777, mode & ~mask);
-    } 
-#endif 
- 
+    }
+#endif
+
     Y_UNIT_TEST(Cwd) {
         UNIT_ASSERT_VALUES_EQUAL(TFsPath::Cwd().RealPath(), TFsPath(".").RealPath());
     }
diff --git a/util/network/sock.h b/util/network/sock.h
index 503d0b9e347..b10be2f7156 100644
--- a/util/network/sock.h
+++ b/util/network/sock.h
@@ -210,10 +210,10 @@ struct TSockAddrInet: public sockaddr_in, public ISockAddr {
         Set(ip, port);
     }
 
-    TSockAddrInet(const char* ip, TIpPort port) { 
-        Set(IpFromString(ip), port); 
-    } 
- 
+    TSockAddrInet(const char* ip, TIpPort port) {
+        Set(IpFromString(ip), port);
+    }
+
     socklen_t Size() const override {
         return sizeof(sockaddr_in);
     }
@@ -272,73 +272,73 @@ struct TSockAddrInet: public sockaddr_in, public ISockAddr {
 };
 
 struct TSockAddrInet6: public sockaddr_in6, public ISockAddr {
-    TSockAddrInet6() { 
-        Clear(); 
-    } 
- 
-    TSockAddrInet6(const char* ip6, const TIpPort port) { 
-        Set(ip6, port); 
-    } 
- 
+    TSockAddrInet6() {
+        Clear();
+    }
+
+    TSockAddrInet6(const char* ip6, const TIpPort port) {
+        Set(ip6, port);
+    }
+
     socklen_t Size() const override {
-        return sizeof(sockaddr_in6); 
-    } 
- 
+        return sizeof(sockaddr_in6);
+    }
+
     socklen_t Len() const override {
-        return Size(); 
-    } 
- 
+        return Size();
+    }
+
     inline void Clear() noexcept {
-        Zero(*(sockaddr_in6*)this); 
-    } 
- 
+        Zero(*(sockaddr_in6*)this);
+    }
+
     inline void Set(const char* ip6, const TIpPort port) noexcept {
-        Clear(); 
-        sin6_family = AF_INET6; 
-        inet_pton(AF_INET6, ip6, &sin6_addr); 
-        sin6_port = HostToInet(port); 
-    } 
- 
+        Clear();
+        sin6_family = AF_INET6;
+        inet_pton(AF_INET6, ip6, &sin6_addr);
+        sin6_port = HostToInet(port);
+    }
+
     sockaddr* SockAddr() override {
         return (struct sockaddr*)(struct sockaddr_in6*)this;
-    } 
- 
+    }
+
     const sockaddr* SockAddr() const override {
         return (const struct sockaddr*)(const struct sockaddr_in6*)this;
-    } 
- 
+    }
+
     TString ToString() const override {
-        return "[" + GetIp() + "]:" + ::ToString(InetToHost(sin6_port)); 
-    } 
- 
+        return "[" + GetIp() + "]:" + ::ToString(InetToHost(sin6_port));
+    }
+
     int Bind(SOCKET s, ui16 mode) const override {
         Y_UNUSED(mode);
-        int ret = bind(s, SockAddr(), Len()); 
-        if (ret < 0) { 
-            return -errno; 
-        } 
-        socklen_t len = Len(); 
-        if (getsockname(s, (struct sockaddr*)(SockAddr()), &len) < 0) { 
-            return -WSAGetLastError(); 
-        } 
-        return 0; 
-    } 
- 
+        int ret = bind(s, SockAddr(), Len());
+        if (ret < 0) {
+            return -errno;
+        }
+        socklen_t len = Len();
+        if (getsockname(s, (struct sockaddr*)(SockAddr()), &len) < 0) {
+            return -WSAGetLastError();
+        }
+        return 0;
+    }
+
     TString GetIp() const noexcept {
-        char ip6[INET6_ADDRSTRLEN]; 
+        char ip6[INET6_ADDRSTRLEN];
         inet_ntop(AF_INET6, (void*)&sin6_addr, ip6, INET6_ADDRSTRLEN);
         return TString(ip6);
-    } 
- 
+    }
+
     TIpPort GetPort() const noexcept {
-        return InetToHost(sin6_port); 
-    } 
+        return InetToHost(sin6_port);
+    }
 
     void SetPort(TIpPort port) noexcept {
         sin6_port = HostToInet(port);
     }
-}; 
- 
+};
+
 using TSockAddrLocalStream = TSockAddrLocal;
 using TSockAddrLocalDgram = TSockAddrLocal;
 using TSockAddrInetStream = TSockAddrInet;
@@ -496,19 +496,19 @@ public:
     }
 };
 
-class TInet6DgramSocket: public TDgramSocket { 
-public: 
-    TInet6DgramSocket(SOCKET fd) 
-        : TDgramSocket(fd) 
-    { 
-    } 
- 
-    TInet6DgramSocket() 
-        : TDgramSocket(socket(AF_INET6, SOCK_DGRAM, 0)) 
-    { 
-    } 
-}; 
- 
+class TInet6DgramSocket: public TDgramSocket {
+public:
+    TInet6DgramSocket(SOCKET fd)
+        : TDgramSocket(fd)
+    {
+    }
+
+    TInet6DgramSocket()
+        : TDgramSocket(socket(AF_INET6, SOCK_DGRAM, 0))
+    {
+    }
+};
+
 class TLocalStreamSocket: public TStreamSocket {
 public:
     TLocalStreamSocket(SOCKET fd)
@@ -535,19 +535,19 @@ public:
     }
 };
 
-class TInet6StreamSocket: public TStreamSocket { 
-public: 
-    TInet6StreamSocket(SOCKET fd) 
-        : TStreamSocket(fd) 
-    { 
-    } 
- 
-    TInet6StreamSocket() 
-        : TStreamSocket(socket(AF_INET6, SOCK_STREAM, 0)) 
-    { 
-    } 
-}; 
- 
+class TInet6StreamSocket: public TStreamSocket {
+public:
+    TInet6StreamSocket(SOCKET fd)
+        : TStreamSocket(fd)
+    {
+    }
+
+    TInet6StreamSocket()
+        : TStreamSocket(socket(AF_INET6, SOCK_STREAM, 0))
+    {
+    }
+};
+
 class TStreamSocketInput: public IInputStream {
 public:
     TStreamSocketInput(TStreamSocket* socket)
diff --git a/util/network/sock_ut.cpp b/util/network/sock_ut.cpp
index 6621e42a8ef..fd8c7837478 100644
--- a/util/network/sock_ut.cpp
+++ b/util/network/sock_ut.cpp
@@ -73,13 +73,13 @@ Y_UNIT_TEST_SUITE(TSocketTest) {
     }
 
     template <class A, class S>
-    void RunInetStreamTest(const char* ip) { 
+    void RunInetStreamTest(const char* ip) {
         char buf[256];
-        A servAddr(ip, 0); 
-        A newAddr; 
-        S cliSock; 
-        S servSock; 
-        S newSock; 
+        A servAddr(ip, 0);
+        A newAddr;
+        S cliSock;
+        S servSock;
+        S newSock;
         cliSock.CheckSock();
         servSock.CheckSock();
         newSock.CheckSock();
@@ -112,13 +112,13 @@ Y_UNIT_TEST_SUITE(TSocketTest) {
     }
 
     Y_UNIT_TEST(InetStreamTest) {
-        RunInetStreamTest<TSockAddrInetStream, TInetStreamSocket>("127.0.0.1"); 
-    } 
- 
+        RunInetStreamTest<TSockAddrInetStream, TInetStreamSocket>("127.0.0.1");
+    }
+
     Y_UNIT_TEST(Inet6StreamTest) {
-        RunInetStreamTest<TSockAddrInet6Stream, TInet6StreamSocket>("::1"); 
-    } 
- 
+        RunInetStreamTest<TSockAddrInet6Stream, TInet6StreamSocket>("::1");
+    }
+
     void RunLocalStreamTest(const char* localServerSockName) {
         char buf[256];
         TSockAddrLocalStream servAddr(localServerSockName);