[Lldb-commits] [lldb] [lldb-dap] Correct the variable name from a half finished merge. (PR #130186)

[John Harrison via lldb-commits]

https://github.com/ashgti created 
https://github.com/llvm/llvm-project/pull/130186

None

>From ab48e2c1ee83ed9068f080d2f072f4fb957e1bb7 Mon Sep 17 00:00:00 2001
From: John Harrison <harj...@google.com>
Date: Thu, 6 Mar 2025 23:06:20 +0100
Subject: [PATCH] [lldb-dap] Correct the variable name from a half finished
 merge.

---
 lldb/tools/lldb-dap/OutputRedirector.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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;

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits