diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 01:40:47 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 01:40:47 +0000 |
| commit | 481c3e82e2dcbcb676501f18bc8f58900071b935 (patch) | |
| tree | b41b70589f0b082edffa7322b1c06af23c4b32bc /extensions | |
| parent | cf85b9ad701b8363e3d1d54d54390dcdf4a45291 (diff) | |
| download | chromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.zip chromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.tar.gz chromium_src-481c3e82e2dcbcb676501f18bc8f58900071b935.tar.bz2 | |
Fixes for re-enabling more MSVC level 4 warnings: misc edition #2
This contains fixes for the following sorts of issues:
* Assignment inside conditional
* Taking the address of a temporary
* Octal escape sequence terminated by decimal number
* Signedness mismatch
* Possibly-uninitialized local variable
This also contains a small number of cleanups to nearby code (e.g. no else after return).
BUG=81439
TEST=none
Review URL: https://codereview.chromium.org/382673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/extension_prefs.cc | 4 | ||||
| -rw-r--r-- | extensions/common/id_util.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc index 0789fb6..3e04d79 100644 --- a/extensions/browser/extension_prefs.cc +++ b/extensions/browser/extension_prefs.cc @@ -1005,7 +1005,7 @@ void ExtensionPrefs::MigratePermissions(const ExtensionIdList& extension_ids) { // An extension's granted permissions need to be migrated if the // full_access bit is present. This bit was always present in the previous // scheme and is never present now. - bool full_access; + bool full_access = false; const base::DictionaryValue* ext = GetExtensionPref(*ext_id); if (!ext || !ext->GetBoolean(kPrefOldGrantedFullAccess, &full_access)) continue; @@ -1288,7 +1288,7 @@ BlacklistState ExtensionPrefs::GetExtensionBlacklistState( if (IsExtensionBlacklisted(extension_id)) return BLACKLISTED_MALWARE; const base::DictionaryValue* ext_prefs = GetExtensionPref(extension_id); - int int_value; + int int_value = 0; if (ext_prefs && ext_prefs->GetInteger(kPrefBlacklistState, &int_value)) return static_cast<BlacklistState>(int_value); diff --git a/extensions/common/id_util.cc b/extensions/common/id_util.cc index 3b8628e..0bae9c5 100644 --- a/extensions/common/id_util.cc +++ b/extensions/common/id_util.cc @@ -60,8 +60,8 @@ base::FilePath MaybeNormalizePath(const base::FilePath& path) { // comparisons simpler. base::FilePath::StringType path_str = path.value(); if (path_str.size() >= 2 && path_str[0] >= L'a' && path_str[0] <= L'z' && - path_str[1] == ':') - path_str[0] += ('A' - 'a'); + path_str[1] == L':') + path_str[0] = towupper(path_str[0]); return base::FilePath(path_str); #else |