More uniform style [#CLICKHOUSE-3281].

dbms/src/Common/formatIPv6.cpp

@@ -54,7 +54,7 @@ static void formatIPv4(const unsigned char * src, char *& dst, UInt8 zeroed_tail
 void formatIPv6(const unsigned char * src, char *& dst, UInt8 zeroed_tail_bytes_count)
 {
     struct { int base, len; } best{-1}, cur{-1};
-    std::array<uint16_t, IPV6_BINARY_LENGTH / sizeof(uint16_t)> words{};
+    std::array<UInt16, IPV6_BINARY_LENGTH / sizeof(UInt16)> words{};
 
     /** Preprocess:
         *    Copy the input (bytewise) array into a wordwise array.

dbms/src/Functions/FunctionsCoding.h

@@ -325,7 +325,7 @@ public:
         auto endp = tp + ipv6_bytes_length;
         auto curtok = src;
         auto saw_xdigit = false;
-        uint16_t val{};
+        UInt16 val{};
         unsigned char * colonp = nullptr;
 
         while (const auto ch = *src++)
@@ -355,7 +355,7 @@ public:
                     continue;
                 }
 
-                if (tp + sizeof(uint16_t) > endp)
+                if (tp + sizeof(UInt16) > endp)
                     return clear_dst();
 
                 *tp++ = static_cast<unsigned char>((val >> 8) & 0xffu);
@@ -380,7 +380,7 @@ public:
 
         if (saw_xdigit)
         {
-            if (tp + sizeof(uint16_t) > endp)
+            if (tp + sizeof(UInt16) > endp)
                 return clear_dst();
 
             *tp++ = static_cast<unsigned char>((val >> 8) & 0xffu);

dbms/src/Interpreters/DNSCache.cpp

@@ -59,7 +59,7 @@ static void splitHostAndPort(const std::string & host_and_port, std::string & ou
     {
         struct servent * se = getservbyname(port_str.c_str(), nullptr);
         if (se)
-            out_port = ntohs(static_cast<uint16_t>(se->s_port));
+            out_port = ntohs(static_cast<UInt16>(se->s_port));
         else
             throw Exception("Service not found", ErrorCodes::BAD_ARGUMENTS);
     }

dbms/src/Server/Server.cpp

@@ -321,7 +321,7 @@ int Server::main(const std::vector<std::string> & args)
             try_listen = true;
         }
 
-        auto make_socket_address = [&](const std::string & host, std::uint16_t port) {
+        auto make_socket_address = [&](const std::string & host, UInt16 port) {
             Poco::Net::SocketAddress socket_address;
             try
             {