Clean up fx_basic_util a little

core/fxge/android/fpf_skiafontmgr.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 "core/fxcrt/fx_system.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 
@@ skipping 381 matching lines @@
   args.flags = FT_OPEN_MEMORY;
   args.memory_base = pBuffer;
   args.memory_size = szBuffer;
   FXFT_Face face;
   if (FXFT_Open_Face(m_FTLibrary, &args, iFaceIndex, &face)) {
     return FALSE;
   }
   FXFT_Set_Pixel_Sizes(face, 0, 64);
   return face;
 }
+
 void CFPF_SkiaFontMgr::ScanPath(const CFX_ByteString& path) {
-  void* handle = FX_OpenFolder(path.c_str());
+  DIR* handle = FX_OpenFolder(path.c_str());
   if (!handle) {
     return;
   }
   CFX_ByteString filename;
-  FX_BOOL bFolder = FALSE;
-  while (FX_GetNextFile(handle, filename, bFolder)) {
+  bool bFolder = false;
+  while (FX_GetNextFile(handle, &filename, &bFolder)) {
     if (bFolder) {
-      if (filename == "." || filename == "..") {
+      if (filename == "." || filename == "..")
         continue;
-      }
     } else {
       CFX_ByteString ext = filename.Right(4);
       ext.MakeLower();
-      if (ext != ".ttf" && ext != ".ttc" && ext != ".otf") {
+      if (ext != ".ttf" && ext != ".ttc" && ext != ".otf")
         continue;
-      }
     }
     CFX_ByteString fullpath(path);
     fullpath += "/";
     fullpath += filename;
-    if (bFolder) {
+    if (bFolder)
       ScanPath(fullpath);
-    } else {
+    else
       ScanFile(fullpath);
-    }
   }
   FX_CloseFolder(handle);
 }
+
 void CFPF_SkiaFontMgr::ScanFile(const CFX_ByteString& file) {
   FXFT_Face face = GetFontFace(file.AsStringC());
   if (face) {
     CFPF_SkiaPathFont* pFontDesc = new CFPF_SkiaPathFont;
     pFontDesc->SetPath(file.c_str());
     ReportFace(face, pFontDesc);
     m_FontFaces.push_back(pFontDesc);
     FXFT_Done_Face(face);
   }
 }
+
 static const uint32_t g_FPFSkiaFontCharsets[] = {
     FPF_SKIACHARSET_Ansi,
     FPF_SKIACHARSET_EeasternEuropean,
     FPF_SKIACHARSET_Cyrillic,
     FPF_SKIACHARSET_Greek,
     FPF_SKIACHARSET_Turkish,
     FPF_SKIACHARSET_Hebrew,
     FPF_SKIACHARSET_Arabic,
     FPF_SKIACHARSET_Baltic,
     0,
@@ skipping 14 matching lines @@
     0,
     0,
     0,
     0,
     0,
     0,
     0,
     FPF_SKIACHARSET_OEM,
     FPF_SKIACHARSET_Symbol,
 };
+
 static uint32_t FPF_SkiaGetFaceCharset(TT_OS2* pOS2) {
   uint32_t dwCharset = 0;
   if (pOS2) {
     for (int32_t i = 0; i < 32; i++) {
       if (pOS2->ulCodePageRange1 & (1 << i)) {
         dwCharset |= g_FPFSkiaFontCharsets[i];
       }
     }
   }
   dwCharset |= FPF_SKIACHARSET_Default;
   return dwCharset;
 }
+
 void CFPF_SkiaFontMgr::ReportFace(FXFT_Face face,
                                   CFPF_SkiaFontDescriptor* pFontDesc) {
   if (!face || !pFontDesc) {
     return;
   }
   pFontDesc->SetFamily(FXFT_Get_Face_Family_Name(face));
   if (FXFT_Is_Face_Bold(face)) {
     pFontDesc->m_dwStyle |= FXFONT_BOLD;
   }
   if (FXFT_Is_Face_Italic(face)) {
@@ skipping 14 matching lines @@
       }
     }
   }
   if (pOS2 && (pOS2->ulCodePageRange1 & (1 << 31))) {
     pFontDesc->m_dwStyle |= FXFONT_SYMBOLIC;
   }
   pFontDesc->m_dwCharsets = FPF_SkiaGetFaceCharset(pOS2);
   pFontDesc->m_iFaceIndex = face->face_index;
   pFontDesc->m_iGlyphNum = face->num_glyphs;
 }
+
 void CFPF_SkiaFontMgr::OutputSystemFonts() {}
 #endif