mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 18:17:44 +00:00
Everywhere: Rename CommandResult stdout, stderr members to output, error
The names stdout / stderr are bound to conflict with existing declarations when compiling against other LibC's. The build on OpenBSD is broken for this reason at the moment. Lets rename the members to more generic names to resolve the situation.
This commit is contained in:
parent
f3f3b32a00
commit
4674577d80
4 changed files with 8 additions and 8 deletions
|
@ -80,8 +80,8 @@ ErrorOr<CommandResult> command(String const& program, Vector<String> const& argu
|
|||
}
|
||||
return String::copy(result_file->read_all());
|
||||
};
|
||||
auto stdout = read_all_from_pipe(stdout_pipe);
|
||||
auto stderr = read_all_from_pipe(stderr_pipe);
|
||||
auto output = read_all_from_pipe(stdout_pipe);
|
||||
auto error = read_all_from_pipe(stderr_pipe);
|
||||
|
||||
int wstatus { 0 };
|
||||
waitpid(pid, &wstatus, 0);
|
||||
|
@ -94,7 +94,7 @@ ErrorOr<CommandResult> command(String const& program, Vector<String> const& argu
|
|||
# endif
|
||||
}
|
||||
|
||||
return CommandResult { WEXITSTATUS(wstatus), stdout, stderr };
|
||||
return CommandResult { WEXITSTATUS(wstatus), output, error };
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue