Re-land else-after-returns

core/src/fxcrt/fx_basic_wstring.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <stddef.h>  // For offsetof().
 
 #include "../../include/fxcrt/fx_basic.h"
 #include "../../../third_party/base/numerics/safe_math.h"
@@ skipping 467 matching lines @@
     }
     return FXSYS_wcsicmp(m_pData->m_String, lpsz);
 }
 int CFX_WideString::Compare(const CFX_WideString& str) const
 {
     if (m_pData == NULL) {
         if (str.m_pData == NULL) {
             return 0;
         }
         return -1;
-    } else if (str.m_pData == NULL) {
+    }
+    if (str.m_pData == NULL) {
         return 1;
     }
     int this_len = m_pData->m_nDataLength;
     int that_len = str.m_pData->m_nDataLength;
     int min_len = this_len < that_len ? this_len : that_len;
     for (int i = 0; i < min_len; i ++) {
         if (m_pData->m_String[i] < str.m_pData->m_String[i]) {
             return -1;
-        } else if (m_pData->m_String[i] > str.m_pData->m_String[i]) {
+        }
+        if (m_pData->m_String[i] > str.m_pData->m_String[i]) {
             return 1;
         }
     }
     if (this_len < that_len) {
         return -1;
-    } else if (this_len > that_len) {
+    }
+    if (this_len > that_len) {
         return 1;
     }
     return 0;
 }
 void CFX_WideString::SetAt(FX_STRSIZE nIndex, FX_WCHAR ch)
 {
     if (m_pData == NULL) {
         return;
     }
     ASSERT(nIndex >= 0);
@@ skipping 563 matching lines @@
             return (CFX_CharMap*)&g_DefaultJISMapper;
         case 936:
             return (CFX_CharMap*)&g_DefaultGBKMapper;
         case 949:
             return (CFX_CharMap*)&g_DefaultUHCMapper;
         case 950:
             return (CFX_CharMap*)&g_DefaultBig5Mapper;
     }
     return NULL;
 }