Clean up XFA code which causes warnings

xfa/fde/cfde_txtedtengine.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/fde/cfde_txtedtengine.h"
 
 #include "xfa/fde/cfde_txtedtbuf.h"
 #include "xfa/fde/cfde_txtedtbufiter.h"
@@ skipping 1005 matching lines @@
 void CFDE_TxtEdtEngine::UpdatePages() {
   if (m_nLineCount == 0)
     return;
 
   int32_t nPageCount = (m_nLineCount - 1) / (m_nPageLineCount) + 1;
   int32_t nSize = m_PagePtrArray.GetSize();
   if (nSize == nPageCount)
     return;
 
   if (nSize > nPageCount) {
-    IFDE_TxtEdtPage* pPage = NULL;
-    int32_t i = 0;
-    for (i = nSize - 1; i >= nPageCount; i--) {
+    for (int32_t i = nSize - 1; i >= nPageCount; i--) {
       delete m_PagePtrArray[i];
       m_PagePtrArray.RemoveAt(i);
     }
     return;
   }
   if (nSize < nPageCount) {
-    IFDE_TxtEdtPage* pPage = NULL;
-    int32_t i = 0;
-    for (i = nSize; i < nPageCount; i++) {
-      pPage = IFDE_TxtEdtPage::Create(this, i);
-      m_PagePtrArray.Add(pPage);
-    }
+    for (int32_t i = nSize; i < nPageCount; i++)
+      m_PagePtrArray.Add(IFDE_TxtEdtPage::Create(this, i));
     return;
   }
 }
 
 void CFDE_TxtEdtEngine::UpdateTxtBreak() {
   uint32_t dwStyle = m_pTextBreak->GetLayoutStyles();
   if (m_Param.dwMode & FDE_TEXTEDITMODE_MultiLines) {
     dwStyle &= ~FX_TXTLAYOUTSTYLE_SingleLine;
   } else {
     dwStyle |= FX_TXTLAYOUTSTYLE_SingleLine;
@@ skipping 549 matching lines @@
 }
 
 FX_BOOL CFDE_TxtEdtEngine::IsSelect() {
   return m_SelRangePtrArr.GetSize() > 0;
 }
 
 void CFDE_TxtEdtEngine::DeleteSelect() {
   int32_t nCountRange = CountSelRanges();
   if (nCountRange > 0) {
     int32_t nSelStart;
     int32_t nSelCount;

[Lei Zhang, 2016/05/20 03:48:01]

Merge with line 1606.

[Wei Li, 2016/05/20 16:33:14]

Done.

-    while (nCountRange > 0) {

[Lei Zhang, 2016/05/20 03:48:01]

What's wrong here? Should you initialize |nSelStart| instead?

[Wei Li, 2016/05/20 16:33:14]

Yes, the warning is about |nSelStart| may not be initialized. Changing to
do-while makes the immediate assignment explicit. But initializing it would be
ok too. 

+    do {
       nSelCount = GetSelRange(--nCountRange, nSelStart);
       delete m_SelRangePtrArr[nCountRange];
       m_SelRangePtrArr.RemoveAt(nCountRange);
       DeleteRange_DoRecord(nSelStart, nSelCount, TRUE);
-    }
+    } while (nCountRange > 0);
     ClearSelection();
     m_Param.pEventSink->On_TextChanged(this, m_ChangeInfo);
     m_Param.pEventSink->On_SelChanged(this);
     SetCaretPos(nSelStart, TRUE);
     return;
   }
 }