Cleanups from prior CLs.

xfa/fxfa/parser/xfa_basic_imp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fxfa/parser/xfa_basic_imp.h"
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fgas/crt/fgas_algorithm.h"
@@ skipping 322 matching lines @@
 }
 
 const XFA_METHODINFO* XFA_GetMethodByName(XFA_ELEMENT eElement,
                                           const CFX_WideStringC& wsMethodName) {
   int32_t iLength = wsMethodName.GetLength();
   if (iLength == 0) {
     return NULL;
   }
   int32_t iElementIndex = eElement;
   while (iElementIndex != -1) {
-    XFA_SCRIPTHIERARCHY const* scriptIndex = g_XFAScriptIndex + iElementIndex;
+    const XFA_SCRIPTHIERARCHY* scriptIndex = g_XFAScriptIndex + iElementIndex;
     int32_t icount = scriptIndex->wMethodCount;
     if (icount == 0) {
       iElementIndex = scriptIndex->wParentIndex;
       continue;
     }
     uint32_t uHash = FX_HashCode_String_GetW(wsMethodName.c_str(), iLength);
     int32_t iStart = scriptIndex->wMethodStart, iEnd = iStart + icount - 1;
     do {
       int32_t iMid = (iStart + iEnd) / 2;
       const XFA_METHODINFO* pInfo = g_SomMethodData + iMid;
@@ skipping 11 matching lines @@
 }
 const XFA_SCRIPTATTRIBUTEINFO* XFA_GetScriptAttributeByName(
     XFA_ELEMENT eElement,
     const CFX_WideStringC& wsAttributeName) {
   int32_t iLength = wsAttributeName.GetLength();
   if (iLength == 0) {
     return NULL;
   }
   int32_t iElementIndex = eElement;
   while (iElementIndex != -1) {
-    XFA_SCRIPTHIERARCHY const* scriptIndex = g_XFAScriptIndex + iElementIndex;
+    const XFA_SCRIPTHIERARCHY* scriptIndex = g_XFAScriptIndex + iElementIndex;
     int32_t icount = scriptIndex->wAttributeCount;
     if (icount == 0) {
       iElementIndex = scriptIndex->wParentIndex;
       continue;
     }
     uint32_t uHash = FX_HashCode_String_GetW(wsAttributeName.c_str(), iLength);
     int32_t iStart = scriptIndex->wAttributeStart, iEnd = iStart + icount - 1;
     do {
       int32_t iMid = (iStart + iEnd) / 2;
       const XFA_SCRIPTATTRIBUTEINFO* pInfo = g_SomAttributeData + iMid;
@@ skipping 183 matching lines @@
   m_iPosition += iMaxLength;
   bEOS = IsEOF();
   return iMaxLength;
 }
 uint16_t CXFA_WideTextRead::GetCodePage() const {
   return (sizeof(FX_WCHAR) == 2) ? FX_CODEPAGE_UTF16LE : FX_CODEPAGE_UTF32LE;
 }
 uint16_t CXFA_WideTextRead::SetCodePage(uint16_t wCodePage) {
   return GetCodePage();
 }