summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorfgorski <fgorski@chromium.org>2014-11-07 16:36:37 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-08 00:36:53 +0000
commit3e021981ccc2be8de7443ff1a18439551b22ea75 (patch)
tree07bc407dc30b68f2ae75c384d0238a99efc36800 /google_apis
parent5ee22c5fc092d4512b7ffd5404edb67151ce1e10 (diff)
downloadchromium_src-3e021981ccc2be8de7443ff1a18439551b22ea75.zip
chromium_src-3e021981ccc2be8de7443ff1a18439551b22ea75.tar.gz
chromium_src-3e021981ccc2be8de7443ff1a18439551b22ea75.tar.bz2
Fixing all of problems found by vc++ /analyze in GCM code
There was only a minor (harmless) case of variable shadowing. BUG=427616 R=zea@chromium.org Review URL: https://codereview.chromium.org/713573003 Cr-Commit-Position: refs/heads/master@{#303338}
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gcm/engine/gcm_store_impl.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc
index 14e382e..25bc847 100644
--- a/google_apis/gcm/engine/gcm_store_impl.cc
+++ b/google_apis/gcm/engine/gcm_store_impl.cc
@@ -552,11 +552,11 @@ void GCMStoreImpl::Backend::SetGServicesSettings(
// Remove all existing settings.
leveldb::ReadOptions read_options;
read_options.verify_checksums = true;
- scoped_ptr<leveldb::Iterator> iter(db_->NewIterator(read_options));
- for (iter->Seek(MakeSlice(kGServiceSettingKeyStart));
- iter->Valid() && iter->key().ToString() < kGServiceSettingKeyEnd;
- iter->Next()) {
- write_batch.Delete(iter->key());
+ scoped_ptr<leveldb::Iterator> db_iter(db_->NewIterator(read_options));
+ for (db_iter->Seek(MakeSlice(kGServiceSettingKeyStart));
+ db_iter->Valid() && db_iter->key().ToString() < kGServiceSettingKeyEnd;
+ db_iter->Next()) {
+ write_batch.Delete(db_iter->key());
}
// Add the new settings.