Fix up commentary to reflect reality; remove some confusing stylistic changes. r=bienvenu

xpfe/components/history/src/nsGlobalHistory.cpp

@@ -1301,11 +1301,6 @@ nsGlobalHistory::OpenDB()
   rv = historyFile->GetFileSpec(&dbfile);
   if (NS_FAILED(rv)) return rv;
 
-  // Leaving XPCOM, entering Mork. The IID is a lie; the component
-  // manager appears to be used solely to get dynamic loading of the
-  // Mork DLL.
-  nsIMdbFactory* factory;
-
   static NS_DEFINE_CID(kMorkCID, NS_MORK_CID);
   nsCOMPtr<nsIMdbFactoryFactory> factoryfactory;
   rv = nsComponentManager::CreateInstance(kMorkCID,
@@ -1314,6 +1309,10 @@ nsGlobalHistory::OpenDB()
                                           getter_AddRefs(factoryfactory));
   if (NS_FAILED(rv)) return rv;
 
+  // Leaving XPCOM, entering MDB. They may look like XPCOM interfaces,
+  // but they're not. The 'factory' is an interface; however, it isn't
+  // reference counted. So no, this isn't a leak.
+  nsIMdbFactory* factory;
   rv = factoryfactory->GetMdbFactory(&factory);
   NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create mork factory factory");
   if (NS_FAILED(rv)) return rv;
@@ -1331,10 +1330,10 @@ nsGlobalHistory::OpenDB()
     mdb_bool canopen = 0;
     mdbYarn outfmt = { nsnull, 0, 0, 0, 0, nsnull };
 
-    nsMdbPtr<nsIMdbFile> oldFileAnchor(mEnv); // ensures file is released
+    nsMdbPtr<nsIMdbFile> oldFile(mEnv); // ensures file is released
     err = factory->OpenOldFile(mEnv, dbHeap, dbfile.GetNativePathCString(),
-			 dbFrozen, getter_Acquires(oldFileAnchor));
-		nsIMdbFile* oldFile = oldFileAnchor;
+                               dbFrozen, getter_Acquires(oldFile));
+
     if ((err != 0) || !oldFile) return NS_ERROR_FAILURE;
 
     err = factory->CanOpenFilePort(mEnv, oldFile, // the file to investigate
@@ -1377,10 +1376,10 @@ nsGlobalHistory::OpenDB()
   }
   else {
 
-    nsMdbPtr<nsIMdbFile> newFileAnchor(mEnv); // ensures file is released
+    nsMdbPtr<nsIMdbFile> newFile(mEnv); // ensures file is released
     err = factory->CreateNewFile(mEnv, dbHeap, dbfile.GetNativePathCString(),
-			 getter_Acquires(newFileAnchor));
-		nsIMdbFile* newFile = newFileAnchor;
+                                 getter_Acquires(newFile));
+
     if ((err != 0) || !newFile) return NS_ERROR_FAILURE;
 
     mdbOpenPolicy policy = { { 0, 0 }, 0, 0 };