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

Userland: Convert command line arguments to String/StringView

Browse source 
StringView was used where possible. Some utilities still use libc
functions which expect null-terminated strings, so String objects were
used there instead.
This commit is contained in:
sin-ack 2022-07-11 20:42:03 +00:00 • committed by Andreas Kling
parent fded8f861d
commit 60f6bc902b
25 changed files with 101 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Utilities/ifconfig.cpp
View file

@ -25,9 +25,9 @@
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
char const* value_ipv4 = nullptr;
char const* value_adapter = nullptr;
char const* value_mask = nullptr;
StringView value_ipv4 {};
StringView value_adapter {};
StringView value_mask {};
Core::ArgsParser args_parser;
args_parser.set_general_help("Display or modify the configuration of each network interface.");
@ -36,7 +36,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.add_option(value_mask, "Set the network mask of the selected network", "mask", 'm', "mask");
args_parser.parse(arguments);
if (!value_ipv4 && !value_adapter && !value_mask) {
if (value_ipv4.is_empty() && value_adapter.is_empty() && value_mask.is_empty()) {
auto file = TRY(Core::File::open("/proc/net/adapters", Core::OpenMode::ReadOnly));
auto json = TRY(JsonValue::from_string(file->read_all()));
@ -66,14 +66,14 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
});
} else {
if (!value_adapter) {
if (value_adapter.is_empty()) {
warnln("No network adapter was specified.");
return 1;
}
String ifname = value_adapter;
if (value_ipv4) {
if (!value_ipv4.is_empty()) {
auto address = IPv4Address::from_string(value_ipv4);
if (!address.has_value()) {
@ -105,7 +105,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
if (value_mask) {
if (!value_mask.is_empty()) {
auto address = IPv4Address::from_string(value_mask);
if (!address.has_value()) {