Fix Linux build for the FileSpec changes

Propagate changes that were made during review, and fix a couple of
warnings while I'm in there.

llvm-svn: 297609

1 files changed, 2 insertions, 5 deletions

diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp
index bb96375801e..ddb98401e24 100644
--- a/lldb/source/Host/common/FileSpec.cpp
+++ b/lldb/source/Host/common/FileSpec.cpp
@@ -651,11 +651,8 @@ bool FileSpec::ResolvePath() {
   if (m_is_resolved)
     return true; // We have already resolved this path
 
-  char path_buf[PATH_MAX];
-  if (!GetPath(path_buf, PATH_MAX, false))
-    return false;
   // SetFile(...) will set m_is_resolved correctly if it can resolve the path
-  SetFile(path_buf, true);
+  SetFile(GetPath(false), true);
   return m_is_resolved;
 }
 
@@ -779,7 +776,7 @@ void FileSpec::EnumerateDirectory(llvm::StringRef dir_path,
   for (; Iter != End && !EC; Iter.increment(EC)) {
     const auto &Item = *Iter;
     fs::file_status Status;
-    if (EC = Item.status(Status))
+    if ((EC = Item.status(Status)))
       break;
     if (!find_files && fs::is_regular_file(Status))
       continue;