Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lldb/tools/lldb-dap/OutputRedirector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Expected<int> OutputRedirector::GetWriteFileDescriptor() {
return m_fd;
}

Error OutputRedirector::RedirectTo(std::FILE *file_override,
Error OutputRedirector::RedirectTo(std::FILE *fileOverride,
Copy link
Member

@JDevlieghere JDevlieghere Mar 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

@ashgti ashgti Mar 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

@JDevlieghere JDevlieghere Mar 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah no worries. Thanks for the quick turnaround!

std::function<void(StringRef)> callback) {
assert(m_fd == kInvalidDescriptor && "Output readirector already started.");
int new_fd[2];
Expand All @@ -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;
Expand Down
Loading