Fix else-after-returns throughout pdfium.

fpdfsdk/src/pdfwindow/PWL_FontMap.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 "../../include/pdfwindow/PDFWindow.h"
 #include "../../include/pdfwindow/PWL_Wnd.h"
 #include "../../include/pdfwindow/PWL_FontMap.h"
 
@@ skipping 83 matching lines @@
         }
         else
         {
                 if (const CPWL_FontMap_Data* pData = GetFontMapData(0))
                 {
                         if (nCharset == DEFAULT_CHARSET ||
                                 pData->nCharset == SYMBOL_CHARSET ||
                                 nCharset == pData->nCharset)
                         {
                                 if (KnowWord(0, word))
-                                {
                                         return 0;
-                                }
                         }
                 }
         }
 
-        int32_t nNewFontIndex = -1;
-
-        nNewFontIndex = GetFontIndex(GetNativeFontName(nCharset), nCharset, TRUE);
+        int32_t nNewFontIndex = GetFontIndex(GetNativeFontName(nCharset), nCharset, TRUE);
         if (nNewFontIndex >= 0)
         {
                 if (KnowWord(nNewFontIndex, word))
                         return nNewFontIndex;
         }
-
         nNewFontIndex = GetFontIndex("Arial Unicode MS", DEFAULT_CHARSET, FALSE);
         if (nNewFontIndex >= 0)
         {
                 if (KnowWord(nNewFontIndex, word))
-                return nNewFontIndex;
+            return nNewFontIndex;
         }
-
         return -1;
 }
 
 int32_t CPWL_FontMap::CharCodeFromUnicode(int32_t nFontIndex, FX_WORD word)
 {
         if (CPWL_FontMap_Data* pData = m_aData.GetAt(nFontIndex))
         {
                 if (pData->pFont)
                 {
                         if (pData->pFont->IsUnicodeCompatible())
                         {
                                 int nCharCode = pData->pFont->CharCodeFromUnicode(word);
                                 pData->pFont->GlyphFromCharCode(nCharCode);
                                 return nCharCode;
                         }
-                        else
-                        {
-                                if (word < 0xFF)
-                                        return word;
-                        }
+            if (word < 0xFF)
+                return word;
                 }
         }
-
         return -1;
 }
 
 CFX_ByteString CPWL_FontMap::GetNativeFontName(int32_t nCharset)
 {
         //searching native font is slow, so we must save time
         for (int32_t i=0,sz=m_aNativeFont.GetSize(); i<sz; i++)
         {
                 if (CPWL_FontMap_Native* pData = m_aNativeFont.GetAt(i))
                 {
@@ skipping 80 matching lines @@
                         }
                 }
         }
 
         return -1;
 }
 
 int32_t CPWL_FontMap::GetFontIndex(const CFX_ByteString& sFontName, int32_t nCharset, FX_BOOL bFind)
 {
         int32_t nFontIndex = FindFont(EncodeFontAlias(sFontName, nCharset), nCharset);
-        if (nFontIndex >= 0) return nFontIndex;
-
-//      nFontIndex = FindFont("", nCharset);
-//      if (nFontIndex >= 0) return nFontIndex;
+        if (nFontIndex >= 0)
+        return nFontIndex;
 
         CFX_ByteString sAlias;
         CPDF_Font* pFont = NULL;
-
         if (bFind)
                 pFont = FindFontSameCharset(sAlias, nCharset);
 
         if (!pFont)
         {
                 CFX_ByteString sTemp = sFontName;
                 pFont = AddFontToDocument(GetDocument(), sTemp, nCharset);
-
-                /*
-                if (FindFont(sAlias))
-                {
-                        sAlias = EncodeFontAlias(sTemp, nCharset);
-                }
-                else
-                */
-                {
-                        sAlias = EncodeFontAlias(sTemp, nCharset);
-                }
+        sAlias = EncodeFontAlias(sTemp, nCharset);
         }
-
         AddedFont(pFont, sAlias);
-
         return AddFontData(pFont, sAlias, nCharset);
 }
 
 int32_t CPWL_FontMap::GetPWLFontIndex(FX_WORD word, int32_t nCharset)
 {
         int32_t nFind = -1;
 
         for (int32_t i=0,sz=m_aData.GetSize(); i<sz; i++)
         {
                 if (CPWL_FontMap_Data* pData = m_aData.GetAt(i))
@@ skipping 52 matching lines @@
                 {
                         return pData->sFontName;
                 }
         }
 
         return "";
 }
 
 CFX_ByteString CPWL_FontMap::GetNativeFont(int32_t nCharset)
 {
-        CFX_ByteString sFontName;
 
         if (nCharset == DEFAULT_CHARSET)
                 nCharset = GetNativeCharset();
 
-        sFontName = GetDefaultFontByCharset(nCharset);
-
+    CFX_ByteString sFontName = GetDefaultFontByCharset(nCharset);
         if (m_pSystemHandler)
         {
                 if (m_pSystemHandler->FindNativeTrueTypeFont(nCharset, sFontName))
                         return sFontName;
 
                 sFontName = m_pSystemHandler->GetNativeTrueTypeFont(nCharset);
         }
-
         return sFontName;
 }
 
 CPDF_Font* CPWL_FontMap::AddFontToDocument(CPDF_Document* pDoc, CFX_ByteString& sFontName, uint8_t nCharset)
 {
         if (IsStandardFont(sFontName))
                 return AddStandardFont(pDoc, sFontName);
-        else
-                return AddSystemFont(pDoc, sFontName, nCharset);
+
+    return AddSystemFont(pDoc, sFontName, nCharset);
 }
 
 CPDF_Font* CPWL_FontMap::AddStandardFont(CPDF_Document* pDoc, CFX_ByteString& sFontName)
 {
         if (!pDoc) return NULL;
 
         CPDF_Font* pFont = NULL;
 
         if (sFontName == "ZapfDingbats")
                 pFont = pDoc->AddStandardFont(sFontName, NULL);
@@ skipping 201 matching lines @@
 }
 
 CPWL_DocFontMap::~CPWL_DocFontMap()
 {
 }
 
 CPDF_Document* CPWL_DocFontMap::GetDocument()
 {
         return m_pAttachedDoc;
 }