summaryrefslogtreecommitdiff
path: root/fpdfsdk/javascript
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2017-08-29 16:39:44 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-30 14:35:33 +0000
commitaa3a9cd82df9dff1ef136797259e606a39c18b75 (patch)
tree5ca71f96fa289c5f13d22b371341882b77c7331f /fpdfsdk/javascript
parent980a3ea30872cef9ada360aa85e7c3573d7668b5 (diff)
downloadpdfium-aa3a9cd82df9dff1ef136797259e606a39c18b75.tar.xz
Convert int* references to FX_STRSIZE
Through out the code base there are numerous places where variables are declared using a signed integer type when interacting with the string classes, since they assume that FX_STRSIZE is 'int'. As part of changing the underling type of FX_STRSIZE to be unsigned, these locations are being changed to use FX_STRSIZE. This is necessary as part of converting the type, but has been broken off into a separate CL, since it should be low risk. Some related cleanups that are low risk are included as part of this CL. BUG=pdfium:828 Change-Id: Ifaae54ad195ccde0fe8672f71271d29a6ebd65fd Reviewed-on: https://pdfium-review.googlesource.com/12210 Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'fpdfsdk/javascript')
-rw-r--r--fpdfsdk/javascript/Document.cpp2
-rw-r--r--fpdfsdk/javascript/PublicMethods.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index 9b821471c2..d8934a44f6 100644
--- a/fpdfsdk/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -1016,7 +1016,7 @@ bool Document::documentFileName(CJS_Runtime* pRuntime,
return false;
}
CFX_WideString wsFilePath = m_pFormFillEnv->JS_docGetFilePath();
- int32_t i = wsFilePath.GetLength() - 1;
+ FX_STRSIZE i = wsFilePath.GetLength() - 1;
for (; i >= 0; i--) {
if (wsFilePath[i] == L'\\' || wsFilePath[i] == L'/')
break;
diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index ff1d4fb7b7..ee5bbbacb8 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -366,7 +366,7 @@ double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value,
bool bExit = false;
bool bBadFormat = false;
- int i = 0;
+ FX_STRSIZE i = 0;
int j = 0;
while (i < format.GetLength()) {
@@ -394,7 +394,7 @@ double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value,
case 't': {
int oldj = j;
int nSkip = 0;
- int remaining = format.GetLength() - i - 1;
+ FX_STRSIZE remaining = format.GetLength() - i - 1;
if (remaining == 0 || format[i + 1] != c) {
switch (c) {
@@ -628,10 +628,10 @@ CFX_WideString CJS_PublicMethods::MakeFormatDate(double dDate,
int nMin = JS_GetMinFromTime(dDate);
int nSec = JS_GetSecFromTime(dDate);
- int i = 0;
+ FX_STRSIZE i = 0;
while (i < format.GetLength()) {
wchar_t c = format[i];
- int remaining = format.GetLength() - i - 1;
+ FX_STRSIZE remaining = format.GetLength() - i - 1;
sPart = L"";
switch (c) {
case 'y':