Fix else-after-returns throughout pdfium.

core/src/fpdftext/fpdf_text_int.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 <ctype.h>
 #include <algorithm>
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
@@ skipping 24 matching lines @@
             || (curChar >= 0x2000 && curChar <= 0x206F)) {
         return FALSE;
     }
     return TRUE;
 }
 
 FX_FLOAT _NormalizeThreshold(FX_FLOAT threshold)
 {
     if (threshold < 300) {
         return threshold / 2.0f;
-    } else if (threshold < 500) {
+    }
+    if (threshold < 500) {
         return threshold / 4.0f;
-    } else if (threshold < 700) {
+    }
+    if (threshold < 700) {
         return threshold / 5.0f;
     }
     return threshold / 6.0f;
 }
 
 FX_FLOAT _CalculateBaseSpace(const CPDF_TextObject* pTextObj,
                              const CFX_AffineMatrix& matrix)
 {
     FX_FLOAT baseSpace = 0.0;
     const int nItems = pTextObj->CountItems();
@@ skipping 96 matching lines @@
     m_TextBuf.EstimateSize(0, 10240);
     CFX_FloatRect pageRect = pPage->CalcBoundingBox();
     m_DisplayMatrix = CFX_AffineMatrix(1, 0, 0, -1, pageRect.right, pageRect.top);
 }
 void CPDF_TextPage::NormalizeObjects(FX_BOOL bNormalize)
 {
     m_ParseOptions.m_bNormalizeObjs = bNormalize;
 }
 FX_BOOL CPDF_TextPage::IsControlChar(PAGECHAR_INFO* pCharInfo)
 {
-    if(!pCharInfo) {

[Tom Sepez, 2015/07/20 23:59:58]

note: always passed as &something so never null.

[Lei Zhang, 2015/07/21 21:44:46]

pointer -> const ref then?

[Tom Sepez, 2015/07/22 20:38:24]

Done.

-        return FALSE;
-    }
     switch(pCharInfo->m_Unicode) {
         case 0x2:
         case 0x3:
         case 0x93:
         case 0x94:
         case 0x96:
         case 0x97:
         case 0x98:
         case 0xfffe:
-            if(pCharInfo->m_Flag == FPDFTEXT_CHAR_HYPHEN) {
-                return FALSE;
-            } else {
-                return TRUE;
-            }
+            return pCharInfo->m_Flag != FPDFTEXT_CHAR_HYPHEN;

[Lei Zhang, 2015/07/21 21:44:47]

BTW, wouldn't this return true or false, rather than TRUE or FALSE? :-P

I think we should eventually get rid of TRUE/FALSE in favor of true/false.

[Tom Sepez, 2015/07/22 20:38:24]

Made into |bool| return value.

         default:
             return FALSE;
     }
 }
 FX_BOOL CPDF_TextPage::ParseTextPage()
 {
     if (!m_pPage) {
         m_IsParsered = FALSE;
         return FALSE;
     }
@@ skipping 363 matching lines @@
             if (curXdif == 0) {
                 return index;
             }
             int signflag = 0;
             if (curXdif > 0) {
                 signflag = 1;
             } else {
                 signflag = -1;
             }
             if (signflag * PreXdif < 0) {
-                if (FXSYS_fabs(PreXdif) < FXSYS_fabs(curXdif)) {
-                    return index + 1;
-                } else {
-                    return index;
-                }
+                return FXSYS_fabs(PreXdif) < FXSYS_fabs(curXdif) ? index + 1 : index;
             }
             if (FXSYS_fabs(curXdif) < FXSYS_fabs(minXdif)) {
                 minIndex = index;
                 minXdif = curXdif;
             }
             PreXdif = curXdif;
             if (difPosY != charinfo.m_OriginY) {
                 break;
             }
         }
         return minIndex;
-    } else if(FPDFTEXT_DOWN) {

[Tom Sepez, 2015/07/20 23:59:58]

note: this must be a bug.  Not sure it matters.

[Lei Zhang, 2015/07/21 21:44:47]

It does not matter because GetOrderByDirection() doesn't ever get called!

[Tom Sepez, 2015/07/22 20:38:24]

Removed this dead code.

+    }
+    if (direction == FPDFTEXT_DOWN) {
         minIndex = -2;
         while (1) {
             if (++index > m_charList.GetSize() - 1)     {
                 return minIndex;
             }
             charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(index);
             if (FXSYS_fabs(charinfo.m_OriginY - curPos.y) > FX_MAX(height, charinfo.m_CharBox.Height()) / 2) {
                 difPosY = charinfo.m_OriginY;
                 minIndex = index;
                 break;
             }
         }
         FX_FLOAT PreXdif = charinfo.m_OriginX - curPos.x;
         minXdif = PreXdif;
         if (PreXdif == 0)       {
             return index;
         }
         FX_FLOAT curXdif = 0;
         while (++index < m_charList.GetSize()) {
             charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(index);
             if (difPosY != charinfo.m_OriginY) {
                 break;
             }
             curXdif = charinfo.m_OriginX - curPos.x;
             if (curXdif == 0) {
                 return index;
             }
-            int signflag = 0;
-            if (curXdif > 0) {
-                signflag = 1;
-            } else {
-                signflag = -1;
-            }
+            int signflag = curXdif > 0 ? 1 : -1;
             if (signflag * PreXdif < 0) {
-                if (FXSYS_fabs(PreXdif) < FXSYS_fabs(curXdif)) {
-                    return index - 1;
-                } else {
-                    return index;
-                }
+                return FXSYS_fabs(PreXdif) < FXSYS_fabs(curXdif) ?  index - 1 : index;
             }
             if (FXSYS_fabs(curXdif) < FXSYS_fabs(minXdif)) {
                 minXdif = curXdif;
                 minIndex = index;
             }
             PreXdif = curXdif;
         }
         return minIndex;
     }
+    return minIndex;
 }
 void CPDF_TextPage::GetCharInfo(int index, FPDF_CHAR_INFO & info) const
 {
     if(m_ParseOptions.m_bGetCharCodeOnly) {
         return;
     }
     if (!m_IsParsered)  {
         return;
     }
     if (index < 0 || index >= m_charList.GetSize())     {
@@ skipping 306 matching lines @@
         return index;
     }
     int breakPos = index;
     if (direction == FPDFTEXT_LEFT) {
         while (--breakPos > 0) {
             charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(breakPos);
             if (!IsLetter(charinfo.m_Unicode)) {
                 return breakPos;
             }
         }
-        return breakPos;
     } else if (direction == FPDFTEXT_RIGHT) {
         while (++breakPos < m_charList.GetSize()) {
             charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(breakPos);
             if (!IsLetter(charinfo.m_Unicode)) {
                 return breakPos;
             }
         }
-        return breakPos;
     }
     return breakPos;
 }
 int32_t CPDF_TextPage::FindTextlineFlowDirection()
 {
     if (!m_pPage)       {
         return -1;
     }
     const int32_t nPageWidth = (int32_t)((CPDF_Page*)m_pPage)->GetPageWidth();
     const int32_t nPageHeight = (int32_t)((CPDF_Page*)m_pPage)->GetPageHeight();
@@ skipping 231 matching lines @@
                 PAGECHAR_INFO Info2 = Info;
                 Info2.m_Unicode = pDst[nIndex];
                 Info2.m_Flag = FPDFTEXT_CHAR_PIECE;
                 m_TextBuf.AppendChar(Info2.m_Unicode);
                 if( !m_ParseOptions.m_bGetCharCodeOnly) {
                     m_charList.Add(Info2);
                 }
             }
             FX_Free(pDst);
             return;
-        } else {
-            Info.m_Unicode = wChar;
         }
+        Info.m_Unicode = wChar;
         m_TextBuf.AppendChar(Info.m_Unicode);
     } else {
         Info.m_Index = -1;
     }
     if( !m_ParseOptions.m_bGetCharCodeOnly) {
         m_charList.Add(Info);
     }
 }
 void CPDF_TextPage::CloseTempLine()
 {
@@ skipping 680 matching lines @@
     textMatrix.TransformPoint(last.m_OriginX, last.m_OriginY);
     FX_FLOAT dX = FXSYS_fabs(last.m_OriginX - first.m_OriginX);
     FX_FLOAT dY = FXSYS_fabs(last.m_OriginY - first.m_OriginY);
     if (dX <= 0.0001f && dY <= 0.0001f) {
         return -1;
     }
     CFX_VectorF v;
     v.Set(dX, dY);
     v.Normalize();
     if (v.y <= 0.0872f) {
-        if (v.x <= 0.0872f) {
-            return m_TextlineDir;
-        }
-        return 0;
-    } else if (v.x <= 0.0872f) {
+        return v.x <= 0.0872f ? m_TextlineDir : 0;
+    }
+    if (v.x <= 0.0872f) {
         return 1;
     }
     return m_TextlineDir;
 }
 FX_BOOL CPDF_TextPage::IsHyphen(FX_WCHAR curChar)
 {
     CFX_WideString strCurText = m_TempTextBuf.GetWideString();
     if(strCurText.GetLength() == 0) {
         strCurText = m_TextBuf.GetWideString();
     }
@@ skipping 758 matching lines @@
         }
     }
 }
 FX_BOOL CPDF_LinkExtract::CheckWebLink(CFX_WideString& strBeCheck)
 {
     CFX_WideString str = strBeCheck;
     str.MakeLower();
     if (str.Find(L"http://www.") != -1) {
         strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"http://www."));
         return TRUE;
-    } else if (str.Find(L"http://") != -1) {
+    }
+    if (str.Find(L"http://") != -1) {
         strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"http://"));
         return TRUE;
-    } else if (str.Find(L"https://www.") != -1) {
+    }
+    if (str.Find(L"https://www.") != -1) {
         strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"https://www."));
         return TRUE;
-    } else if (str.Find(L"https://") != -1) {
+    }
+    if (str.Find(L"https://") != -1) {
         strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"https://"));
         return TRUE;
-    } else if (str.Find(L"www.") != -1) {
+    }
+    if (str.Find(L"www.") != -1) {
         strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"www."));
         strBeCheck = L"http://" + strBeCheck;
         return TRUE;
-    } else {
-        return FALSE;
     }
+    return FALSE;
 }
 FX_BOOL CPDF_LinkExtract::CheckMailLink(CFX_WideString& str)
 {
     str.MakeLower();
     int aPos = str.Find(L'@');
     if (aPos < 1) {
         return FALSE;
     }
     if (str.GetAt(aPos - 1) == L'.' || str.GetAt(aPos - 1) == L'_') {
         return FALSE;
@@ skipping 105 matching lines @@
     if (!m_IsParserd || index < 0 || index >= m_LinkList.GetSize()) {
         return;
     }
     CPDF_LinkExt* link = NULL;
     link = m_LinkList.GetAt(index);
     if (!link) {
         return ;
     }
     m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
 }