Use suffixed {uint,int}{8,16,32,64}_t types.

webrtc/base/winping.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 108 matching lines @@
 // Global Constants and Types
 //////////////////////////////////////////////////////////////////////
 
 const char * const ICMP_DLL_NAME = "Iphlpapi.dll";
 const char * const ICMP_CREATE_FUNC = "IcmpCreateFile";
 const char * const ICMP_CLOSE_FUNC = "IcmpCloseHandle";
 const char * const ICMP_SEND_FUNC = "IcmpSendEcho";
 const char * const ICMP6_CREATE_FUNC = "Icmp6CreateFile";
 const char * const ICMP6_SEND_FUNC = "Icmp6SendEcho2";
 
-inline uint32 ReplySize(uint32 data_size, int family) {
+inline uint32_t ReplySize(uint32_t data_size, int family) {
   if (family == AF_INET) {
     // A ping error message is 8 bytes long, so make sure we allow for at least
     // 8 bytes of reply data.
-    return sizeof(ICMP_ECHO_REPLY) + std::max<uint32>(8, data_size);
+    return sizeof(ICMP_ECHO_REPLY) + std::max<uint32_t>(8, data_size);
   } else if (family == AF_INET6) {
     // Per MSDN, Send6IcmpEcho2 needs at least one ICMPV6_ECHO_REPLY,
     // 8 bytes for ICMP header, _and_ an IO_BLOCK_STATUS (2 pointers),
     // in addition to the data size.
     return sizeof(ICMPV6_ECHO_REPLY) + data_size + 8 + (2 * sizeof(DWORD*));
   } else {
     return 0;
   }
 }
 
@@ skipping 57 matching lines @@
     }
   }
 
   if (dll_)
     FreeLibrary(dll_);
 
   delete[] data_;
   delete[] reply_;
 }
 
-WinPing::PingResult WinPing::Ping(
-    IPAddress ip, uint32 data_size, uint32 timeout, uint8 ttl,
-    bool allow_fragments) {
-
+WinPing::PingResult WinPing::Ping(IPAddress ip,
+                                  uint32_t data_size,
+                                  uint32_t timeout,
+                                  uint8_t ttl,
+                                  bool allow_fragments) {
   if (data_size == 0 || timeout == 0 || ttl == 0) {
     LOG(LERROR) << "IcmpSendEcho: data_size/timeout/ttl is 0.";
     return PING_INVALID_PARAMS;
   }
 
   assert(IsValid());
 
   IP_OPTION_INFORMATION ipopt;
   memset(&ipopt, 0, sizeof(ipopt));
   if (!allow_fragments)
     ipopt.Flags |= IP_FLAG_DF;
   ipopt.Ttl = ttl;
 
-  uint32 reply_size = ReplySize(data_size, ip.family());
+  uint32_t reply_size = ReplySize(data_size, ip.family());
 
   if (data_size > dlen_) {
     delete [] data_;
     dlen_ = data_size;
     data_ = new char[dlen_];
     memset(data_, 'z', dlen_);
   }
 
   if (reply_size > rlen_) {
     delete [] reply_;
     rlen_ = reply_size;
     reply_ = new char[rlen_];
   }
   DWORD result = 0;
   if (ip.family() == AF_INET) {
-    result = send_(hping_, ip.ipv4_address().S_un.S_addr,
-                   data_, uint16(data_size), &ipopt,
-                   reply_, reply_size, timeout);
+    result = send_(hping_, ip.ipv4_address().S_un.S_addr, data_,
+                   uint16_t(data_size), &ipopt, reply_, reply_size, timeout);
   } else if (ip.family() == AF_INET6) {
     sockaddr_in6 src = {0};
     sockaddr_in6 dst = {0};
     src.sin6_family = AF_INET6;
     dst.sin6_family = AF_INET6;
     dst.sin6_addr = ip.ipv6_address();
-    result = send6_(hping6_, NULL, NULL, NULL,
-                    &src, &dst,
-                    data_, int16(data_size), &ipopt,
-                    reply_, reply_size, timeout);
+    result = send6_(hping6_, NULL, NULL, NULL, &src, &dst, data_,
+                    int16_t(data_size), &ipopt, reply_, reply_size, timeout);
   }
   if (result == 0) {
     DWORD error = GetLastError();
     if (error == IP_PACKET_TOO_BIG)
       return PING_TOO_LARGE;
     if (error == IP_REQ_TIMED_OUT)
       return PING_TIMEOUT;
     LOG(LERROR) << "IcmpSendEcho(" << ip.ToSensitiveString()
                 << ", " << data_size << "): " << error;
     return PING_FAIL;
@@ skipping 84 matching lines @@
 // Return Value:
 //
 //     Returns the number of ICMP_ECHO_REPLY structures stored in ReplyBuffer.
 //     The status of each reply is contained in the structure. If the return
 //     value is zero, extended error information is available via
 //     GetLastError().
 //
 //////////////////////////////////////////////////////////////////////
 
 } // namespace rtc