Use the exact-width integer types defined in <stdint.h> rather than

net/base/net_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/net_util.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 249 matching lines @@
   const base::string16 www(base::ASCIIToUTF16("www."));
   return StartsWith(text, www, true) ? text.substr(www.length()) : text;
 }
 
 base::string16 StripWWWFromHost(const GURL& url) {
   DCHECK(url.is_valid());
   return StripWWW(base::ASCIIToUTF16(url.host()));
 }
 
 bool IsPortValid(int port) {
-  return port >= 0 && port <= std::numeric_limits<uint16>::max();
+  return port >= 0 && port <= std::numeric_limits<uint16_t>::max();
 }
 
 bool IsPortAllowedByDefault(int port) {
   int array_size = arraysize(kRestrictedPorts);
   for (int i = 0; i < array_size; i++) {
     if (kRestrictedPorts[i] == port) {
       return false;
     }
   }
   return IsPortValid(port);
@@ skipping 169 matching lines @@
 
 void SockaddrStorage::operator=(const SockaddrStorage& other) {
   addr_len = other.addr_len;
   // addr is already set to &this->addr_storage by default ctor.
   memcpy(addr, other.addr, addr_len);
 }
 
 // Extracts the address and port portions of a sockaddr.
 bool GetIPAddressFromSockAddr(const struct sockaddr* sock_addr,
                               socklen_t sock_addr_len,
-                              const uint8** address,
+                              const uint8_t** address,
                               size_t* address_len,
-                              uint16* port) {
+                              uint16_t* port) {
   if (sock_addr->sa_family == AF_INET) {
     if (sock_addr_len < static_cast<socklen_t>(sizeof(struct sockaddr_in)))
       return false;
     const struct sockaddr_in* addr =
         reinterpret_cast<const struct sockaddr_in*>(sock_addr);
-    *address = reinterpret_cast<const uint8*>(&addr->sin_addr);
+    *address = reinterpret_cast<const uint8_t*>(&addr->sin_addr);
     *address_len = kIPv4AddressSize;
     if (port)
       *port = base::NetToHost16(addr->sin_port);
     return true;
   }
 
   if (sock_addr->sa_family == AF_INET6) {
     if (sock_addr_len < static_cast<socklen_t>(sizeof(struct sockaddr_in6)))
       return false;
     const struct sockaddr_in6* addr =
         reinterpret_cast<const struct sockaddr_in6*>(sock_addr);
-    *address = reinterpret_cast<const uint8*>(&addr->sin6_addr);
+    *address = reinterpret_cast<const uint8_t*>(&addr->sin6_addr);
     *address_len = kIPv6AddressSize;
     if (port)
       *port = base::NetToHost16(addr->sin6_port);
     return true;
   }
 
 #if defined(OS_WIN)
   if (sock_addr->sa_family == AF_BTH) {
     if (sock_addr_len < static_cast<socklen_t>(sizeof(SOCKADDR_BTH)))
       return false;
     const SOCKADDR_BTH* addr =
         reinterpret_cast<const SOCKADDR_BTH*>(sock_addr);
-    *address = reinterpret_cast<const uint8*>(&addr->btAddr);
+    *address = reinterpret_cast<const uint8_t*>(&addr->btAddr);
     *address_len = kBluetoothAddressSize;
     if (port)
-      *port = static_cast<uint16>(addr->port);
+      *port = static_cast<uint16_t>(addr->port);
     return true;
   }
 #endif
 
   return false;  // Unrecognized |sa_family|.
 }
 
 std::string NetAddressToString(const struct sockaddr* sa,
                                socklen_t sock_addr_len) {
-  const uint8* address;
+  const uint8_t* address;
   size_t address_len;
   if (!GetIPAddressFromSockAddr(sa, sock_addr_len, &address,
                                 &address_len, NULL)) {
     NOTREACHED();
     return std::string();
   }
   return IPAddressToString(address, address_len);
 }
 
 std::string NetAddressToStringWithPort(const struct sockaddr* sa,
                                        socklen_t sock_addr_len) {
-  const uint8* address;
+  const uint8_t* address;
   size_t address_len;
-  uint16 port;
+  uint16_t port;
   if (!GetIPAddressFromSockAddr(sa, sock_addr_len, &address,
                                 &address_len, &port)) {
     NOTREACHED();
     return std::string();
   }
   return IPAddressToStringWithPort(address, address_len, port);
 }
 
 std::string GetHostName() {
 #if defined(OS_NACL)
@@ skipping 158 matching lines @@
       return AF_UNSPEC;
     case ADDRESS_FAMILY_IPV4:
       return AF_INET;
     case ADDRESS_FAMILY_IPV6:
       return AF_INET6;
   }
   NOTREACHED();
   return AF_UNSPEC;
 }
 
-const uint16* GetPortFieldFromSockaddr(const struct sockaddr* address,
-                                       socklen_t address_len) {
+const uint16_t* GetPortFieldFromSockaddr(const struct sockaddr* address,
+                                         socklen_t address_len) {
   if (address->sa_family == AF_INET) {
     DCHECK_LE(sizeof(sockaddr_in), static_cast<size_t>(address_len));
     const struct sockaddr_in* sockaddr =
         reinterpret_cast<const struct sockaddr_in*>(address);
     return &sockaddr->sin_port;
   } else if (address->sa_family == AF_INET6) {
     DCHECK_LE(sizeof(sockaddr_in6), static_cast<size_t>(address_len));
     const struct sockaddr_in6* sockaddr =
         reinterpret_cast<const struct sockaddr_in6*>(address);
     return &sockaddr->sin6_port;
   } else {
     NOTREACHED();
     return NULL;
   }
 }
 
 int GetPortFromSockaddr(const struct sockaddr* address, socklen_t address_len) {
-  const uint16* port_field = GetPortFieldFromSockaddr(address, address_len);
+  const uint16_t* port_field = GetPortFieldFromSockaddr(address, address_len);
   if (!port_field)
     return -1;
   return base::NetToHost16(*port_field);
 }
 
 bool IsLocalhost(const std::string& host) {
   if (host == "localhost" || host == "localhost.localdomain" ||
       host == "localhost6" || host == "localhost6.localdomain6" ||
       IsLocalhostTLD(host))
     return true;
@@ skipping 60 matching lines @@
   };
   const std::string& host = url.host();
   for (const char* suffix : kGoogleHostSuffixes) {
     if (EndsWith(host, suffix, false))
       return true;
   }
   return false;
 }
 
 }  // namespace net