diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 23:22:43 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 23:22:43 +0000 |
| commit | 6547ccdb9c236e1c2b6fee20a73a8d691481bb88 (patch) | |
| tree | 5040c481fa8347ecb4835cc888ccf1f64beee305 /net/http | |
| parent | bad78b17bfb7153339905a1ae2b285a377142f6a (diff) | |
| download | chromium_src-6547ccdb9c236e1c2b6fee20a73a8d691481bb88.zip chromium_src-6547ccdb9c236e1c2b6fee20a73a8d691481bb88.tar.gz chromium_src-6547ccdb9c236e1c2b6fee20a73a8d691481bb88.tar.bz2 | |
Fixes for re-enabling more MSVC level 4 warnings: net/ edition
This contains fixes for the following sorts of issues:
* Octal escape sequence terminated by decimal number
* Possibly-uninitialized local variable
* Assignment inside conditional
* Signedness mismatch
This also contains a very small number of other cleanups to nearby code.
BUG=81439
TEST=none
R=rch@chromium.org
Review URL: https://codereview.chromium.org/374033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/transport_security_persister.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc index 7310b59..a482f61 100644 --- a/net/http/transport_security_persister.cc +++ b/net/http/transport_security_persister.cc @@ -212,9 +212,6 @@ bool TransportSecurityPersister::Deserialize(const std::string& serialized, continue; } - std::string mode_string; - double expiry; - double dynamic_spki_hashes_expiry = 0.0; TransportSecurityState::DomainState domain_state; // kIncludeSubdomains is a legacy synonym for kStsIncludeSubdomains and @@ -234,6 +231,8 @@ bool TransportSecurityPersister::Deserialize(const std::string& serialized, parsed_include_subdomains = true; } + std::string mode_string; + double expiry = 0; if (!parsed_include_subdomains || !parsed->GetString(kMode, &mode_string) || !parsed->GetDouble(kExpiry, &expiry)) { @@ -243,6 +242,7 @@ bool TransportSecurityPersister::Deserialize(const std::string& serialized, } // Don't fail if this key is not present. + double dynamic_spki_hashes_expiry = 0; parsed->GetDouble(kDynamicSPKIHashesExpiry, &dynamic_spki_hashes_expiry); |