1 files changed, 76 insertions, 95 deletions

diff --git a/lldb/source/Host/windows/HostInfoWindows.cpp b/lldb/source/Host/windows/HostInfoWindows.cpp
index 6b219029408..a965ec0ea4e 100644
--- a/lldb/source/Host/windows/HostInfoWindows.cpp
+++ b/lldb/source/Host/windows/HostInfoWindows.cpp
@@ -24,127 +24,108 @@ using namespace lldb_private;
 
 FileSpec HostInfoWindows::m_program_filespec;
 
-void
-HostInfoWindows::Initialize()
-{
-    ::CoInitializeEx(nullptr, COINIT_MULTITHREADED);
-    HostInfoBase::Initialize();
+void HostInfoWindows::Initialize() {
+  ::CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+  HostInfoBase::Initialize();
 }
 
-void
-HostInfoWindows::Terminate()
-{
-    HostInfoBase::Terminate();
-    ::CoUninitialize();
+void HostInfoWindows::Terminate() {
+  HostInfoBase::Terminate();
+  ::CoUninitialize();
 }
 
-size_t
-HostInfoWindows::GetPageSize()
-{
-    SYSTEM_INFO systemInfo;
-    GetNativeSystemInfo(&systemInfo);
-    return systemInfo.dwPageSize;
+size_t HostInfoWindows::GetPageSize() {
+  SYSTEM_INFO systemInfo;
+  GetNativeSystemInfo(&systemInfo);
+  return systemInfo.dwPageSize;
 }
 
-bool
-HostInfoWindows::GetOSVersion(uint32_t &major, uint32_t &minor, uint32_t &update)
-{
-    OSVERSIONINFOEX info;
+bool HostInfoWindows::GetOSVersion(uint32_t &major, uint32_t &minor,
+                                   uint32_t &update) {
+  OSVERSIONINFOEX info;
 
-    ZeroMemory(&info, sizeof(OSVERSIONINFOEX));
-    info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+  ZeroMemory(&info, sizeof(OSVERSIONINFOEX));
+  info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
 #pragma warning(push)
 #pragma warning(disable : 4996)
-    // Starting with Microsoft SDK for Windows 8.1, this function is deprecated in favor of the
-    // new Windows Version Helper APIs.  Since we don't specify a minimum SDK version, it's easier
-    // to simply disable the warning rather than try to support both APIs.
-    if (GetVersionEx((LPOSVERSIONINFO)&info) == 0)
-    {
-        return false;
-    }
+  // Starting with Microsoft SDK for Windows 8.1, this function is deprecated in
+  // favor of the
+  // new Windows Version Helper APIs.  Since we don't specify a minimum SDK
+  // version, it's easier
+  // to simply disable the warning rather than try to support both APIs.
+  if (GetVersionEx((LPOSVERSIONINFO)&info) == 0) {
+    return false;
+  }
 #pragma warning(pop)
 
-    major = info.dwMajorVersion;
-    minor = info.dwMinorVersion;
-    update = info.wServicePackMajor;
+  major = info.dwMajorVersion;
+  minor = info.dwMinorVersion;
+  update = info.wServicePackMajor;
 
-    return true;
+  return true;
 }
 
-bool
-HostInfoWindows::GetOSBuildString(std::string &s)
-{
-    s.clear();
-    uint32_t major, minor, update;
-    if (!GetOSVersion(major, minor, update))
-        return false;
-
-    llvm::raw_string_ostream stream(s);
-    stream << "Windows NT " << major << "." << minor << "." << update;
-    return true;
+bool HostInfoWindows::GetOSBuildString(std::string &s) {
+  s.clear();
+  uint32_t major, minor, update;
+  if (!GetOSVersion(major, minor, update))
+    return false;
+
+  llvm::raw_string_ostream stream(s);
+  stream << "Windows NT " << major << "." << minor << "." << update;
+  return true;
 }
 
-bool
-HostInfoWindows::GetOSKernelDescription(std::string &s)
-{
-    return GetOSBuildString(s);
+bool HostInfoWindows::GetOSKernelDescription(std::string &s) {
+  return GetOSBuildString(s);
 }
 
-bool
-HostInfoWindows::GetHostname(std::string &s)
-{
-    wchar_t buffer[MAX_COMPUTERNAME_LENGTH + 1];
-    DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1;
-    if (!::GetComputerNameW(buffer, &dwSize))
-        return false;
+bool HostInfoWindows::GetHostname(std::string &s) {
+  wchar_t buffer[MAX_COMPUTERNAME_LENGTH + 1];
+  DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1;
+  if (!::GetComputerNameW(buffer, &dwSize))
+    return false;
 
-    return llvm::convertWideToUTF8(buffer, s);
+  return llvm::convertWideToUTF8(buffer, s);
 }
 
-FileSpec
-HostInfoWindows::GetProgramFileSpec()
-{
-    static std::once_flag g_once_flag;
-    std::call_once(g_once_flag, []() {
-        std::vector<wchar_t> buffer(PATH_MAX);
-        ::GetModuleFileNameW(NULL, buffer.data(), buffer.size());
-        std::string path;
-        llvm::convertWideToUTF8(buffer.data(), path);
-        m_program_filespec.SetFile(path, false);
-    });
-    return m_program_filespec;
+FileSpec HostInfoWindows::GetProgramFileSpec() {
+  static std::once_flag g_once_flag;
+  std::call_once(g_once_flag, []() {
+    std::vector<wchar_t> buffer(PATH_MAX);
+    ::GetModuleFileNameW(NULL, buffer.data(), buffer.size());
+    std::string path;
+    llvm::convertWideToUTF8(buffer.data(), path);
+    m_program_filespec.SetFile(path, false);
+  });
+  return m_program_filespec;
 }
 
-FileSpec
-HostInfoWindows::GetDefaultShell()
-{
-    std::string shell;
-    GetEnvironmentVar("ComSpec", shell);
-    return FileSpec(shell, false);
+FileSpec HostInfoWindows::GetDefaultShell() {
+  std::string shell;
+  GetEnvironmentVar("ComSpec", shell);
+  return FileSpec(shell, false);
 }
 
-bool
-HostInfoWindows::ComputePythonDirectory(FileSpec &file_spec)
-{
-    FileSpec lldb_file_spec;
-    if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
-        return false;
-    llvm::SmallString<64> path(lldb_file_spec.GetDirectory().AsCString());
-    llvm::sys::path::remove_filename(path);
-    llvm::sys::path::append(path, "lib", "site-packages");
-    std::replace(path.begin(), path.end(), '\\', '/');
-    file_spec.GetDirectory().SetString(path.c_str());
-    return true;
+bool HostInfoWindows::ComputePythonDirectory(FileSpec &file_spec) {
+  FileSpec lldb_file_spec;
+  if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
+    return false;
+  llvm::SmallString<64> path(lldb_file_spec.GetDirectory().AsCString());
+  llvm::sys::path::remove_filename(path);
+  llvm::sys::path::append(path, "lib", "site-packages");
+  std::replace(path.begin(), path.end(), '\\', '/');
+  file_spec.GetDirectory().SetString(path.c_str());
+  return true;
 }
 
-bool
-HostInfoWindows::GetEnvironmentVar(const std::string &var_name, std::string &var)
-{
-    std::wstring wvar_name;
-    if (!llvm::ConvertUTF8toWide(var_name, wvar_name))
-        return false;
-
-    if (const wchar_t *wvar = _wgetenv(wvar_name.c_str()))
-        return llvm::convertWideToUTF8(wvar, var);
+bool HostInfoWindows::GetEnvironmentVar(const std::string &var_name,
+                                        std::string &var) {
+  std::wstring wvar_name;
+  if (!llvm::ConvertUTF8toWide(var_name, wvar_name))
     return false;
+
+  if (const wchar_t *wvar = _wgetenv(wvar_name.c_str()))
+    return llvm::convertWideToUTF8(wvar, var);
+  return false;
 }