RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:57:36 +00:00
Code Issues Activity Actions

Userland: Don't use String::from_utf8() for literal strings

Browse source
This commit is contained in:
Tim Ledbetter 2023-09-14 17:57:11 +01:00 • committed by Andreas Kling
parent 4cc3c41269
commit c74f7e5f2a
8 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Utilities/pkg/AvailablePort.cpp
View file

@ -155,11 +155,11 @@ ErrorOr<HashMap<String, AvailablePort>> AvailablePort::read_available_ports_list
auto name = TRY(extract_port_name_from_column(port_name_column, port_index));
auto website = TRY(String::from_deprecated_string(port_website_column.rows[port_index].render_for_terminal()));
if (website.is_empty())
website = TRY(String::from_utf8("n/a"sv));
website = "n/a"_string;
auto version = TRY(String::from_deprecated_string(port_version_column.rows[port_index].render_for_terminal()));
if (version.is_empty())
version = TRY(String::from_utf8("n/a"sv));
version = "n/a"_string;
TRY(available_ports.try_set(name, AvailablePort { name, version, website }));
}

2
Userland/Utilities/pkg/InstalledPort.cpp
View file

@ -26,7 +26,7 @@ ErrorOr<HashMap<String, InstalledPort>> InstalledPort::read_ports_database()
auto type = InstalledPort::Type::Dependency;
// FIXME: Add versioning when printing these ports!
auto name = TRY(String::from_utf8(parts[2]));
TRY(ports.try_set(name, InstalledPort { TRY(String::from_utf8(parts[2])), type, TRY(String::from_utf8(""sv)) }));
TRY(ports.try_set(name, InstalledPort { TRY(String::from_utf8(parts[2])), type, {} }));
} else if (line.starts_with("auto"sv)) {
auto parts = line.split_view(' ');
VERIFY(parts.size() == 3);