diff options
author | Tom Sepez <tsepez@chromium.org> | 2017-01-31 13:02:10 -0800 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-31 22:52:16 +0000 |
commit | c8017b2581b7ade6b05ba086eb7221465414173f (patch) | |
tree | f606dadefe9d6e27e7782bd9c33e2498810a7b2f /xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp | |
parent | 00d4064e5414fc0845e354b50c7f1a8323449268 (diff) | |
download | pdfium-c8017b2581b7ade6b05ba086eb7221465414173f.tar.xz |
Remove BC_EXCEPTION_CHECK macroschromium/2999
These obfuscate control flow and save very few lines.
Mechanical change (mostly), sed + clang-format and adding a
few missing semicolons.
Change-Id: If8ae06c23edea8c455c79eab589fee5142dc3409
Reviewed-on: https://pdfium-review.googlesource.com/2472
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp')
-rw-r--r-- | xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp index 8858f60012..50f02ca52d 100644 --- a/xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp +++ b/xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp @@ -163,7 +163,8 @@ int32_t CBC_C40Encoder::encodeChar(FX_WCHAR c, CFX_WideString& sb, int32_t& e) { sb += (FX_WCHAR)0x001e; int32_t len = 2; len += encodeChar((c - 128), sb, e); - BC_EXCEPTION_CHECK_ReturnValue(e, 0); + if (e != BCExceptionNO) + return 0; return len; } else { e = BCExceptionIllegalArgument; @@ -180,7 +181,8 @@ int32_t CBC_C40Encoder::backtrackOneCharacter(CBC_EncoderContext& context, context.m_pos--; FX_WCHAR c = context.getCurrentChar(); lastCharSize = encodeChar(c, removed, e); - BC_EXCEPTION_CHECK_ReturnValue(e, -1); + if (e != BCExceptionNO) + return -1; context.resetSymbolInfo(); return lastCharSize; } |