diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp
index 8b7a468afda..0f29a8c3108 100644
--- a/mozilla/editor/libeditor/base/nsEditor.cpp
+++ b/mozilla/editor/libeditor/base/nsEditor.cpp
@@ -4362,15 +4362,22 @@ nsresult nsEditor::EndUpdateViewBatch()
   
   nsresult rv;
   nsCOMPtr<nsISelectionController> selCon = do_QueryReferent(mSelConWeak,&rv);
-  if (NS_FAILED(rv) || !selCon)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv))
+    return rv;
+  if (!selCon)
+    return NS_ERROR_FAILURE;
     
   nsCOMPtr<nsIPresShell> ps = do_QueryReferent(mPresShellWeak);
   nsCOMPtr<nsICaret> caret;
-  if (ps)
-    rv = ps->GetCaret(getter_AddRefs(caret));
-  if (NS_FAILED(rv) ||!caret)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (!ps)
+    return NS_ERROR_FAILURE;
+
+  rv = ps->GetCaret(getter_AddRefs(caret));
+  if (NS_FAILED(rv))
+    return rv;
+  if (!caret)
+    return NS_ERROR_FAILURE;
+
   StCaretHider caretHider(caret);
         
   nsCOMPtr<nsISelection>selection;
@@ -5203,8 +5210,10 @@ nsEditor::CreateHTMLContent(const nsAReadableString& aTag, nsIContent** aContent
   nsCOMPtr<nsIDocument> doc;
 
   rv = GetDocument(getter_AddRefs(tempDoc));
-  if (NS_FAILED(rv) || !tempDoc)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv))
+    return rv;
+  if (!tempDoc)
+    return NS_ERROR_FAILURE;
 
   doc = do_QueryInterface(tempDoc);
 
@@ -5218,14 +5227,18 @@ nsEditor::CreateHTMLContent(const nsAReadableString& aTag, nsIContent** aContent
   nsCOMPtr<nsINodeInfo> nodeInfo;
   rv = nodeInfoManager->GetNodeInfo(aTag, nsnull, kNameSpaceID_None,*getter_AddRefs(nodeInfo));
 
-  if (NS_FAILED(rv) || !nodeInfo)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv))
+    return rv;
+  if (!nodeInfo)
+    return NS_ERROR_FAILURE;
 
   rv = elementFactory->CreateInstanceByTag(nodeInfo, aContent);
 
-  if (NS_FAILED(rv) || !aContent)
-    return rv?rv:NS_ERROR_FAILURE;
-  else
-    return NS_OK;
+  if (NS_FAILED(rv))
+    return rv;
+  if (!aContent)
+    return NS_ERROR_FAILURE;
+  
+  return NS_OK;
 }
 
diff --git a/mozilla/editor/libeditor/base/nsEditorCommands.cpp b/mozilla/editor/libeditor/base/nsEditorCommands.cpp
index 584129095aa..eb0bdb000d1 100644
--- a/mozilla/editor/libeditor/base/nsEditorCommands.cpp
+++ b/mozilla/editor/libeditor/base/nsEditorCommands.cpp
@@ -359,8 +359,10 @@ nsSelectionMoveCommands::DoCommand(const nsAReadableString & aCommandName, nsISu
     
   nsCOMPtr<nsISelectionController> selCont;
   rv = aEditor->GetSelectionController(getter_AddRefs(selCont)); 
-  if (NS_FAILED(rv) || !selCont)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv))
+    return rv;
+  if (!selCont)
+    return NS_ERROR_FAILURE;
   
   nsAutoString cmdString(aCommandName);
   
diff --git a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp
index 722f79694da..0bc6cf9b54e 100644
--- a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp
@@ -826,7 +826,7 @@ NS_IMETHODIMP nsHTMLEditor::InsertFromDrop(nsIDOMEvent* aDropEvent)
         PRInt32 rangeCount;
         rv = selection->GetRangeCount(&rangeCount);
         if (NS_FAILED(rv)) 
-          return rv?rv:NS_ERROR_FAILURE;
+          return rv;
 
         for (PRInt32 j = 0; j < rangeCount; j++)
         {
diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
index c1cb8e64d53..69504f2baa5 100644
--- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
+++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
@@ -754,8 +754,10 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
     */
     nsCOMPtr<nsISelection> selection;
     rv = mEditor->GetSelection(getter_AddRefs(selection));
-    if (NS_FAILED(rv) || !selection) 
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv))
+      return rv;
+    if (!selection)
+      return NS_ERROR_FAILURE;
     
     nsCOMPtr<nsIDOMDocument> domdoc;
     rv = mEditor->GetDocument(getter_AddRefs(domdoc));
diff --git a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp
index 00b9086a731..1864205cf01 100644
--- a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp
+++ b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp
@@ -294,7 +294,7 @@ NS_IMETHODIMP nsPlaintextEditor::InsertFromDrop(nsIDOMEvent* aDropEvent)
         PRInt32 rangeCount;
         rv = selection->GetRangeCount(&rangeCount);
         if (NS_FAILED(rv)) 
-          return rv?rv:NS_ERROR_FAILURE;
+          return rv;
 
         for (PRInt32 j = 0; j < rangeCount; j++)
         {