Switch to standard integer types in net/.

net/spdy/spdy_frame_reader.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 <limits>
 
 #include "base/sys_byteorder.h"
 #include "net/spdy/spdy_frame_reader.h"
 #include "net/spdy/spdy_protocol.h"
 
 namespace net {
 
 SpdyFrameReader::SpdyFrameReader(const char* data, const size_t len)
     : data_(data),
       len_(len),
       ofs_(0) {
 }
 
-bool SpdyFrameReader::ReadUInt8(uint8* result) {
-  // Make sure that we have the whole uint8.
+bool SpdyFrameReader::ReadUInt8(uint8_t* result) {
+  // Make sure that we have the whole uint8_t.
   if (!CanRead(1)) {
     OnFailure();
     return false;
   }
 
   // Read into result.
-  *result = *reinterpret_cast<const uint8*>(data_ + ofs_);
+  *result = *reinterpret_cast<const uint8_t*>(data_ + ofs_);
 
   // Iterate.
   ofs_ += 1;
 
   return true;
 }
 
-bool SpdyFrameReader::ReadUInt16(uint16* result) {
-  // Make sure that we have the whole uint16.
+bool SpdyFrameReader::ReadUInt16(uint16_t* result) {
+  // Make sure that we have the whole uint16_t.
   if (!CanRead(2)) {
     OnFailure();
     return false;
   }
 
   // Read into result.
-  *result = base::NetToHost16(*(reinterpret_cast<const uint16*>(data_ + ofs_)));
+  *result =
+      base::NetToHost16(*(reinterpret_cast<const uint16_t*>(data_ + ofs_)));
 
   // Iterate.
   ofs_ += 2;
 
   return true;
 }
 
-bool SpdyFrameReader::ReadUInt32(uint32* result) {
-  // Make sure that we have the whole uint32.
+bool SpdyFrameReader::ReadUInt32(uint32_t* result) {
+  // Make sure that we have the whole uint32_t.
   if (!CanRead(4)) {
     OnFailure();
     return false;
   }
 
   // Read into result.
-  *result = base::NetToHost32(*(reinterpret_cast<const uint32*>(data_ + ofs_)));
+  *result =
+      base::NetToHost32(*(reinterpret_cast<const uint32_t*>(data_ + ofs_)));
 
   // Iterate.
   ofs_ += 4;
 
   return true;
 }
 
-bool SpdyFrameReader::ReadUInt64(uint64* result) {
-  // Make sure that we have the whole uint64.
+bool SpdyFrameReader::ReadUInt64(uint64_t* result) {
+  // Make sure that we have the whole uint64_t.
   if (!CanRead(8)) {
     OnFailure();
     return false;
   }
 
   // Read into result. Network byte order is big-endian.
-  uint64 upper =
-      base::NetToHost32(*(reinterpret_cast<const uint32*>(data_ + ofs_)));
-  uint64 lower =
-      base::NetToHost32(*(reinterpret_cast<const uint32*>(data_ + ofs_ + 4)));
+  uint64_t upper =
+      base::NetToHost32(*(reinterpret_cast<const uint32_t*>(data_ + ofs_)));
+  uint64_t lower =
+      base::NetToHost32(*(reinterpret_cast<const uint32_t*>(data_ + ofs_ + 4)));
   *result = (upper << 32) + lower;
 
   // Iterate.
   ofs_ += 8;
 
   return true;
 }
 
-bool SpdyFrameReader::ReadUInt31(uint32* result) {
+bool SpdyFrameReader::ReadUInt31(uint32_t* result) {
   bool success = ReadUInt32(result);
 
   // Zero out highest-order bit.
   if (success) {
     *result &= 0x7fffffff;
   }
 
   return success;
 }
 
-bool SpdyFrameReader::ReadUInt24(uint32* result) {
+bool SpdyFrameReader::ReadUInt24(uint32_t* result) {
   // Make sure that we have the whole uint24.
   if (!CanRead(3)) {
     OnFailure();
     return false;
   }
 
   // Read into result.
   *result = 0;
   memcpy(reinterpret_cast<char*>(result) + 1, data_ + ofs_, 3);
   *result = base::NetToHost32(*result);
 
   // Iterate.
   ofs_ += 3;
 
   return true;
 }
 
 bool SpdyFrameReader::ReadStringPiece16(base::StringPiece* result) {
   // Read resultant length.
-  uint16 result_len;
+  uint16_t result_len;
   if (!ReadUInt16(&result_len)) {
     // OnFailure() already called.
     return false;
   }
 
   // Make sure that we have the whole string.
   if (!CanRead(result_len)) {
     OnFailure();
     return false;
   }
 
   // Set result.
   result->set(data_ + ofs_, result_len);
 
   // Iterate.
   ofs_ += result_len;
 
   return true;
 }
 
 bool SpdyFrameReader::ReadStringPiece32(base::StringPiece* result) {
   // Read resultant length.
-  uint32 result_len;
+  uint32_t result_len;
   if (!ReadUInt32(&result_len)) {
     // OnFailure() already called.
     return false;
   }
 
   // Make sure that we have the whole string.
   if (!CanRead(result_len)) {
     OnFailure();
     return false;
   }
@@ skipping 43 matching lines @@
   return bytes <= (len_ - ofs_);
 }
 
 void SpdyFrameReader::OnFailure() {
   // Set our iterator to the end of the buffer so that further reads fail
   // immediately.
   ofs_ = len_;
 }
 
 }  // namespace net