Bug 1268772 (part 3) - Remove NS_NewWindowsRegKey()'s return value. r=erahm.

It's always NS_OK. The patch also removes an unnecessary failure check as a
result.

--HG--
extra : rebase_source : 3a0c30f9ca0e838682204ed1a8d46d6ab35e20b8

xpcom/ds/nsWindowsRegKey.cpp

@@ -556,12 +556,11 @@ nsWindowsRegKey::IsWatching(bool* aResult)
 
 //-----------------------------------------------------------------------------
 
-nsresult
+void
 NS_NewWindowsRegKey(nsIWindowsRegKey** aResult)
 {
   RefPtr<nsWindowsRegKey> key = new nsWindowsRegKey();
   key.forget(aResult);
-  return NS_OK;
 }
 
 //-----------------------------------------------------------------------------
@@ -575,9 +574,6 @@ nsWindowsRegKeyConstructor(nsISupports* aDelegate, const nsIID& aIID,
   }
 
   nsCOMPtr<nsIWindowsRegKey> key;
-  nsresult rv = NS_NewWindowsRegKey(getter_AddRefs(key));
-  if (NS_SUCCEEDED(rv)) {
-    rv = key->QueryInterface(aIID, aResult);
-  }
-  return rv;
+  NS_NewWindowsRegKey(getter_AddRefs(key));
+  return key->QueryInterface(aIID, aResult);
 }

xpcom/ds/nsWindowsRegKey.h

@@ -21,7 +21,7 @@
  * This function may be used to instantiate a windows registry key object prior
  * to XPCOM being initialized.
  */
-extern "C" nsresult NS_NewWindowsRegKey(nsIWindowsRegKey** aResult);
+extern "C" void NS_NewWindowsRegKey(nsIWindowsRegKey** aResult);
 
 //-----------------------------------------------------------------------------
 
@@ -32,8 +32,9 @@ extern "C" nsresult NS_NewWindowsRegKey(nsIWindowsRegKey** aResult);
   { 0xa53bc624, 0xd577, 0x4839, \
     { 0xb8, 0xec, 0xbb, 0x50, 0x40, 0xa5, 0x2f, 0xf4 } }
 
-extern nsresult nsWindowsRegKeyConstructor(nsISupports* aOuter,
-                                           const nsIID& aIID, void** aResult);
+extern MOZ_MUST_USE nsresult nsWindowsRegKeyConstructor(nsISupports* aOuter,
+                                                        const nsIID& aIID,
+                                                        void** aResult);
 
 #endif  // IMPL_LIBXUL