FX Bool considered harmful, part 3

core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.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 "../../../include/fpdfapi/fpdf_parser.h"
 const char PDF_CharType[256] = {
   //NUL  SOH  STX  ETX  EOT  ENQ  ACK  BEL  BS   HT   LF   VT   FF   CR   SO   SI
     'W', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'W', 'W', 'R', 'W', 'W', 'R', 'R',
@@ skipping 177 matching lines @@
             }
             m_dwCurPos ++;
         }
         if (m_dwCurPos < m_dwSize) {
             m_dwCurPos ++;
         }
         return CFX_ByteStringC(pStart, (FX_STRSIZE)(m_dwCurPos - (pStart - m_pData)));
     }
     return CFX_ByteStringC(pStart, dwSize);
 }
-FX_BOOL CPDF_SimpleParser::SearchToken(const CFX_ByteStringC& token)
+bool CPDF_SimpleParser::SearchToken(const CFX_ByteStringC& token)
 {
     int token_len = token.GetLength();
     while (m_dwCurPos < m_dwSize - token_len) {
         if (FXSYS_memcmp(m_pData + m_dwCurPos, token.GetPtr(), token_len) == 0) {
             break;
         }
         m_dwCurPos ++;
     }
     if (m_dwCurPos == m_dwSize - token_len) {
-        return FALSE;
+        return false;
     }
     m_dwCurPos += token_len;
-    return TRUE;
+    return true;
 }
-FX_BOOL CPDF_SimpleParser::SkipWord(const CFX_ByteStringC& token)
+bool CPDF_SimpleParser::SkipWord(const CFX_ByteStringC& token)
 {
     while (1) {
         CFX_ByteStringC word = GetWord();
         if (word.IsEmpty()) {
-            return FALSE;
+            return false;
         }
         if (word == token) {
-            return TRUE;
+            return true;
         }
     }
-    return FALSE;
+    return false;
 }
-FX_BOOL CPDF_SimpleParser::FindTagPair(const CFX_ByteStringC& start_token, const CFX_ByteStringC& end_token,
+bool CPDF_SimpleParser::FindTagPair(const CFX_ByteStringC& start_token, const CFX_ByteStringC& end_token,
                                        FX_DWORD& start_pos, FX_DWORD& end_pos)
 {
     if (!start_token.IsEmpty()) {
         if (!SkipWord(start_token)) {
-            return FALSE;
+            return false;
         }
         start_pos = m_dwCurPos;
     }
     while (1) {
         end_pos = m_dwCurPos;
         CFX_ByteStringC word = GetWord();
         if (word.IsEmpty()) {
-            return FALSE;
+            return false;
         }
         if (word == end_token) {
-            return TRUE;
+            return true;
         }
     }
-    return FALSE;
+    return false;
 }
-FX_BOOL CPDF_SimpleParser::FindTagParam(const CFX_ByteStringC& token, int nParams)
+bool CPDF_SimpleParser::FindTagParam(const CFX_ByteStringC& token, int nParams)
 {
     nParams ++;
     FX_DWORD* pBuf = FX_Alloc(FX_DWORD, nParams);
     int buf_index = 0;
     int buf_count = 0;
     while (1) {
         pBuf[buf_index++] = m_dwCurPos;
         if (buf_index == nParams) {
             buf_index = 0;
         }
         buf_count ++;
         if (buf_count > nParams) {
             buf_count = nParams;
         }
         CFX_ByteStringC word = GetWord();
         if (word.IsEmpty()) {
             FX_Free(pBuf);
-            return FALSE;
+            return false;
         }
         if (word == token) {
             if (buf_count < nParams) {
                 continue;
             }
             m_dwCurPos = pBuf[buf_index];
             FX_Free(pBuf);
-            return TRUE;
+            return true;
         }
     }
-    return FALSE;
+    return false;
 }
 static int _hex2dec(char ch)
 {
     if (ch >= '0' && ch <= '9') {
         return ch - '0';
     }
     if (ch >= 'a' && ch <= 'f') {
         return ch - 'a' + 10;
     }
     if (ch >= 'A' && ch <= 'F') {
@@ skipping 74 matching lines @@
     switch (pObj->GetType()) {
         case PDFOBJ_NULL:
             buf << FX_BSTRC(" null");
             break;
         case PDFOBJ_BOOLEAN:
         case PDFOBJ_NUMBER:
             buf << " " << pObj->GetString();
             break;
         case PDFOBJ_STRING: {
                 CFX_ByteString str = pObj->GetString();
-                FX_BOOL bHex = ((CPDF_String*)pObj)->IsHex();
+                bool bHex = ((CPDF_String*)pObj)->IsHex();
                 buf << PDF_EncodeString(str, bHex);
                 break;
             }
         case PDFOBJ_NAME: {
                 CFX_ByteString str = pObj->GetString();
                 buf << FX_BSTRC("/") << PDF_NameEncode(str);
                 break;
             }
         case PDFOBJ_REFERENCE: {
                 CPDF_Reference* p = (CPDF_Reference*)pObj;
@@ skipping 28 matching lines @@
                         buf << pValue;
                     }
                 }
                 buf << FX_BSTRC(">>");
                 break;
             }
         case PDFOBJ_STREAM: {
                 CPDF_Stream* p = (CPDF_Stream*)pObj;
                 buf << p->GetDict() << FX_BSTRC("stream\r\n");
                 CPDF_StreamAcc acc;
-                acc.LoadAllData(p, TRUE);
+                acc.LoadAllData(p, true);
                 buf.AppendBlock(acc.GetData(), acc.GetSize());
                 buf << FX_BSTRC("\r\nendstream");
                 break;
             }
         default:
-            ASSERT(FALSE);
+            ASSERT(false);
             break;
     }
     return buf;
 }
 FX_FLOAT PDF_ClipFloat(FX_FLOAT f)
 {
     if (f < 0) {
         return 0;
     }
     if (f > 1.0f) {
@@ skipping 34 matching lines @@
         if (pFound) {
             return pFound;
         }
     }
     return NULL;
 }
 CPDF_Object* CPDF_NumberTree::LookupValue(int num)
 {
     return SearchNumberNode(m_pRoot, num);
 }