From 1b22880748c3f3b3740699ae4c953a33f65ad10f Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Wed, 5 Apr 2017 18:42:22 -0700
Subject: Change some fxbarcode to use return values.

No caller cares about the exception values anyway. Remove the unused
ones. Also use more std::unique_ptr to stop potential leaks.

Change-Id: Ic5955fb0d879f55e1c6a005c0204df50246dab19
Reviewed-on: https://pdfium-review.googlesource.com/3715
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 fxbarcode/oned/BC_OneDimWriter.cpp      | 10 +++++++---
 fxbarcode/oned/BC_OnedCode128Writer.cpp |  2 +-
 fxbarcode/oned/BC_OnedCode39Writer.cpp  | 11 ++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'fxbarcode/oned')

diff --git a/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp
index 95244ae614..f6b33f37a9 100644
--- a/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -455,12 +455,16 @@ void CBC_OneDimWriter::RenderResult(const CFX_WideStringC& contents,
         break;
       }
       if (outputX + m_multiple > outputWidth && outputWidth - outputX > 0) {
-        m_output->SetRegion(outputX, 0, outputWidth - outputX, outputHeight, e);
+        if (!m_output->SetRegion(outputX, 0, outputWidth - outputX,
+                                 outputHeight)) {
+          e = BCExceptionGeneric;
+        }
         break;
       }
-      m_output->SetRegion(outputX, 0, m_multiple, outputHeight, e);
-      if (e != BCExceptionNO)
+      if (!m_output->SetRegion(outputX, 0, m_multiple, outputHeight)) {
+        e = BCExceptionGeneric;
         return;
+      }
     }
     outputX += m_multiple;
   }
diff --git a/fxbarcode/oned/BC_OnedCode128Writer.cpp b/fxbarcode/oned/BC_OnedCode128Writer.cpp
index d4f05a3bc6..53f4d01449 100644
--- a/fxbarcode/oned/BC_OnedCode128Writer.cpp
+++ b/fxbarcode/oned/BC_OnedCode128Writer.cpp
@@ -184,7 +184,7 @@ uint8_t* CBC_OnedCode128Writer::Encode(const CFX_ByteString& contents,
                                        int32_t& outLength,
                                        int32_t& e) {
   if (contents.GetLength() < 1 || contents.GetLength() > 80) {
-    e = BCExceptionContentsLengthShouldBetween1and80;
+    e = BCExceptionGeneric;
     return nullptr;
   }
   std::vector<const int32_t*> patterns;
diff --git a/fxbarcode/oned/BC_OnedCode39Writer.cpp b/fxbarcode/oned/BC_OnedCode39Writer.cpp
index d454985478..bcc64d83bd 100644
--- a/fxbarcode/oned/BC_OnedCode39Writer.cpp
+++ b/fxbarcode/oned/BC_OnedCode39Writer.cpp
@@ -158,7 +158,7 @@ char CBC_OnedCode39Writer::CalcCheckSum(const CFX_ByteString& contents,
                                         int32_t& e) {
   int32_t length = contents.GetLength();
   if (length > 80) {
-    e = BCExceptionContentsLengthShouldBetween1and80;
+    e = BCExceptionGeneric;
     return '*';
   }
   int32_t checksum = 0;
@@ -167,16 +167,13 @@ char CBC_OnedCode39Writer::CalcCheckSum(const CFX_ByteString& contents,
     int32_t j = 0;
     for (; j < len; j++) {
       if (ALPHABET_STRING[j] == contents[i]) {
-        if (contents[i] != '*') {
+        if (contents[i] != '*')
           checksum += j;
-          break;
-        } else {
-          break;
-        }
+        break;
       }
     }
     if (j >= len) {
-      e = BCExceptionUnSupportedString;
+      e = BCExceptionGeneric;
       return '*';
     }
   }
-- 
cgit v1.2.3