From d7f83a7ea6cad2798680289e88f363fd3c62b697 Mon Sep 17 00:00:00 2001
From: Andi-Bogdan Postelnicu <bpostelnicu@mozilla.com>
Date: Wed, 16 Nov 2016 14:24:21 +0200
Subject: [PATCH] Bug 1317954 - Converts for(...; ...; ...) loops to use the
 new range-based loops in C++11 in xpcom/. r=froydnj

MozReview-Commit-ID: 9mKXvXyYa6U

--HG--
extra : rebase_source : 55f74f93829b52b2c347a62520a79ab867adca35
---
 xpcom/glue/nsID.cpp                  |  4 +---
 xpcom/io/nsLocalFileUnix.cpp         |  4 ++--
 xpcom/tests/gtest/TestHashtables.cpp | 28 ++++++++++++++--------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/xpcom/glue/nsID.cpp b/xpcom/glue/nsID.cpp
index 0a73bf6c3f2d..783a376d3a5f 100644
--- a/xpcom/glue/nsID.cpp
+++ b/xpcom/glue/nsID.cpp
@@ -13,9 +13,7 @@ void nsID::Clear()
   m0 = 0;
   m1 = 0;
   m2 = 0;
-  for (int i = 0; i < 8; ++i) {
-    m3[i] = 0;
-  }
+  memset(m3, 0, sizeof(m3));
 }
 
 /**
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index f8be924d5ef4..494752df7043 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -1557,8 +1557,8 @@ nsLocalFile::IsExecutable(bool* aResult)
       "jar"   // java application bundle
     };
     nsDependentSubstring ext = Substring(path, dotIdx + 1);
-    for (size_t i = 0; i < ArrayLength(executableExts); i++) {
-      if (ext.EqualsASCII(executableExts[i])) {
+    for (auto executableExt : executableExts) {
+      if (ext.EqualsASCII(executableExt)) {
         // Found a match.  Set result and quit.
         *aResult = true;
         return NS_OK;
diff --git a/xpcom/tests/gtest/TestHashtables.cpp b/xpcom/tests/gtest/TestHashtables.cpp
index 394812631d71..13bd15128cd2 100644
--- a/xpcom/tests/gtest/TestHashtables.cpp
+++ b/xpcom/tests/gtest/TestHashtables.cpp
@@ -284,14 +284,14 @@ TEST(Hashtables, DataHashtable)
   // check a data-hashtable
   nsDataHashtable<nsUint32HashKey,const char*> UniToEntity(ENTITY_COUNT);
 
-  for (uint32_t i = 0; i < ENTITY_COUNT; ++i) {
-    UniToEntity.Put(gEntities[i].mUnicode, gEntities[i].mStr);
+  for (auto& entity : gEntities) {
+    UniToEntity.Put(entity.mUnicode, entity.mStr);
   }
 
   const char* str;
 
-  for (uint32_t i = 0; i < ENTITY_COUNT; ++i) {
-    ASSERT_TRUE(UniToEntity.Get(gEntities[i].mUnicode, &str));
+  for (auto& entity : gEntities) {
+    ASSERT_TRUE(UniToEntity.Get(entity.mUnicode, &str));
   }
 
   ASSERT_FALSE(UniToEntity.Get(99446, &str));
@@ -317,15 +317,15 @@ TEST(Hashtables, ClassHashtable)
   // check a class-hashtable
   nsClassHashtable<nsCStringHashKey,TestUniChar> EntToUniClass(ENTITY_COUNT);
 
-  for (uint32_t i = 0; i < ENTITY_COUNT; ++i) {
-    TestUniChar* temp = new TestUniChar(gEntities[i].mUnicode);
-    EntToUniClass.Put(nsDependentCString(gEntities[i].mStr), temp);
+  for (auto& entity : gEntities) {
+    TestUniChar* temp = new TestUniChar(entity.mUnicode);
+    EntToUniClass.Put(nsDependentCString(entity.mStr), temp);
   }
 
   TestUniChar* myChar;
 
-  for (uint32_t i = 0; i < ENTITY_COUNT; ++i) {
-    ASSERT_TRUE(EntToUniClass.Get(nsDependentCString(gEntities[i].mStr), &myChar));
+  for (auto& entity : gEntities) {
+    ASSERT_TRUE(EntToUniClass.Get(nsDependentCString(entity.mStr), &myChar));
   }
 
   ASSERT_FALSE(EntToUniClass.Get(NS_LITERAL_CSTRING("xxxx"), &myChar));
@@ -396,17 +396,17 @@ TEST(Hashtables, InterfaceHashtable)
   // check an interface-hashtable with an uint32_t key
   nsInterfaceHashtable<nsUint32HashKey,IFoo> UniToEntClass2(ENTITY_COUNT);
 
-  for (uint32_t i = 0; i < ENTITY_COUNT; ++i) {
+  for (auto& entity : gEntities) {
     nsCOMPtr<IFoo> foo;
     CreateIFoo(getter_AddRefs(foo));
-    foo->SetString(nsDependentCString(gEntities[i].mStr));
+    foo->SetString(nsDependentCString(entity.mStr));
 
-    UniToEntClass2.Put(gEntities[i].mUnicode, foo);
+    UniToEntClass2.Put(entity.mUnicode, foo);
   }
 
-  for (uint32_t i = 0; i < ENTITY_COUNT; ++i) {
+  for (auto& entity : gEntities) {
     nsCOMPtr<IFoo> myEnt;
-    ASSERT_TRUE(UniToEntClass2.Get(gEntities[i].mUnicode, getter_AddRefs(myEnt)));
+    ASSERT_TRUE(UniToEntClass2.Get(entity.mUnicode, getter_AddRefs(myEnt)));
 
     nsAutoCString myEntStr;
     myEnt->GetString(myEntStr);