Remove implicit cast from CFX_ByteString to (const char*).

fpdfsdk/fpdfxfa/fpdfxfa_doc.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 "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
@@ skipping 638 matching lines @@
   bs.ReleaseBuffer(len * sizeof(unsigned short));
 
   if (pFileHandler == NULL)
     return;
 
   CFPDF_FileStream fileWrite(pFileHandler);
 
   CFX_ByteString content;
   if (fileType == FXFA_SAVEAS_XML) {
     content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n";
-    fileWrite.WriteBlock((const FX_CHAR*)content, fileWrite.GetSize(),
+    fileWrite.WriteBlock(content.c_str(), fileWrite.GetSize(),
                          content.GetLength());
     CFX_WideStringC data(L"data");
     if (m_pXFADocView->GetDoc()->SavePackage(data, &fileWrite)) {
       // Ignoring error.
     }
   } else if (fileType == FXFA_SAVEAS_XDP) {
     if (m_pPDFDoc == NULL)
       return;
     CPDF_Dictionary* pRoot = m_pPDFDoc->GetRoot();
     if (pRoot == NULL)
@@ skipping 22 matching lines @@
         continue;
       if (pPrePDFObj->GetString() == "form") {
         CFX_WideStringC form(L"form");
         m_pXFADocView->GetDoc()->SavePackage(form, &fileWrite);
       } else if (pPrePDFObj->GetString() == "datasets") {
         CFX_WideStringC datasets(L"datasets");
         m_pXFADocView->GetDoc()->SavePackage(datasets, &fileWrite);
       } else {
         if (i == size - 1) {
           CFX_WideString wPath = CFX_WideString::FromUTF16LE(
-              (unsigned short*)(const FX_CHAR*)bs,
+              reinterpret_cast<const unsigned short*>(bs.c_str()),
               bs.GetLength() / sizeof(unsigned short));
           CFX_ByteString bPath = wPath.UTF8Encode();
-          CFX_ByteString szFormat =
+          const char* szFormat =

[Lei Zhang, 2016/04/13 21:54:58]

const char szFormat[] ?

Ditto for line 958.

[Tom Sepez, 2016/04/13 22:25:19]

No, wouldn't that imply a copy into an local aggregate?

               "\n<pdf href=\"%s\" xmlns=\"http://ns.adobe.com/xdp/pdf/\"/>";
-          content.Format(szFormat, (char*)(const FX_CHAR*)bPath);
-          fileWrite.WriteBlock((const FX_CHAR*)content, fileWrite.GetSize(),
+          content.Format(szFormat, bPath.c_str());
+          fileWrite.WriteBlock(content.c_str(), fileWrite.GetSize(),
                                content.GetLength());
         }
 
         CPDF_Stream* pStream = (CPDF_Stream*)pDirectObj;
         CPDF_StreamAcc* pAcc = new CPDF_StreamAcc;
         pAcc->LoadAllData(pStream);
         fileWrite.WriteBlock(pAcc->GetData(), fileWrite.GetSize(),
                              pAcc->GetSize());
         delete pAcc;
       }
@@ skipping 229 matching lines @@
   CFX_ByteString content;
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
   if (!pEnv)
     return FALSE;
 
   CFPDF_FileStream fileStream(pFileHandler);
 
   if (fileType == FXFA_SAVEAS_XML) {
     CFX_WideString ws;
     ws.FromLocal("data");
-    CFX_ByteString content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n";
-    fileStream.WriteBlock((const FX_CHAR*)content, 0, content.GetLength());
+    const char* content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n";
+    fileStream.WriteBlock(content, 0, strlen(content));
     m_pXFADoc->SavePackage(ws.AsStringC(), &fileStream);
   } else if (fileType == FXFA_SAVEAS_XDP) {
     if (flag == 0)
       flag = FXFA_CONFIG | FXFA_TEMPLATE | FXFA_LOCALESET | FXFA_DATASETS |
              FXFA_XMPMETA | FXFA_XFDF | FXFA_FORM;
     if (m_pPDFDoc == NULL) {
       fileStream.Flush();
       return FALSE;
     }
     CPDF_Dictionary* pRoot = m_pPDFDoc->GetRoot();
@@ skipping 302 matching lines @@
   }
 
   return _GetHValueByName(szPropName, hValue,
                           m_pSDKDoc->GetEnv()->GetJSRuntime());
 }
 FX_BOOL CPDFXFA_Document::_GetHValueByName(const CFX_ByteStringC& utf8Name,
                                            FXJSE_HVALUE hValue,
                                            IJS_Runtime* runTime) {
   return runTime->GetHValueByName(utf8Name, hValue);
 }