Remove NULL in xfa/

xfa/fgas/layout/fgas_rtfbreak.h

 // 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
 
 #ifndef XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
 #define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
 
 #include "core/fxcrt/include/fx_basic.h"
@@ skipping 68 matching lines @@
   int32_t iHorizontalScale;
   int32_t iVerticalScale;
 };
 
 class CFX_RTFPiece : public CFX_Target {
  public:
   CFX_RTFPiece();
   ~CFX_RTFPiece() override;
 
   void AppendChar(const CFX_RTFChar& tc) {
-    ASSERT(m_pChars != NULL);
+    ASSERT(m_pChars);
     m_pChars->Add(tc);
     if (m_iWidth < 0) {
       m_iWidth = tc.m_iCharWidth;
     } else {
       m_iWidth += tc.m_iCharWidth;
     }
     m_iChars++;
   }
   int32_t GetEndPos() const {
     return m_iWidth < 0 ? m_iStartPos : m_iStartPos + m_iWidth;
   }
   int32_t GetLength() const { return m_iChars; }
   int32_t GetEndChar() const { return m_iStartChar + m_iChars; }
   CFX_RTFChar& GetChar(int32_t index) {
-    ASSERT(index > -1 && index < m_iChars && m_pChars != NULL);
+    ASSERT(index > -1 && index < m_iChars && m_pChars);
     return *m_pChars->GetDataPtr(m_iStartChar + index);
   }
   CFX_RTFChar* GetCharPtr(int32_t index) const {
-    ASSERT(index > -1 && index < m_iChars && m_pChars != NULL);
+    ASSERT(index > -1 && index < m_iChars && m_pChars);
     return m_pChars->GetDataPtr(m_iStartChar + index);
   }
   void GetString(FX_WCHAR* pText) const {
-    ASSERT(pText != NULL);
+    ASSERT(pText);
     int32_t iEndChar = m_iStartChar + m_iChars;
     CFX_RTFChar* pChar;
     for (int32_t i = m_iStartChar; i < iEndChar; i++) {
       pChar = m_pChars->GetDataPtr(i);
       *pText++ = (FX_WCHAR)pChar->m_wCharCode;
     }
   }
   void GetString(CFX_WideString& wsText) const {
     FX_WCHAR* pText = wsText.GetBuffer(m_iChars);
     GetString(pText);
     wsText.ReleaseBuffer(m_iChars);
   }
   void GetWidths(int32_t* pWidths) const {
-    ASSERT(pWidths != NULL);
+    ASSERT(pWidths);
     int32_t iEndChar = m_iStartChar + m_iChars;
     CFX_RTFChar* pChar;
     for (int32_t i = m_iStartChar; i < iEndChar; i++) {
       pChar = m_pChars->GetDataPtr(i);
       *pWidths++ = pChar->m_iCharWidth;
     }
   }
   void Reset() {
     m_dwStatus = FX_RTFBREAK_PieceBreak;
     if (m_iWidth > -1) {
@@ skipping 50 matching lines @@
     ASSERT(index > -1 && index < m_LinePieces.GetSize());
     return m_LinePieces.GetPtrAt(index);
   }
   int32_t GetLineEnd() const { return m_iStart + m_iWidth; }
   void RemoveAll(FX_BOOL bLeaveMemory = FALSE) {
     CFX_RTFChar* pChar;
     IFX_Retainable* pUnknown;
     int32_t iCount = m_LineChars.GetSize();
     for (int32_t i = 0; i < iCount; i++) {
       pChar = m_LineChars.GetDataPtr(i);
-      if ((pUnknown = pChar->m_pUserData) != NULL) {
+      pUnknown = pChar->m_pUserData;
+      if (pUnknown)

[Lei Zhang, 2016/06/23 17:56:00]

Just get rid of |pUnknown| ?

[dsinclair, 2016/06/23 18:46:53]

Done.

         pUnknown->Release();
-      }
     }
     m_LineChars.RemoveAll();
     m_LinePieces.RemoveAll(bLeaveMemory);
     m_iWidth = 0;
     m_iArabicChars = 0;
     m_iMBCSChars = 0;
   }
 
   CFX_RTFCharArray m_LineChars;
   CFX_RTFPieceArray m_LinePieces;
@@ skipping 32 matching lines @@
   uint32_t AppendChar(FX_WCHAR wch);
   uint32_t EndBreak(uint32_t dwStatus = FX_RTFBREAK_PieceBreak);
   int32_t CountBreakPieces() const;
   const CFX_RTFPiece* GetBreakPiece(int32_t index) const;
   void GetLineRect(CFX_RectF& rect) const;
   void ClearBreakPieces();
   void Reset();
   int32_t GetDisplayPos(const FX_RTFTEXTOBJ* pText,
                         FXTEXT_CHARPOS* pCharPos,
                         FX_BOOL bCharCode = FALSE,
-                        CFX_WideString* pWSForms = NULL,
-                        FX_AdjustCharDisplayPos pAdjustPos = NULL) const;
+                        CFX_WideString* pWSForms = nullptr,
+                        FX_AdjustCharDisplayPos pAdjustPos = nullptr) const;
   int32_t GetCharRects(const FX_RTFTEXTOBJ* pText,
                        CFX_RectFArray& rtArray,
                        FX_BOOL bCharBBox = FALSE) const;
   uint32_t AppendChar_CharCode(FX_WCHAR wch);
   uint32_t AppendChar_Combination(CFX_RTFChar* pCurChar, int32_t iRotation);
   uint32_t AppendChar_Tab(CFX_RTFChar* pCurChar, int32_t iRotation);
   uint32_t AppendChar_Control(CFX_RTFChar* pCurChar, int32_t iRotation);
   uint32_t AppendChar_Arabic(CFX_RTFChar* pCurChar, int32_t iRotation);
   uint32_t AppendChar_Others(CFX_RTFChar* pCurChar, int32_t iRotation);
 
@@ skipping 53 matching lines @@
   FX_CHARTYPE m_eCharType;
   uint32_t m_dwIdentity;
   CFX_RTFLine m_RTFLine1;
   CFX_RTFLine m_RTFLine2;
   CFX_RTFLine* m_pCurLine;
   int32_t m_iReady;
   int32_t m_iTolerance;
 };
 
 #endif  // XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_