Misc. cleanup, primarily removing unused locals.

net/spdy/spdy_frame_builder.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/spdy/spdy_frame_builder.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "net/spdy/spdy_framer.h"
@@ skipping 45 matching lines @@
   }
 
   length_ += length;
   return true;
 }
 
 bool SpdyFrameBuilder::WriteControlFrameHeader(const SpdyFramer& framer,
                                                SpdyFrameType type,
                                                uint8 flags) {
   DCHECK_GE(SPDY3, version_);
-  DCHECK_NE(-1,
-            SpdyConstants::SerializeFrameType(version_, type));
+  DCHECK(SpdyConstants::IsValidFrameType(
+      version_, SpdyConstants::SerializeFrameType(version_, type)));
   bool success = true;
   FlagsAndLength flags_length = CreateFlagsAndLength(
       flags, capacity_ - framer.GetControlFrameHeaderSize());
   success &= WriteUInt16(kControlFlagMask |
                          SpdyConstants::SerializeMajorVersion(version_));
   success &= WriteUInt16(
       SpdyConstants::SerializeFrameType(framer.protocol_version(), type));
   success &= WriteBytes(&flags_length, sizeof(flags_length));
   DCHECK_EQ(framer.GetControlFrameHeaderSize(), length());
   return success;
@@ skipping 16 matching lines @@
   flags_length.flags[0] = flags;
   success &= WriteBytes(&flags_length, sizeof(flags_length));
   DCHECK_EQ(framer.GetDataFrameMinimumSize(), length());
   return success;
 }
 
 bool SpdyFrameBuilder::BeginNewFrame(const SpdyFramer& framer,
                                      SpdyFrameType type,
                                      uint8 flags,
                                      SpdyStreamId stream_id) {
-  DCHECK(SpdyConstants::IsValidFrameType(version_,
-      SpdyConstants::SerializeFrameType(version_, type)));
+  DCHECK(SpdyConstants::IsValidFrameType(
+      version_, SpdyConstants::SerializeFrameType(version_, type)));
   DCHECK_EQ(0u, stream_id & ~kStreamIdMask);
-  DCHECK_LT(SPDY3, framer.protocol_version());
+  DCHECK_GT(framer.protocol_version(), SPDY3);
   bool success = true;
   if (length_ > 0) {
     // Update length field for previous frame.
     OverwriteLength(framer, length_ - framer.GetPrefixLength(type));
     DLOG_IF(DFATAL, SpdyConstants::GetFrameMaximumSize(version_) < length_)
         << "Frame length  " << length_
         << " is longer than the maximum allowed length.";
   }
 
   offset_ += length_;
@@ skipping 11 matching lines @@
   DCHECK_EQ(framer.GetDataFrameMinimumSize(), length_);
   return success;
 }
 
 bool SpdyFrameBuilder::WriteString(const std::string& value) {
   if (value.size() > 0xffff) {
     DCHECK(false) << "Tried to write string with length > 16bit.";
     return false;
   }
 
-  if (!WriteUInt16(static_cast<int>(value.size())))
+  if (!WriteUInt16(static_cast<uint16>(value.size())))
     return false;
 
   return WriteBytes(value.data(), static_cast<uint16>(value.size()));
 }
 
 bool SpdyFrameBuilder::WriteStringPiece32(const base::StringPiece& value) {
   if (!WriteUInt32(value.size())) {
     return false;
   }
 
@@ skipping 11 matching lines @@
   return true;
 }
 
 bool SpdyFrameBuilder::RewriteLength(const SpdyFramer& framer) {
   return OverwriteLength(framer,
                          length_ - framer.GetControlFrameHeaderSize());
 }
 
 bool SpdyFrameBuilder::OverwriteLength(const SpdyFramer& framer,
                                        size_t length) {
-  if (version_ <= SPDY3) {
-    DCHECK_GE(SpdyConstants::GetFrameMaximumSize(version_) -
-              framer.GetFrameMinimumSize(),
-              length);
+  if (version_ < SPDY4) {

[Peter Kasting, 2014/10/08 19:21:56]

This is just a consistency change -- all the DCHECKs in this file against SPDY
versions seemed to use < and > instead of <= and >=, so I just made these
conditionals do the same.

+    DCHECK_LE(length,
+              SpdyConstants::GetFrameMaximumSize(version_) -
+                  framer.GetFrameMinimumSize());
   } else {
-    DCHECK_GE(SpdyConstants::GetFrameMaximumSize(version_), length);
+    DCHECK_LE(length, SpdyConstants::GetFrameMaximumSize(version_));
   }
   bool success = false;
   const size_t old_length = length_;
 
-  if (version_ <= SPDY3) {
+  if (version_ < SPDY4) {
     FlagsAndLength flags_length = CreateFlagsAndLength(
         0,  // We're not writing over the flags value anyway.
         length);
 
     // Write into the correct location by temporarily faking the offset.
     length_ = 5;  // Offset at which the length field occurs.
     success = WriteBytes(reinterpret_cast<char*>(&flags_length) + 1,
                          sizeof(flags_length) - 1);
   } else {
     length_ = 0;
     success = WriteUInt24(length);
   }
 
   length_ = old_length;
   return success;
 }
 
 bool SpdyFrameBuilder::OverwriteFlags(const SpdyFramer& framer,
                                       uint8 flags) {
-  DCHECK_LT(SPDY3, framer.protocol_version());
+  DCHECK_GT(framer.protocol_version(), SPDY3);
   bool success = false;
   const size_t old_length = length_;
   // Flags are the fifth octet in the frame prefix.
   length_ = 4;
   success = WriteUInt8(flags);
   length_ = old_length;
   return success;
 }
 
 bool SpdyFrameBuilder::CanWrite(size_t length) const {
   if (length > kLengthMask) {
     DCHECK(false);
     return false;
   }
 
   if (offset_ + length_ + length > capacity_) {
     DCHECK(false);
     return false;
   }
 
   return true;
 }
 
 }  // namespace net