[lldb-dap] Correct the variable name from a half finished merge.

[ashgti]

No description provided.

[llvmbot]

@llvm/pr-subscribers-lldb

Author: John Harrison (ashgti)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/130186.diff

1 Files Affected:

• (modified) lldb/tools/lldb-dap/OutputRedirector.cpp (+3-3)

diff --git a/lldb/tools/lldb-dap/OutputRedirector.cpp b/lldb/tools/lldb-dap/OutputRedirector.cpp
index 44044a6849e0f..9ff25ad4149dd 100644
--- a/lldb/tools/lldb-dap/OutputRedirector.cpp
+++ b/lldb/tools/lldb-dap/OutputRedirector.cpp
@@ -38,7 +38,7 @@ Expected<int> OutputRedirector::GetWriteFileDescriptor() {
   return m_fd;
 }
 
-Error OutputRedirector::RedirectTo(std::FILE *file_override,
+Error OutputRedirector::RedirectTo(std::FILE *fileOverride,
                                    std::function<void(StringRef)> callback) {
   assert(m_fd == kInvalidDescriptor && "Output readirector already started.");
   int new_fd[2];
@@ -56,8 +56,8 @@ Error OutputRedirector::RedirectTo(std::FILE *file_override,
   int read_fd = new_fd[0];
   m_fd = new_fd[1];
 
-  if (override) {
-    int override_fd = fileno(override);
+  if (fileOverride) {
+    int override_fd = fileno(fileOverride);
 
     // Backup the FD to restore once redirection is complete.
     m_original_fd = override_fd;

[ashgti]

I didn't realize the suggestion only updated the variable name in the parameter, sorry!

[JDevlieghere]

But now this doesn't conform to lldb's coding style :( Why not change line 59-60 to file_override?

[ashgti]

Sorry for the churn, I saw I broke the CI job so I was trying to fix it to unblock that.

Created #130202 to conform to lldb's coding style.

[JDevlieghere]

Yeah no worries. Thanks for the quick turnaround!