RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:37:37 +00:00
Code Issues Activity Actions

cmp: Replace uses of DeprecatedString

Browse source
This commit is contained in:
Sam Atkins 2023-03-10 13:20:19 +00:00 • committed by Andreas Kling
parent 684af3d4d0
commit f2ae25deee
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Utilities/cmp.cpp
View file

@ -4,12 +4,13 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/String.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
static ErrorOr<NonnullOwnPtr<Core::BufferedFile>> open_file_or_stdin(DeprecatedString const& filename) static ErrorOr<NonnullOwnPtr<Core::BufferedFile>> open_file_or_stdin(StringView filename)
{ {
auto file = TRY(Core::File::open_file_or_standard_stream(filename, Core::File::OpenMode::Read)); auto file = TRY(Core::File::open_file_or_standard_stream(filename, Core::File::OpenMode::Read));
return TRY(Core::BufferedFile::create(move(file))); return TRY(Core::BufferedFile::create(move(file)));
@ -21,8 +22,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio rpath")); TRY(Core::System::pledge("stdio rpath"));
Core::ArgsParser parser; Core::ArgsParser parser;
DeprecatedString filename1; StringView filename1;
DeprecatedString filename2; StringView filename2;
bool verbose = false; bool verbose = false;
bool silent = false; bool silent = false;
@ -58,14 +59,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
outln("{} {} differ: char {}, line {}", filename1, filename2, byte_number, line_number); outln("{} {} differ: char {}, line {}", filename1, filename2, byte_number, line_number);
}; };
auto report_eof = [&](auto& shorter_file_name) { auto report_eof = [&](auto& shorter_file_name) -> ErrorOr<void> {
files_match = false; files_match = false;
if (silent) if (silent)
return; return {};
auto additional_info = verbose auto additional_info = verbose
? DeprecatedString::formatted(" after byte {}", byte_number) ? TRY(String::formatted(" after byte {}", byte_number))
: DeprecatedString::formatted(" after byte {}, line {}", byte_number, line_number); : TRY(String::formatted(" after byte {}, line {}", byte_number, line_number));
warnln("cmp: EOF on {}{}", shorter_file_name, additional_info); warnln("cmp: EOF on {}{}", shorter_file_name, additional_info);
return {};
}; };
while (true) { while (true) {
@ -76,7 +78,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
break; break;
if (file1->is_eof() || file2->is_eof()) { if (file1->is_eof() || file2->is_eof()) {
report_eof(file1->is_eof() ? filename1 : filename2); TRY(report_eof(file1->is_eof() ? filename1 : filename2));
break; break;
} }