From 7c75b4ce3dab78609129944ee91131e62ca36085 Mon Sep 17 00:00:00 2001 From: "pph34r@gmail.com" Date: Sat, 2 Jul 2011 14:38:05 +0000 Subject: GCC 4.6 -Wunused-but-set-variable cleanup. BUG=87490 TEST=net_unittests Review URL: http://codereview.chromium.org/7261018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91424 0039d316-1c4b-4281-b951-d872f2087c98 --- net/tools/dump_cache/url_to_filename_encoder.cc | 4 +--- net/tools/flip_server/spdy_interface.cc | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'net/tools') diff --git a/net/tools/dump_cache/url_to_filename_encoder.cc b/net/tools/dump_cache/url_to_filename_encoder.cc index 4ca4a51..40cd16f 100644 --- a/net/tools/dump_cache/url_to_filename_encoder.cc +++ b/net/tools/dump_cache/url_to_filename_encoder.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -177,7 +177,6 @@ bool UrlToFilenameEncoder::Decode(const string& encoded_filename, kEscapeDot }; State state = kStart; - int char_code = 0; char hex_buffer[3]; hex_buffer[2] = '\0'; for (size_t i = 0; i < encoded_filename.size(); ++i) { @@ -215,7 +214,6 @@ bool UrlToFilenameEncoder::Decode(const string& encoded_filename, hex_buffer[1] = ch; uint64 hex_value = ParseLeadingHex64Value(hex_buffer, 0); decoded_url->append(1, static_cast(hex_value)); - char_code = 0; state = kStart; } else { return false; diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc index 278f0dd..30cb401 100644 --- a/net/tools/flip_server/spdy_interface.cc +++ b/net/tools/flip_server/spdy_interface.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -185,7 +185,6 @@ int SpdySM::SpdyHandleNewStream(const SpdyControlFrame* frame, else uri = std::string(url->second); if (acceptor_->flip_handler_type_ == FLIP_HANDLER_SPDY_SERVER) { - SpdyHeaderBlock::iterator referer = headers.find("referer"); std::string host = UrlUtilities::GetUrlHost(url->second); VLOG(1) << ACCEPTOR_CLIENT_IDENT << "Request: " << method->second << " " << uri; @@ -259,6 +258,9 @@ void SpdySM::OnControl(const SpdyControlFrame* frame) { case SYN_REPLY: parsed_headers = spdy_framer_->ParseHeaderBlock(frame, &headers); + DCHECK(parsed_headers); + // TODO(willchan): if there is an error parsing headers, we + // should send a RST_STREAM. VLOG(2) << ACCEPTOR_CLIENT_IDENT << "SpdySM: OnSynReply(" << reinterpret_cast(frame)->stream_id() << ")"; -- cgit v1.1