Merge to XFA: Get rid of most instance of 'foo != NULL'

core/include/fxcrt/fx_ext.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 CORE_INCLUDE_FXCRT_FX_EXT_H_
 #define CORE_INCLUDE_FXCRT_FX_EXT_H_
 
 #include <cctype>
@@ skipping 75 matching lines @@
 void FX_GUID_CreateV4(FX_LPGUID pGUID);
 void FX_GUID_ToString(FX_LPCGUID pGUID,
                       CFX_ByteString& bsStr,
                       FX_BOOL bSeparator = TRUE);
 #endif  // PDF_ENABLE_XFA
 
 template <class baseType>
 class CFX_SSortTemplate {
  public:
   void ShellSort(baseType* pArray, int32_t iCount) {
-    FXSYS_assert(pArray != NULL && iCount > 0);
+    FXSYS_assert(pArray && iCount > 0);
     int32_t i, j, gap;
     baseType v1, v2;
     gap = iCount >> 1;
     while (gap > 0) {
       for (i = gap; i < iCount; i++) {
         j = i - gap;
         v1 = pArray[i];
         while (j > -1 && (v2 = pArray[j]) > v1) {
           pArray[j + gap] = v2;
           j -= gap;
         }
         pArray[j + gap] = v1;
       }
       gap >>= 1;
     }
   }
 };
 
 #endif  // CORE_INCLUDE_FXCRT_FX_EXT_H_