commit e56b3ad57573c677ad84bf4a2ffd649d6134b990
author Lei Zhang <thestig@chromium.org> Mon Jan 25 16:41:00 2016 -0800
committer Lei Zhang <thestig@chromium.org> Mon Jan 25 16:41:00 2016 -0800
tree 09ec0d682b36266c745e6262281e9e35dcefbfa5
parent c64e4007ee4561ec2ed3ce986191caf9b024ef55

Fix a bunch of pointless returns.

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1637693002 .

fpdfsdk/src/fsdk_annothandler.cpp

diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index feaee74..a8dff91 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -205,10 +205,8 @@
                                                  FX_DWORD nFlag) {
   ASSERT(pAnnot);
 
-  if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
+  if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
     pAnnotHandler->OnMouseEnter(pPageView, pAnnot, nFlag);
-  }
-  return;
 }
 
 void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseExit(CPDFSDK_PageView* pPageView,
@@ -216,10 +214,8 @@
                                                 FX_DWORD nFlag) {
   ASSERT(pAnnot);
 
-  if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
+  if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
     pAnnotHandler->OnMouseExit(pPageView, pAnnot, nFlag);
-  }
-  return;
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnChar(CPDFSDK_Annot* pAnnot,

fpdfsdk/src/fsdk_baseannot.cpp

diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index 9540c57..aa9c045 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -957,8 +957,6 @@
   m_pAnnot->GetAPForm(m_pPageView->GetPDFPage(), CPDF_Annot::Normal);
   m_pAnnot->DrawAppearance(m_pPageView->GetPDFPage(), pDevice, pUser2Device,
                            CPDF_Annot::Normal, NULL);
-
-  return;
 }
 
 UnderlyingPageType* CPDFSDK_Annot::GetUnderlyingPage() {
@@ -966,7 +964,5 @@
 }
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage() {
-  if (m_pPageView)
-    return m_pPageView->GetPDFPage();
-  return NULL;
+  return m_pPageView ? m_pPageView->GetPDFPage() : nullptr;
 }