commit 3c056ae5599be463216fb1883c710157f019acc2
author Tom Sepez <tsepez@chromium.org> Mon Feb 06 09:34:23 2017 -0800
committer Chromium commit bot <commit-bot@chromium.org> Mon Feb 06 17:56:54 2017 +0000
tree 69910ca9c32e06600adbe28bb0cdb0dc50245a64
parent e5f4f22e4c67f40123bca91c2213223cc5a12ebd

Remove redundant tests exposed by inlining macros in fxbarcode

Remove some unused #defines as well.

Change-Id: Ie7dc1ae85100eae24f18a3ecd456e3c8d8043a43
Reviewed-on: https://pdfium-review.googlesource.com/2490
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp

diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
index 25b4c85..7698890 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
+++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
@@ -61,14 +61,12 @@
                                     int32_t& e) {
   if (ecBytes == 0) {
     e = BCExceptionNoCorrectionBytes;
-    if (e != BCExceptionNO)
-      return;
+    return;
   }
   int32_t dataBytes = toEncode->GetSize() - ecBytes;
   if (dataBytes <= 0) {
     e = BCExceptionNoDataBytesProvided;
-    if (e != BCExceptionNO)
-      return;
+    return;
   }
   CBC_ReedSolomonGF256Poly* generator = BuildGenerator(ecBytes, e);
   if (e != BCExceptionNO)

xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp

diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
index 0fe215b..ce84d8e 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
+++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
@@ -78,8 +78,7 @@
     int32_t& e) {
   if (degree < 0) {
     e = BCExceptionDegreeIsNegative;
-    if (e != BCExceptionNO)
-      return nullptr;
+    return nullptr;
   }
   if (coefficient == 0) {
     CBC_ReedSolomonGF256Poly* temp = m_zero->Clone(e);
@@ -108,8 +107,7 @@
 int32_t CBC_ReedSolomonGF256::Log(int32_t a, int32_t& e) {
   if (a == 0) {
     e = BCExceptionAIsZero;
-    if (e != BCExceptionNO)
-      return 0;
+    return 0;
   }
   return m_logTable[a];
 }
@@ -117,8 +115,7 @@
 int32_t CBC_ReedSolomonGF256::Inverse(int32_t a, int32_t& e) {
   if (a == 0) {
     e = BCExceptionAIsZero;
-    if (e != BCExceptionNO)
-      return 0;
+    return 0;
   }
   return m_expTable[255 - m_logTable[a]];
 }

xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp

diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
index e37d62e..a0bbc02 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
+++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
@@ -42,8 +42,7 @@
                                     int32_t& e) {
   if (!coefficients || coefficients->GetSize() == 0) {
     e = BCExceptionCoefficientsSizeIsNull;
-    if (e != BCExceptionNO)
-      return;
+    return;
   }
   m_field = field;
   int32_t coefficientsLength = coefficients->GetSize();