Clean up fx_basic_util a little

xfa/fgas/font/fgas_stdfontmgr.cpp

 // Copyright 2015 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/fgas/font/fgas_stdfontmgr.h"
 
 #include "core/fxcrt/fx_stream.h"
 #include "core/fxge/cfx_fontmapper.h"
@@ skipping 468 matching lines @@
 CFX_FontDescriptor::~CFX_FontDescriptor() {}
 
 CFX_FontSourceEnum_File::CFX_FontSourceEnum_File() {
   for (size_t i = 0; i < FX_ArraySize(g_FontFolders); ++i)
     m_FolderPaths.Add(g_FontFolders[i]);
 }
 
 CFX_FontSourceEnum_File::~CFX_FontSourceEnum_File() {}
 
 CFX_ByteString CFX_FontSourceEnum_File::GetNextFile() {
-Restart:
-  void* pCurHandle =
+  FX_FileHandle* pCurHandle =
       m_FolderQueue.GetSize() != 0
           ? m_FolderQueue.GetDataPtr(m_FolderQueue.GetSize() - 1)->pFileHandle
           : nullptr;
   if (!pCurHandle) {
-    if (m_FolderPaths.GetSize() < 1) {
+    if (m_FolderPaths.GetSize() < 1)
       return "";
-    }
     pCurHandle =
         FX_OpenFolder(m_FolderPaths[m_FolderPaths.GetSize() - 1].c_str());
     FX_HandleParentPath hpp;
     hpp.pFileHandle = pCurHandle;
     hpp.bsParentPath = m_FolderPaths[m_FolderPaths.GetSize() - 1];
     m_FolderQueue.Add(hpp);
   }
   CFX_ByteString bsName;
-  FX_BOOL bFolder;
+  bool bFolder;
   CFX_ByteString bsFolderSpearator =
       CFX_ByteString::FromUnicode(CFX_WideString(FX_GetFolderSeparator()));
-  while (TRUE) {
-    if (!FX_GetNextFile(pCurHandle, bsName, bFolder)) {
+  while (true) {
+    if (!FX_GetNextFile(pCurHandle, &bsName, &bFolder)) {
       FX_CloseFolder(pCurHandle);
       m_FolderQueue.RemoveAt(m_FolderQueue.GetSize() - 1);
       if (m_FolderQueue.GetSize() == 0) {
         m_FolderPaths.RemoveAt(m_FolderPaths.GetSize() - 1);
-        if (m_FolderPaths.GetSize() == 0) {
-          return "";
-        } else {
-          goto Restart;
-        }
+        return m_FolderPaths.GetSize() != 0 ? GetNextFile() : "";
       }
       pCurHandle =
           m_FolderQueue.GetDataPtr(m_FolderQueue.GetSize() - 1)->pFileHandle;
       continue;
     }
-    if (bsName == "." || bsName == "..") {
+    if (bsName == "." || bsName == "..")
       continue;
-    }
     if (bFolder) {
       FX_HandleParentPath hpp;
       hpp.bsParentPath =
           m_FolderQueue.GetDataPtr(m_FolderQueue.GetSize() - 1)->bsParentPath +
           bsFolderSpearator + bsName;
       hpp.pFileHandle = FX_OpenFolder(hpp.bsParentPath.c_str());
-      if (!hpp.pFileHandle) {
+      if (!hpp.pFileHandle)
         continue;
-      }
       m_FolderQueue.Add(hpp);
       pCurHandle = hpp.pFileHandle;
       continue;
     }
     bsName =
         m_FolderQueue.GetDataPtr(m_FolderQueue.GetSize() - 1)->bsParentPath +
         bsFolderSpearator + bsName;
     break;
   }
   return bsName;
@@ skipping 835 matching lines @@
 
 int32_t CFGAS_FontMgrImp::IsPartName(const CFX_WideString& Name1,
                                      const CFX_WideString& Name2) {
   if (Name1.Find(Name2.c_str()) != -1) {
     return 1;
   }
   return 0;
 }
 
 #endif