Switch to standard integer types in net/.

net/tools/flip_server/http_interface.cc

 // Copyright (c) 2009 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/tools/flip_server/http_interface.h"
 
 #include "net/tools/balsa/balsa_frame.h"
 #include "net/tools/flip_server/flip_config.h"
 #include "net/tools/flip_server/sm_connection.h"
 #include "net/tools/flip_server/spdy_util.h"
@@ skipping 69 matching lines @@
 void HttpSM::HandleBodyError(BalsaFrame* framer) { HandleError(); }
 
 void HttpSM::HandleError() {
   VLOG(1) << ACCEPTOR_CLIENT_IDENT << "Error detected";
 }
 
 void HttpSM::AddToOutputOrder(const MemCacheIter& mci) {
   output_ordering_.AddToOutputOrder(mci);
 }
 
-void HttpSM::InitSMInterface(SMInterface* sm_spdy_interface, int32 server_idx) {
+void HttpSM::InitSMInterface(SMInterface* sm_spdy_interface,
+                             int32_t server_idx) {
   sm_spdy_interface_ = sm_spdy_interface;
   server_idx_ = server_idx;
 }
 
 void HttpSM::InitSMConnection(SMConnectionPoolInterface* connection_pool,
                               SMInterface* sm_interface,
                               EpollServer* epoll_server,
                               int fd,
                               std::string server_ip,
                               std::string server_port,
@@ skipping 27 matching lines @@
   data_frame->size = len;
   data_frame->delete_when_done = true;
   connection_->EnqueueDataFrame(data_frame);
   return len;
 }
 
 bool HttpSM::MessageFullyRead() const {
   return http_framer_->MessageFullyRead();
 }
 
-void HttpSM::SetStreamID(uint32 stream_id) { stream_id_ = stream_id; }
+void HttpSM::SetStreamID(uint32_t stream_id) {
+  stream_id_ = stream_id;
+}
 
 bool HttpSM::Error() const { return http_framer_->Error(); }
 
 const char* HttpSM::ErrorAsString() const {
   return BalsaFrameEnums::ErrorCodeToString(http_framer_->ErrorCode());
 }
 
 void HttpSM::Reset() {
   VLOG(1) << ACCEPTOR_CLIENT_IDENT << "HttpSM: Reset: stream " << stream_id_;
   http_framer_->Reset();
@@ skipping 21 matching lines @@
 
 void HttpSM::Cleanup() {
   if (!(acceptor_->flip_handler_type_ == FLIP_HANDLER_HTTP_SERVER)) {
     VLOG(2) << "HttpSM Request Fully Read; stream_id: " << stream_id_;
     connection_->Cleanup("request complete");
   }
 }
 
 int HttpSM::PostAcceptHook() { return 1; }
 
-void HttpSM::NewStream(uint32 stream_id,
-                       uint32 priority,
+void HttpSM::NewStream(uint32_t stream_id,
+                       uint32_t priority,
                        const std::string& filename) {
   MemCacheIter mci;
   mci.stream_id = stream_id;
   mci.priority = priority;
   if (!memory_cache_->AssignFileData(filename, &mci)) {
     // error creating new stream.
     VLOG(2) << ACCEPTOR_CLIENT_IDENT << "Sending ErrorNotFound";
     SendErrorNotFound(stream_id);
   } else {
     AddToOutputOrder(mci);
   }
 }
 
-void HttpSM::SendEOF(uint32 stream_id) {
+void HttpSM::SendEOF(uint32_t stream_id) {
   SendEOFImpl(stream_id);
   if (acceptor_->flip_handler_type_ == FLIP_HANDLER_PROXY) {
     sm_spdy_interface_->ResetForNewInterface(server_idx_);
   }
 }
 
-void HttpSM::SendErrorNotFound(uint32 stream_id) {
+void HttpSM::SendErrorNotFound(uint32_t stream_id) {
   SendErrorNotFoundImpl(stream_id);
 }
 
-size_t HttpSM::SendSynStream(uint32 stream_id, const BalsaHeaders& headers) {
+size_t HttpSM::SendSynStream(uint32_t stream_id, const BalsaHeaders& headers) {
   return 0;
 }
 
-size_t HttpSM::SendSynReply(uint32 stream_id, const BalsaHeaders& headers) {
+size_t HttpSM::SendSynReply(uint32_t stream_id, const BalsaHeaders& headers) {
   return SendSynReplyImpl(stream_id, headers);
 }
 
-void HttpSM::SendDataFrame(uint32 stream_id,
+void HttpSM::SendDataFrame(uint32_t stream_id,
                            const char* data,
-                           int64 len,
-                           uint32 flags,
+                           int64_t len,
+                           uint32_t flags,
                            bool compress) {
   SendDataFrameImpl(stream_id, data, len, flags, compress);
 }
 
-void HttpSM::SendEOFImpl(uint32 stream_id) {
+void HttpSM::SendEOFImpl(uint32_t stream_id) {
   DataFrame* df = new DataFrame;
   df->data = "0\r\n\r\n";
   df->size = 5;
   df->delete_when_done = false;
   EnqueueDataFrame(df);
   if (acceptor_->flip_handler_type_ == FLIP_HANDLER_HTTP_SERVER) {
     Reset();
   }
 }
 
-void HttpSM::SendErrorNotFoundImpl(uint32 stream_id) {
+void HttpSM::SendErrorNotFoundImpl(uint32_t stream_id) {
   BalsaHeaders my_headers;
   my_headers.SetFirstlineFromStringPieces("HTTP/1.1", "404", "Not Found");
   my_headers.RemoveAllOfHeader("content-length");
   my_headers.AppendHeader("transfer-encoding", "chunked");
   SendSynReplyImpl(stream_id, my_headers);
   SendDataFrame(stream_id, "page not found", 14, 0, false);
   SendEOFImpl(stream_id);
   output_ordering_.RemoveStreamId(stream_id);
 }
 
-size_t HttpSM::SendSynReplyImpl(uint32 stream_id, const BalsaHeaders& headers) {
+size_t HttpSM::SendSynReplyImpl(uint32_t stream_id,
+                                const BalsaHeaders& headers) {
   SimpleBuffer sb;
   headers.WriteHeaderAndEndingToBuffer(&sb);
   DataFrame* df = new DataFrame;
   df->size = sb.ReadableBytes();
   char* buffer = new char[df->size];
   df->data = buffer;
   df->delete_when_done = true;
   sb.Read(buffer, df->size);
   VLOG(2) << ACCEPTOR_CLIENT_IDENT << "Sending HTTP Reply header "
           << stream_id_;
   size_t df_size = df->size;
   EnqueueDataFrame(df);
   return df_size;
 }
 
-size_t HttpSM::SendSynStreamImpl(uint32 stream_id,
+size_t HttpSM::SendSynStreamImpl(uint32_t stream_id,
                                  const BalsaHeaders& headers) {
   SimpleBuffer sb;
   headers.WriteHeaderAndEndingToBuffer(&sb);
   DataFrame* df = new DataFrame;
   df->size = sb.ReadableBytes();
   char* buffer = new char[df->size];
   df->data = buffer;
   df->delete_when_done = true;
   sb.Read(buffer, df->size);
   VLOG(2) << ACCEPTOR_CLIENT_IDENT << "Sending HTTP Reply header "
           << stream_id_;
   size_t df_size = df->size;
   EnqueueDataFrame(df);
   return df_size;
 }
 
-void HttpSM::SendDataFrameImpl(uint32 stream_id,
+void HttpSM::SendDataFrameImpl(uint32_t stream_id,
                                const char* data,
-                               int64 len,
-                               uint32 flags,
+                               int64_t len,
+                               uint32_t flags,
                                bool compress) {
   char chunk_buf[128];
   snprintf(chunk_buf, sizeof(chunk_buf), "%x\r\n", (unsigned int)len);
   std::string chunk_description(chunk_buf);
   DataFrame* df = new DataFrame;
   df->size = chunk_description.size() + len + 2;
   char* buffer = new char[df->size];
   df->data = buffer;
   df->delete_when_done = true;
   memcpy(buffer, chunk_description.data(), chunk_description.size());
@@ skipping 40 matching lines @@
                 num_to_write,
                 0,
                 true);
   VLOG(2) << ACCEPTOR_CLIENT_IDENT << "HttpSM: GetOutput SendDataFrame["
           << mci->stream_id << "]: " << num_to_write;
   mci->body_bytes_consumed += num_to_write;
   mci->bytes_sent += num_to_write;
 }
 
 }  // namespace net