Bug 1155952 - Nesting level does not match indentation r=rkent
authorSylvestre Ledru <sledru@mozilla.com>
Sun, 19 Apr 2015 18:12:38 +0200
changeset 22483 f4918fa6f79e52c3e44b9c6c2db612c76fcc442f
parent 22482 24203ada3e1ef9e8330208ba56bc227f2ac9f07c
child 22484 6bd8cda9d3e3ac89f16ae47f78f306f02589b7a6
push id1420
push usermbanner@mozilla.com
push dateMon, 29 Jun 2015 20:47:24 +0000
treeherdercomm-beta@b3db00bb24e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrkent
bugs1155952
Bug 1155952 - Nesting level does not match indentation r=rkent
mailnews/compose/src/nsMsgCopy.cpp
mailnews/import/src/nsImportAddressBooks.cpp
--- a/mailnews/compose/src/nsMsgCopy.cpp
+++ b/mailnews/compose/src/nsMsgCopy.cpp
@@ -382,26 +382,26 @@ nsMsgCopy::CreateIfMissing(nsIMsgFolder 
       NS_ENSURE_SUCCESS(rv, rv);
 
       // if we can't get the path from the folder, then try to create the storage.
       // for imap, it doesn't matter if the .msf file exists - it still might not
       // exist on the server, so we should try to create it
       bool exists = false;
       if (!isAsyncFolder && folderPath)
         folderPath->Exists(&exists);
-        if (!exists)
-        {
-          (*folder)->CreateStorageIfMissing(this);
-          if (isAsyncFolder)
-            *waitForUrl = true;
+      if (!exists)
+      {
+        (*folder)->CreateStorageIfMissing(this);
+        if (isAsyncFolder)
+          *waitForUrl = true;
 
-          rv = NS_OK;
-        }
+        rv = NS_OK;
       }
     }
+  }
   return rv;
 }
 ////////////////////////////////////////////////////////////////////////////////////
 // Utility Functions for MsgFolders
 ////////////////////////////////////////////////////////////////////////////////////
 nsresult
 LocateMessageFolder(nsIMsgIdentity   *userIdentity,
                     nsMsgDeliverMode aFolderType,
--- a/mailnews/import/src/nsImportAddressBooks.cpp
+++ b/mailnews/import/src/nsImportAddressBooks.cpp
@@ -410,18 +410,18 @@ void nsImportGenericAddressBooks::GetDef
   rv = impSvc->CreateNewFieldMap(&m_pFieldMap);
   if (NS_FAILED(rv))
     return;
 
   int32_t  sz = 0;
   rv = m_pFieldMap->GetNumMozFields(&sz);
   if (NS_SUCCEEDED(rv))
     rv = m_pFieldMap->DefaultFieldMap(sz);
-    if (NS_SUCCEEDED(rv))
-      rv = m_pInterface->InitFieldMap(m_pFieldMap);
+  if (NS_SUCCEEDED(rv))
+    rv = m_pInterface->InitFieldMap(m_pFieldMap);
   if (NS_FAILED(rv)) {
     IMPORT_LOG0("*** Error: Unable to initialize field map\n");
     NS_IF_RELEASE(m_pFieldMap);
   }
 }
 
 
 NS_IMETHODIMP nsImportGenericAddressBooks::WantsProgress(bool *_retval)