Merge to XFA: Cleanup: Remove some NULL checks in fpdfsdk.
And simplify code.
TBR=ochang@chromium.org
Review URL: https://codereview.chromium.org/1411663013 .
(cherry picked from commit ff5adbc0dfa71270a9979f0c3e1d27923c16218a)
Review URL: https://codereview.chromium.org/1414793016 .
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index 71726a2..c11197d 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -358,20 +358,20 @@
while (*p) {
const char* pTemp = strchr(p, ch);
- if (pTemp == NULL) {
+ if (!pTemp) {
StrArray.SetElement(nIndex, CJS_Value(pRuntime, StrTrim(p).c_str()));
break;
- } else {
- char* pSub = new char[pTemp - p + 1];
- strncpy(pSub, p, pTemp - p);
- *(pSub + (pTemp - p)) = '\0';
-
- StrArray.SetElement(nIndex, CJS_Value(pRuntime, StrTrim(pSub).c_str()));
- delete[] pSub;
-
- nIndex++;
- p = ++pTemp;
}
+
+ char* pSub = new char[pTemp - p + 1];
+ strncpy(pSub, p, pTemp - p);
+ *(pSub + (pTemp - p)) = '\0';
+
+ StrArray.SetElement(nIndex, CJS_Value(pRuntime, StrTrim(pSub).c_str()));
+ delete[] pSub;
+
+ nIndex++;
+ p = ++pTemp;
}
return StrArray;
}
@@ -1796,7 +1796,7 @@
}
CFX_WideString swValue;
- if (pEventHandler->m_pValue != NULL)
+ if (pEventHandler->m_pValue)
swValue = pEventHandler->Value();
if (pEventHandler->WillCommit()) {