Bug 1736972 - Windows and macOS build bustage after updating to clang-13. rs=bustage-fix

--HG--
extra : amend_source : 88a959035bb3b50fe2468dd3a2a8baec88d5363c

mailnews/addrbook/src/nsAbOSXDirectory.mm

@@ -581,10 +581,11 @@ nsresult nsAbOSXDirectory::AssertCard(nsIAbManager* aManager, nsIAbCard* aCard)
 
 nsresult nsAbOSXDirectory::UnassertCard(nsIAbManager* aManager, nsIAbCard* aCard,
                                         nsIMutableArray* aCardList) {
-  nsresult rv;
   uint32_t pos;
-
-  if (NS_SUCCEEDED(aCardList->IndexOf(0, aCard, &pos))) rv = aCardList->RemoveElementAt(pos);
+  if (NS_SUCCEEDED(aCardList->IndexOf(0, aCard, &pos))) {
+    nsresult rv = aCardList->RemoveElementAt(pos);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
 
   return NS_OK;
 }

mailnews/base/src/nsStatusBarBiffManager.cpp

@@ -101,7 +101,9 @@ nsresult nsStatusBarBiffManager::PlayBiffSound(const char* aPrefBranch) {
   rv = pref->GetIntPref(PREF_SOUND_TYPE, &soundType);
   NS_ENSURE_SUCCESS(rv, rv);
 
+#ifndef XP_MACOSX
   bool customSoundPlayed = false;
+#endif
 
   if (soundType == CUSTOM_SOUND_TYPE) {
     nsCString soundURLSpec;
@@ -121,7 +123,9 @@ nsresult nsStatusBarBiffManager::PlayBiffSound(const char* aPrefBranch) {
             rv = soundFile->Exists(&soundFileExists);
             if (NS_SUCCEEDED(rv) && soundFileExists) {
               rv = mSound->Play(soundURL);
+#ifndef XP_MACOSX
               if (NS_SUCCEEDED(rv)) customSoundPlayed = true;
+#endif
             }
           }
         }

mailnews/import/src/MapiMessage.cpp

@@ -183,7 +183,6 @@ DEFINE_OLEGUID(PSETID_Common, MAKELONG(0x2000 + (8), 0x0006), 0, 0);
 
 void CMapiMessage::GetDownloadState() {
   // See http://support.microsoft.com/kb/912239
-  HRESULT hRes = S_OK;
   ULONG ulVal = 0;
   LPSPropValue lpPropVal = NULL;
   LPSPropTagArray lpNamedPropTag = NULL;
@@ -195,14 +194,14 @@ void CMapiMessage::GetDownloadState() {
   NamedID.Kind.lID = dispidHeaderItem;
   lpNamedID = &NamedID;
 
-  hRes = m_lpMsg->GetIDsFromNames(1, &lpNamedID, NULL, &lpNamedPropTag);
+  m_lpMsg->GetIDsFromNames(1, &lpNamedID, NULL, &lpNamedPropTag);
 
   if (lpNamedPropTag && 1 == lpNamedPropTag->cValues) {
     lpNamedPropTag->aulPropTag[0] =
         CHANGE_PROP_TYPE(lpNamedPropTag->aulPropTag[0], PT_LONG);
 
     // Get the value of the property.
-    hRes = m_lpMsg->GetProps(lpNamedPropTag, 0, &ulVal, &lpPropVal);
+    m_lpMsg->GetProps(lpNamedPropTag, 0, &ulVal, &lpPropVal);
     if (lpPropVal && 1 == ulVal && PT_LONG == PROP_TYPE(lpPropVal->ulPropTag) &&
         lpPropVal->Value.ul)
       m_dldStateHeadersOnly = true;

mailnews/import/src/nsAppleMailImport.cpp

@@ -259,8 +259,8 @@ void nsAppleMailImportMail::FindAccountMailDirs(
         // create a mailbox for this account, so we get a parent for "Inbox",
         // "Sent Messages", etc.
         nsCOMPtr<nsIImportMailboxDescriptor> desc;
-        nsresult rv =
-            aImportService->CreateNewMailboxDescriptor(getter_AddRefs(desc));
+        rv = aImportService->CreateNewMailboxDescriptor(getter_AddRefs(desc));
+        if (NS_FAILED(rv)) continue;
         desc->SetSize(1);
         desc->SetDepth(mCurDepth);
         desc->SetDisplayName(folderName.get());
@@ -268,7 +268,7 @@ void nsAppleMailImportMail::FindAccountMailDirs(
 
         nsCOMPtr<nsIFile> mailboxDescFile;
         rv = desc->GetFile(getter_AddRefs(mailboxDescFile));
-        if (!mailboxDescFile) continue;
+        if (NS_FAILED(rv) || !mailboxDescFile) continue;
 
         mailboxDescFile->InitWithFile(currentEntry);
 

mailnews/import/src/nsWMSettings.cpp

@@ -535,11 +535,10 @@ void WMSettings::SetIdentities(nsIMsgAccountManager* pMgr, nsIMsgAccount* pAcc,
                                nsAutoString& inUserName,
                                int32_t authMethodIncoming, bool isNNTP) {
   // Get the relevant information for an identity
-  nsresult rv;
   nsAutoString value;
 
   nsCOMPtr<nsIMsgIdentity> id;
-  rv = pMgr->CreateIdentity(getter_AddRefs(id));
+  pMgr->CreateIdentity(getter_AddRefs(id));
   if (id) {
     IMPORT_LOG0("Created identity and added to the account\n");
     if (NS_SUCCEEDED(nsWMUtils::GetValueForTag(

mailnews/mapi/mapihook/src/Registry.cpp

@@ -56,7 +56,7 @@ BOOL setKeyAndValue(nsAutoString keyName, const WCHAR* subKey,
   }
 
   RegCloseKey(hKey);
-  return TRUE;
+  return retValue;
 }
 
 // Delete a key and all of its descendents.