summaryrefslogtreecommitdiff
path: root/xfa/src/fxbarcode/datamatrix
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-02-25 12:08:02 -0800
committerLei Zhang <thestig@chromium.org>2016-02-25 12:08:02 -0800
commit6941d29a825a815bebf93e07c3f2e2274399c7a4 (patch)
tree222d611e79399d49dce45be9bbb1e0bd0efbfcb3 /xfa/src/fxbarcode/datamatrix
parent6b7b5a52f42aa9b37be5307915885d5f4566c326 (diff)
downloadpdfium-6941d29a825a815bebf93e07c3f2e2274399c7a4.tar.xz
Remove set but unsed variables.
And other nearby dead code. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1740613002 .
Diffstat (limited to 'xfa/src/fxbarcode/datamatrix')
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp2
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp1
-rw-r--r--xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
index a1be45e291..01ececb4b7 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
@@ -138,7 +138,7 @@ int32_t CBC_C40Encoder::encodeChar(FX_WCHAR c, CFX_WideString& sb, int32_t& e) {
} else if ((c >= 'A') && (c <= 'Z')) {
sb += (FX_WCHAR)(c - 65 + 14);
return 1;
- } else if ((c >= '\0') && (c <= 0x1f)) {
+ } else if (c <= 0x1f) {
sb += (FX_WCHAR)'\0';
sb += c;
return 2;
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
index 02a202b27d..79e47177a6 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
@@ -83,7 +83,6 @@ CBC_CommonDecoderResult* CBC_DataMatrixDecodedBitStreamParser::Decode(
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
break;
default:
- NULL;
e = BCExceptionFormatException;
return NULL;
}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
index 61e8f7dec2..ec340f30e7 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
@@ -50,7 +50,7 @@ int32_t CBC_TextEncoder::encodeChar(FX_WCHAR c,
sb += (FX_WCHAR)(c - 97 + 14);
return 1;
}
- if (c >= '\0' && c <= 0x1f) {
+ if (c <= 0x1f) {
sb += (FX_WCHAR)'\0';
sb += c;
return 2;