mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 18:07:35 +00:00
Everywhere: Rename to_{string => deprecated_string}() where applicable
This will make it easier to support both string types at the same time while we convert code, and tracking down remaining uses. One big exception is Value::to_string() in LibJS, where the name is dictated by the ToString AO.
This commit is contained in:
Linus Groh
Andreas Kling
parent
6e19ab2bbc
commit
57dc179b1f
597 changed files with 1973 additions and 1972 deletions
|
|
@ -95,13 +95,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
Vector<JsonValue> sorted_regions = json.as_array().values();
|
||||
quick_sort(sorted_regions, [](auto& a, auto& b) {
|
||||
return a.as_object().get("ip_address"sv).to_string() < b.as_object().get("ip_address"sv).to_string();
|
||||
return a.as_object().get("ip_address"sv).to_deprecated_string() < b.as_object().get("ip_address"sv).to_deprecated_string();
|
||||
});
|
||||
|
||||
for (auto& value : sorted_regions) {
|
||||
auto& if_object = value.as_object();
|
||||
|
||||
auto ip_address = if_object.get("ip_address"sv).to_string();
|
||||
auto ip_address = if_object.get("ip_address"sv).to_deprecated_string();
|
||||
|
||||
if (!flag_numeric) {
|
||||
auto from_string = IPv4Address::from_string(ip_address);
|
||||
|
|
@ -114,7 +114,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto mac_address = if_object.get("mac_address"sv).to_string();
|
||||
auto mac_address = if_object.get("mac_address"sv).to_deprecated_string();
|
||||
|
||||
if (proto_address_column != -1)
|
||||
columns[proto_address_column].buffer = ip_address;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
auto hash_name = program_name.substring_view(0, program_name.length() - 3).to_string().to_uppercase();
|
||||
auto hash_name = program_name.substring_view(0, program_name.length() - 3).to_deprecated_string().to_uppercase();
|
||||
auto paths_help_string = DeprecatedString::formatted("File(s) to print {} checksum of", hash_name);
|
||||
|
||||
bool verify_from_paths = false;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ static ErrorOr<Options> parse_options(Main::Arguments arguments)
|
|||
// Copy the rest of our command-line args.
|
||||
StringBuilder builder;
|
||||
builder.join(' ', text);
|
||||
options.data = builder.to_string();
|
||||
options.data = builder.to_deprecated_string();
|
||||
}
|
||||
|
||||
return options;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
Cpp::Lexer lexer(content);
|
||||
lexer.lex_iterable([](auto token) {
|
||||
outln("{}", token.to_string());
|
||||
outln("{}", token.to_deprecated_string());
|
||||
});
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
|
||||
for (auto& token : tokens) {
|
||||
outln("{}", token.to_string());
|
||||
outln("{}", token.to_deprecated_string());
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -58,17 +58,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
warnln("date: Format string must start with '+'");
|
||||
return 1;
|
||||
}
|
||||
outln("{}", date.to_string(format_string.substring_view(1)));
|
||||
outln("{}", date.to_deprecated_string(format_string.substring_view(1)));
|
||||
} else if (print_unix_date) {
|
||||
outln("{}", date.timestamp());
|
||||
} else if (print_iso_8601) {
|
||||
outln("{}", date.to_string("%Y-%m-%dT%H:%M:%S%:z"sv));
|
||||
outln("{}", date.to_deprecated_string("%Y-%m-%dT%H:%M:%S%:z"sv));
|
||||
} else if (print_rfc_5322) {
|
||||
outln("{}", date.to_string("%a, %d %b %Y %H:%M:%S %z"sv));
|
||||
outln("{}", date.to_deprecated_string("%a, %d %b %Y %H:%M:%S %z"sv));
|
||||
} else if (print_rfc_3339) {
|
||||
outln("{}", date.to_string("%Y-%m-%d %H:%M:%S%:z"sv));
|
||||
outln("{}", date.to_deprecated_string("%Y-%m-%d %H:%M:%S%:z"sv));
|
||||
} else {
|
||||
outln("{}", date.to_string("%Y-%m-%d %H:%M:%S %Z"sv));
|
||||
outln("{}", date.to_deprecated_string("%Y-%m-%d %H:%M:%S %Z"sv));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ static int handle_io_file_arguments(int& fd, int flags, StringView argument)
|
|||
return -1;
|
||||
}
|
||||
|
||||
fd = open(value.to_string().characters(), flags, 0666);
|
||||
fd = open(value.to_deprecated_string().characters(), flags, 0666);
|
||||
if (fd == -1) {
|
||||
warnln("Unable to open: {}", value);
|
||||
return -1;
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
auto const& json = json_result.as_array();
|
||||
json.for_each([](auto& value) {
|
||||
auto& fs_object = value.as_object();
|
||||
auto fs = fs_object.get("class_name"sv).to_string();
|
||||
auto fs = fs_object.get("class_name"sv).to_deprecated_string();
|
||||
auto total_block_count = fs_object.get("total_block_count"sv).to_u64();
|
||||
auto free_block_count = fs_object.get("free_block_count"sv).to_u64();
|
||||
[[maybe_unused]] auto total_inode_count = fs_object.get("total_inode_count"sv).to_u64();
|
||||
[[maybe_unused]] auto free_inode_count = fs_object.get("free_inode_count"sv).to_u64();
|
||||
auto block_size = fs_object.get("block_size"sv).to_u64();
|
||||
auto mount_point = fs_object.get("mount_point"sv).to_string();
|
||||
auto mount_point = fs_object.get("mount_point"sv).to_deprecated_string();
|
||||
|
||||
out("{:10}", fs);
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
|
|||
builder.append(" "sv);
|
||||
}
|
||||
builder.append(" "sv);
|
||||
builder.append(insn.value().to_string(virtual_offset, symbol_provider));
|
||||
builder.append(insn.value().to_deprecated_string(virtual_offset, symbol_provider));
|
||||
outln("{}", builder.string_view());
|
||||
|
||||
for (size_t bytes_printed = 7; bytes_printed < length; bytes_printed += 7) {
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ ErrorOr<u64> print_space_usage(DeprecatedString const& path, DuOption const& du_
|
|||
break;
|
||||
}
|
||||
|
||||
auto const formatted_time = Core::DateTime::from_timestamp(time).to_string();
|
||||
auto const formatted_time = Core::DateTime::from_timestamp(time).to_deprecated_string();
|
||||
outln("\t{}\t{}", formatted_time, path);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
TRY(Core::System::write(1, str.bytes()));
|
||||
if (feof(stdin))
|
||||
return 0;
|
||||
VERIFY(str.to_string().characters());
|
||||
VERIFY(str.to_deprecated_string().characters());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,11 +106,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
outln(); // Tasteful spacing
|
||||
|
||||
out("\033]8;;{}\033\\", chosen_quote.url()); // Begin link
|
||||
out("\033[34m({})\033[m", datetime.to_string()); // Datetime
|
||||
out(" \033[34;1m<{}>\033[m", chosen_quote.author()); // Author
|
||||
out(" \033[32m{}\033[m", chosen_quote.quote()); // Quote itself
|
||||
out("\033]8;;\033\\"); // End link
|
||||
out("\033]8;;{}\033\\", chosen_quote.url()); // Begin link
|
||||
out("\033[34m({})\033[m", datetime.to_deprecated_string()); // Datetime
|
||||
out(" \033[34;1m<{}>\033[m", chosen_quote.author()); // Author
|
||||
out(" \033[32m{}\033[m", chosen_quote.quote()); // Quote itself
|
||||
out("\033]8;;\033\\"); // End link
|
||||
outln();
|
||||
|
||||
if (chosen_quote.context().has_value())
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
|
|||
auto pre_match_length = match.global_offset - last_printed_char_pos;
|
||||
out(colored_output ? "{}\x1B[32m{}\x1B[0m"sv : "{}{}"sv,
|
||||
pre_match_length > 0 ? StringView(&str[last_printed_char_pos], pre_match_length) : ""sv,
|
||||
match.view.to_string());
|
||||
match.view.to_deprecated_string());
|
||||
last_printed_char_pos = match.global_offset + match.view.length();
|
||||
}
|
||||
auto remaining_length = str.length() - last_printed_char_pos;
|
||||
|
|
|
|||
|
|
@ -38,11 +38,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
json.as_array().for_each([](auto& value) {
|
||||
auto& if_object = value.as_object();
|
||||
|
||||
auto name = if_object.get("name"sv).to_string();
|
||||
auto class_name = if_object.get("class_name"sv).to_string();
|
||||
auto mac_address = if_object.get("mac_address"sv).to_string();
|
||||
auto ipv4_address = if_object.get("ipv4_address"sv).to_string();
|
||||
auto netmask = if_object.get("ipv4_netmask"sv).to_string();
|
||||
auto name = if_object.get("name"sv).to_deprecated_string();
|
||||
auto class_name = if_object.get("class_name"sv).to_deprecated_string();
|
||||
auto mac_address = if_object.get("mac_address"sv).to_deprecated_string();
|
||||
auto ipv4_address = if_object.get("ipv4_address"sv).to_deprecated_string();
|
||||
auto netmask = if_object.get("ipv4_netmask"sv).to_deprecated_string();
|
||||
auto packets_in = if_object.get("packets_in"sv).to_u32();
|
||||
auto bytes_in = if_object.get("bytes_in"sv).to_u32();
|
||||
auto packets_out = if_object.get("packets_out"sv).to_u32();
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ static DeprecatedString read_next_piece()
|
|||
}
|
||||
} while (s_repl_line_level + line_level_delta_for_next_line > 0);
|
||||
|
||||
return piece.to_string();
|
||||
return piece.to_deprecated_string();
|
||||
}
|
||||
|
||||
static bool write_to_file(DeprecatedString const& path)
|
||||
|
|
@ -227,7 +227,7 @@ static ErrorOr<bool> parse_and_run(JS::Interpreter& interpreter, StringView sour
|
|||
if (JS::Bytecode::g_dump_bytecode || s_run_bytecode) {
|
||||
auto executable_result = JS::Bytecode::Generator::generate(script_or_module->parse_node());
|
||||
if (executable_result.is_error()) {
|
||||
result = g_vm->throw_completion<JS::InternalError>(executable_result.error().to_string());
|
||||
result = g_vm->throw_completion<JS::InternalError>(executable_result.error().to_deprecated_string());
|
||||
return ReturnEarly::No;
|
||||
}
|
||||
|
||||
|
|
@ -266,8 +266,8 @@ static ErrorOr<bool> parse_and_run(JS::Interpreter& interpreter, StringView sour
|
|||
auto hint = error.source_location_hint(source);
|
||||
if (!hint.is_empty())
|
||||
outln("{}", hint);
|
||||
outln("{}", error.to_string());
|
||||
result = interpreter.vm().throw_completion<JS::SyntaxError>(error.to_string());
|
||||
outln("{}", error.to_deprecated_string());
|
||||
result = interpreter.vm().throw_completion<JS::SyntaxError>(error.to_deprecated_string());
|
||||
} else {
|
||||
auto return_early = run_script_or_module(script_or_error.value());
|
||||
if (return_early == ReturnEarly::Yes)
|
||||
|
|
@ -280,8 +280,8 @@ static ErrorOr<bool> parse_and_run(JS::Interpreter& interpreter, StringView sour
|
|||
auto hint = error.source_location_hint(source);
|
||||
if (!hint.is_empty())
|
||||
outln("{}", hint);
|
||||
outln(error.to_string());
|
||||
result = interpreter.vm().throw_completion<JS::SyntaxError>(error.to_string());
|
||||
outln(error.to_deprecated_string());
|
||||
result = interpreter.vm().throw_completion<JS::SyntaxError>(error.to_deprecated_string());
|
||||
} else {
|
||||
auto return_early = run_script_or_module(module_or_error.value());
|
||||
if (return_early == ReturnEarly::Yes)
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ void print(JsonValue const& value, int spaces_per_indent, int indent, bool use_c
|
|||
}
|
||||
if (value.is_string())
|
||||
out("\"");
|
||||
out("{}", value.to_string());
|
||||
out("{}", value.to_deprecated_string());
|
||||
if (value.is_string())
|
||||
out("\"");
|
||||
if (use_color)
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@ static bool print_filesystem_object(DeprecatedString const& path, DeprecatedStri
|
|||
}
|
||||
}
|
||||
|
||||
printf(" %s ", Core::DateTime::from_timestamp(st.st_mtime).to_string().characters());
|
||||
printf(" %s ", Core::DateTime::from_timestamp(st.st_mtime).to_deprecated_string().characters());
|
||||
|
||||
print_name(st, name, path.characters(), path.characters());
|
||||
|
||||
|
|
@ -419,7 +419,7 @@ static int do_file_system_object_long(char const* path)
|
|||
builder.append({ path, strlen(path) });
|
||||
builder.append('/');
|
||||
builder.append(metadata.name);
|
||||
metadata.path = builder.to_string();
|
||||
metadata.path = builder.to_deprecated_string();
|
||||
VERIFY(!metadata.path.is_null());
|
||||
int rc = lstat(metadata.path.characters(), &metadata.stat);
|
||||
if (rc < 0)
|
||||
|
|
@ -463,7 +463,7 @@ static bool print_names(char const* path, size_t longest_name, Vector<FileMetada
|
|||
builder.append({ path, strlen(path) });
|
||||
builder.append('/');
|
||||
builder.append(name);
|
||||
if (!print_filesystem_object_short(builder.to_string().characters(), name.characters(), &nprinted))
|
||||
if (!print_filesystem_object_short(builder.to_deprecated_string().characters(), name.characters(), &nprinted))
|
||||
return 2;
|
||||
int offset = 0;
|
||||
if (terminal_columns > longest_name)
|
||||
|
|
@ -531,7 +531,7 @@ int do_file_system_object_short(char const* path)
|
|||
builder.append({ path, strlen(path) });
|
||||
builder.append('/');
|
||||
builder.append(metadata.name);
|
||||
metadata.path = builder.to_string();
|
||||
metadata.path = builder.to_deprecated_string();
|
||||
VERIFY(!metadata.path.is_null());
|
||||
int rc = lstat(metadata.path.characters(), &metadata.stat);
|
||||
if (rc < 0)
|
||||
|
|
|
|||
|
|
@ -34,15 +34,15 @@ ErrorOr<int> serenity_main(Main::Arguments)
|
|||
|
||||
json.as_array().for_each([cpu_count](JsonValue const& value) {
|
||||
auto& handler = value.as_object();
|
||||
auto purpose = handler.get("purpose"sv).to_string();
|
||||
auto interrupt = handler.get("interrupt_line"sv).to_string();
|
||||
auto controller = handler.get("controller"sv).to_string();
|
||||
auto purpose = handler.get("purpose"sv).to_deprecated_string();
|
||||
auto interrupt = handler.get("interrupt_line"sv).to_deprecated_string();
|
||||
auto controller = handler.get("controller"sv).to_deprecated_string();
|
||||
auto call_counts = handler.get("per_cpu_call_counts"sv).as_array();
|
||||
|
||||
out("{:>4}: ", interrupt);
|
||||
|
||||
for (size_t i = 0; i < cpu_count; ++i)
|
||||
out("{:>10}", call_counts[i].to_string());
|
||||
out("{:>10}", call_counts[i].to_deprecated_string());
|
||||
|
||||
outln(" {:10} {:30}", controller, purpose);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ ErrorOr<int> serenity_main(Main::Arguments)
|
|||
auto json = TRY(JsonValue::from_string(file_contents));
|
||||
json.as_array().for_each([](auto& value) {
|
||||
auto& jail = value.as_object();
|
||||
auto index = jail.get("index"sv).to_string();
|
||||
auto name = jail.get("name"sv).to_string();
|
||||
auto index = jail.get("index"sv).to_deprecated_string();
|
||||
auto name = jail.get("name"sv).to_deprecated_string();
|
||||
|
||||
outln("{:4} {:10}", index, name);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ static Vector<OpenFile> get_open_files_by_pid(pid_t pid)
|
|||
open_file.pid = pid;
|
||||
open_file.fd = object.as_object().get("fd"sv).to_int();
|
||||
|
||||
DeprecatedString name = object.as_object().get("absolute_path"sv).to_string();
|
||||
DeprecatedString name = object.as_object().get("absolute_path"sv).to_deprecated_string();
|
||||
VERIFY(parse_name(name, open_file));
|
||||
open_file.full_name = name;
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
outln("DocTypeVersion is {}", reader.header().doc_type_version);
|
||||
auto segment_information = TRY_PARSE(reader.segment_information());
|
||||
outln("Timestamp scale is {}", segment_information.timestamp_scale());
|
||||
outln("Muxing app is \"{}\"", segment_information.muxing_app().as_string().to_string().characters());
|
||||
outln("Writing app is \"{}\"", segment_information.writing_app().as_string().to_string().characters());
|
||||
outln("Muxing app is \"{}\"", segment_information.muxing_app().as_string().to_deprecated_string().characters());
|
||||
outln("Writing app is \"{}\"", segment_information.writing_app().as_string().to_deprecated_string().characters());
|
||||
|
||||
outln("Document has {} tracks", TRY_PARSE(reader.track_count()));
|
||||
TRY_PARSE(reader.for_each_track([&](Video::Matroska::TrackEntry const& track_entry) -> Video::DecoderErrorOr<IterationDecision> {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ static DeprecatedString generate_random_filename(DeprecatedString const& pattern
|
|||
new_filename.append(pattern[i]);
|
||||
}
|
||||
|
||||
return new_filename.to_string();
|
||||
return new_filename.to_deprecated_string();
|
||||
}
|
||||
|
||||
static ErrorOr<DeprecatedString> make_temp(DeprecatedString const& pattern, bool directory, bool dry_run)
|
||||
|
|
|
|||
|
|
@ -155,8 +155,8 @@ static ErrorOr<void> print_mounts()
|
|||
|
||||
json.as_array().for_each([](auto& value) {
|
||||
auto& fs_object = value.as_object();
|
||||
auto class_name = fs_object.get("class_name"sv).to_string();
|
||||
auto mount_point = fs_object.get("mount_point"sv).to_string();
|
||||
auto class_name = fs_object.get("class_name"sv).to_deprecated_string();
|
||||
auto mount_point = fs_object.get("mount_point"sv).to_deprecated_string();
|
||||
auto source = fs_object.get("source"sv).as_string_or("none");
|
||||
auto readonly = fs_object.get("readonly"sv).to_bool();
|
||||
auto mount_flags = fs_object.get("mount_flags"sv).to_int();
|
||||
|
|
|
|||
|
|
@ -171,10 +171,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
for (auto& value : sorted_regions) {
|
||||
auto& if_object = value.as_object();
|
||||
|
||||
auto bytes_in = if_object.get("bytes_in"sv).to_string();
|
||||
auto bytes_out = if_object.get("bytes_out"sv).to_string();
|
||||
auto bytes_in = if_object.get("bytes_in"sv).to_deprecated_string();
|
||||
auto bytes_out = if_object.get("bytes_out"sv).to_deprecated_string();
|
||||
|
||||
auto peer_address = if_object.get("peer_address"sv).to_string();
|
||||
auto peer_address = if_object.get("peer_address"sv).to_deprecated_string();
|
||||
if (!flag_numeric) {
|
||||
auto from_string = IPv4Address::from_string(peer_address);
|
||||
auto addr = from_string.value().to_in_addr_t();
|
||||
|
|
@ -186,7 +186,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto peer_port = if_object.get("peer_port"sv).to_string();
|
||||
auto peer_port = if_object.get("peer_port"sv).to_deprecated_string();
|
||||
if (!flag_numeric) {
|
||||
auto service = getservbyport(htons(if_object.get("peer_port"sv).to_u32()), "tcp");
|
||||
if (service != nullptr) {
|
||||
|
|
@ -196,7 +196,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto local_address = if_object.get("local_address"sv).to_string();
|
||||
auto local_address = if_object.get("local_address"sv).to_deprecated_string();
|
||||
if (!flag_numeric) {
|
||||
auto from_string = IPv4Address::from_string(local_address);
|
||||
auto addr = from_string.value().to_in_addr_t();
|
||||
|
|
@ -208,7 +208,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto local_port = if_object.get("local_port"sv).to_string();
|
||||
auto local_port = if_object.get("local_port"sv).to_deprecated_string();
|
||||
if (!flag_numeric) {
|
||||
auto service = getservbyport(htons(if_object.get("local_port"sv).to_u32()), "tcp");
|
||||
if (service != nullptr) {
|
||||
|
|
@ -218,7 +218,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto state = if_object.get("state"sv).to_string();
|
||||
auto state = if_object.get("state"sv).to_deprecated_string();
|
||||
auto origin_pid = (if_object.has("origin_pid"sv)) ? if_object.get("origin_pid"sv).to_u32() : -1;
|
||||
|
||||
if (!flag_all && ((state == "Listen" && !flag_list) || (state != "Listen" && flag_list)))
|
||||
|
|
@ -258,7 +258,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
for (auto& value : sorted_regions) {
|
||||
auto& if_object = value.as_object();
|
||||
|
||||
auto local_address = if_object.get("local_address"sv).to_string();
|
||||
auto local_address = if_object.get("local_address"sv).to_deprecated_string();
|
||||
if (!flag_numeric) {
|
||||
auto from_string = IPv4Address::from_string(local_address);
|
||||
auto addr = from_string.value().to_in_addr_t();
|
||||
|
|
@ -270,7 +270,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto local_port = if_object.get("local_port"sv).to_string();
|
||||
auto local_port = if_object.get("local_port"sv).to_deprecated_string();
|
||||
if (!flag_numeric) {
|
||||
auto service = getservbyport(htons(if_object.get("local_port"sv).to_u32()), "udp");
|
||||
if (service != nullptr) {
|
||||
|
|
@ -280,7 +280,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto peer_address = if_object.get("peer_address"sv).to_string();
|
||||
auto peer_address = if_object.get("peer_address"sv).to_deprecated_string();
|
||||
if (!flag_numeric) {
|
||||
auto from_string = IPv4Address::from_string(peer_address);
|
||||
auto addr = from_string.value().to_in_addr_t();
|
||||
|
|
@ -292,7 +292,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
}
|
||||
|
||||
auto peer_port = if_object.get("peer_port"sv).to_string();
|
||||
auto peer_port = if_object.get("peer_port"sv).to_deprecated_string();
|
||||
if (!flag_numeric) {
|
||||
auto service = getservbyport(htons(if_object.get("peer_port"sv).to_u32()), "udp");
|
||||
if (service != nullptr) {
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
for (auto& value : sorted_regions) {
|
||||
auto& map = value.as_object();
|
||||
auto address = map.get("address"sv).to_addr();
|
||||
auto size = map.get("size"sv).to_string();
|
||||
auto size = map.get("size"sv).to_deprecated_string();
|
||||
|
||||
auto access = DeprecatedString::formatted("{}{}{}{}{}",
|
||||
(map.get("readable"sv).to_bool() ? "r" : "-"),
|
||||
|
|
@ -65,13 +65,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
out("{:p} ", address);
|
||||
out("{:>10} ", size);
|
||||
if (extended) {
|
||||
auto resident = map.get("amount_resident"sv).to_string();
|
||||
auto dirty = map.get("amount_dirty"sv).to_string();
|
||||
auto vmobject = map.get("vmobject"sv).to_string();
|
||||
auto resident = map.get("amount_resident"sv).to_deprecated_string();
|
||||
auto dirty = map.get("amount_dirty"sv).to_deprecated_string();
|
||||
auto vmobject = map.get("vmobject"sv).to_deprecated_string();
|
||||
if (vmobject.ends_with("VMObject"sv))
|
||||
vmobject = vmobject.substring(0, vmobject.length() - 8);
|
||||
auto purgeable = map.get("purgeable"sv).to_string();
|
||||
auto cow_pages = map.get("cow_pages"sv).to_string();
|
||||
auto purgeable = map.get("purgeable"sv).to_deprecated_string();
|
||||
auto cow_pages = map.get("cow_pages"sv).to_deprecated_string();
|
||||
out("{:>10} ", resident);
|
||||
out("{:>10} ", dirty);
|
||||
out("{:6} ", access);
|
||||
|
|
@ -81,7 +81,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
} else {
|
||||
out("{:6} ", access);
|
||||
}
|
||||
auto name = map.get("name"sv).to_string();
|
||||
auto name = map.get("name"sv).to_deprecated_string();
|
||||
out("{:20}", name);
|
||||
outln();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -463,9 +463,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
found_dynamic_section = true;
|
||||
|
||||
if (section.entry_count()) {
|
||||
outln("Dynamic section '{}' at offset {:#08x} contains {} entries.", section.name().to_string(), section.offset(), section.entry_count());
|
||||
outln("Dynamic section '{}' at offset {:#08x} contains {} entries.", section.name().to_deprecated_string(), section.offset(), section.entry_count());
|
||||
} else {
|
||||
outln("Dynamic section '{}' at offset {:#08x} contains zero entries.", section.name().to_string(), section.offset());
|
||||
outln("Dynamic section '{}' at offset {:#08x} contains zero entries.", section.name().to_deprecated_string(), section.offset());
|
||||
}
|
||||
|
||||
return IterationDecision::Break;
|
||||
|
|
|
|||
|
|
@ -101,16 +101,16 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
Vector<JsonValue> sorted_regions = json.as_array().values();
|
||||
quick_sort(sorted_regions, [](auto& a, auto& b) {
|
||||
return a.as_object().get("destination"sv).to_string() < b.as_object().get("destination"sv).to_string();
|
||||
return a.as_object().get("destination"sv).to_deprecated_string() < b.as_object().get("destination"sv).to_deprecated_string();
|
||||
});
|
||||
|
||||
for (auto& value : sorted_regions) {
|
||||
auto& if_object = value.as_object();
|
||||
|
||||
auto destination = if_object.get("destination"sv).to_string();
|
||||
auto gateway = if_object.get("gateway"sv).to_string();
|
||||
auto genmask = if_object.get("genmask"sv).to_string();
|
||||
auto interface = if_object.get("interface"sv).to_string();
|
||||
auto destination = if_object.get("destination"sv).to_deprecated_string();
|
||||
auto gateway = if_object.get("gateway"sv).to_deprecated_string();
|
||||
auto genmask = if_object.get("genmask"sv).to_deprecated_string();
|
||||
auto interface = if_object.get("interface"sv).to_deprecated_string();
|
||||
auto flags = if_object.get("flags"sv).to_u32();
|
||||
|
||||
StringBuilder flags_builder;
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ void TestRunner::do_run_single_test(DeprecatedString const& test_path, size_t cu
|
|||
auto tid = thread_info.tid; // Note: Yoinking this out of the struct because we can't pass a reference to it (as it's a misaligned field in a packed struct)
|
||||
dbgln("Thread {}", tid);
|
||||
for (auto const& entry : thread_backtrace.entries())
|
||||
dbgln("- {}", entry.to_string(true));
|
||||
dbgln("- {}", entry.to_deprecated_string(true));
|
||||
return IterationDecision::Continue;
|
||||
});
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
args_parser.parse(arguments);
|
||||
|
||||
if (output_path.is_empty()) {
|
||||
output_path = Core::DateTime::now().to_string("screenshot-%Y-%m-%d-%H-%M-%S.png"sv);
|
||||
output_path = Core::DateTime::now().to_deprecated_string("screenshot-%Y-%m-%d-%H-%M-%S.png"sv);
|
||||
}
|
||||
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
|
|
@ -157,7 +157,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
return 1;
|
||||
}
|
||||
if (edit_image)
|
||||
output_path = Core::DateTime::now().to_string("/tmp/screenshot-%Y-%m-%d-%H-%M-%S.png"sv);
|
||||
output_path = Core::DateTime::now().to_deprecated_string("/tmp/screenshot-%Y-%m-%d-%H-%M-%S.png"sv);
|
||||
|
||||
auto file_or_error = Core::Stream::File::open(output_path, Core::Stream::OpenMode::ReadWrite);
|
||||
if (file_or_error.is_error()) {
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ private:
|
|||
m_repl_line_level = last_token_ended_statement ? 0 : (m_repl_line_level > 0 ? m_repl_line_level : 1);
|
||||
} while ((m_repl_line_level > 0) || piece.is_empty());
|
||||
|
||||
return piece.to_string();
|
||||
return piece.to_deprecated_string();
|
||||
}
|
||||
|
||||
void read_sql()
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ static ErrorOr<int> stat(StringView file, bool should_follow_links)
|
|||
outln(")");
|
||||
|
||||
auto print_time = [](timespec t) {
|
||||
outln("{}.{:09}", Core::DateTime::from_timestamp(t.tv_sec).to_string(), t.tv_nsec);
|
||||
outln("{}.{:09}", Core::DateTime::from_timestamp(t.tv_sec).to_deprecated_string(), t.tv_nsec);
|
||||
};
|
||||
|
||||
out("Accessed: ");
|
||||
|
|
|
|||
|
|
@ -602,7 +602,7 @@ struct Formatter<struct sockaddr> : StandardFormatter {
|
|||
builder.appendff(
|
||||
", sin_port={}, sin_addr={}",
|
||||
address_in->sin_port,
|
||||
IPv4Address(address_in->sin_addr.s_addr).to_string());
|
||||
IPv4Address(address_in->sin_addr.s_addr).to_deprecated_string());
|
||||
} else if (address.sa_family == AF_UNIX) {
|
||||
auto* address_un = (const struct sockaddr_un*)&address;
|
||||
builder.appendff(
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ void print_human_readable(termios const& modes, winsize const& ws, bool verbose_
|
|||
} else {
|
||||
sb.append(ch);
|
||||
}
|
||||
return sb.to_string();
|
||||
return sb.to_deprecated_string();
|
||||
};
|
||||
|
||||
auto print_control_characters = [&] {
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ static FlatPtr as_buf(Vector<FlatPtr> params_vec)
|
|||
builder.appendff(" {:p}", params_vec[i]);
|
||||
}
|
||||
builder.appendff(" ] at {:p}", (FlatPtr)buf);
|
||||
dbgln("{}", builder.to_string());
|
||||
dbgln("{}", builder.to_deprecated_string());
|
||||
}
|
||||
|
||||
// Leak the buffer here. We need to keep it until the special syscall happens,
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
long_name.append(reinterpret_cast<char*>(slice.data()), slice.size());
|
||||
}
|
||||
|
||||
local_overrides.set("path", long_name.to_string());
|
||||
local_overrides.set("path", long_name.to_deprecated_string());
|
||||
TRY(tar_stream->advance());
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ static ErrorOr<DeprecatedString> build_set(StringView specification)
|
|||
TRY(out.try_append(lexer.consume(1)));
|
||||
}
|
||||
|
||||
return out.to_string();
|
||||
return out.to_deprecated_string();
|
||||
}
|
||||
|
||||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
|
|
@ -134,7 +134,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
if (!from_str.contains(static_cast<char>(ch)))
|
||||
TRY(complement_set.try_append(static_cast<char>(ch)));
|
||||
}
|
||||
from_str = complement_set.to_string();
|
||||
from_str = complement_set.to_deprecated_string();
|
||||
}
|
||||
|
||||
auto to_str = TRY(build_set(to_chars));
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ static void print_directory_tree(DeprecatedString const& root_path, int depth, D
|
|||
builder.append('/');
|
||||
}
|
||||
builder.append(name);
|
||||
DeprecatedString full_path = builder.to_string();
|
||||
DeprecatedString full_path = builder.to_deprecated_string();
|
||||
|
||||
struct stat st;
|
||||
int rc = lstat(full_path.characters(), &st);
|
||||
|
|
|
|||
|
|
@ -54,6 +54,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
parts.append(uts.machine);
|
||||
StringBuilder builder;
|
||||
builder.join(' ', parts);
|
||||
puts(builder.to_string().characters());
|
||||
puts(builder.to_deprecated_string().characters());
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
TRY(file->seek(0, Core::Stream::SeekMode::SetPosition));
|
||||
TRY(file->truncate(0));
|
||||
TRY(file->write(json.to_string().bytes()));
|
||||
TRY(file->write(json.to_deprecated_string().bytes()));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ ErrorOr<int> serenity_main(Main::Arguments)
|
|||
[[maybe_unused]] auto pid = entry.get("pid"sv).to_i32();
|
||||
|
||||
auto login_time = Core::DateTime::from_timestamp(entry.get("login_at"sv).to_number<time_t>());
|
||||
auto login_at = login_time.to_string("%b%d %H:%M:%S"sv);
|
||||
auto login_at = login_time.to_deprecated_string("%b%d %H:%M:%S"sv);
|
||||
|
||||
auto* pw = getpwuid(uid);
|
||||
DeprecatedString username;
|
||||
|
|
@ -64,7 +64,7 @@ ErrorOr<int> serenity_main(Main::Arguments)
|
|||
auto idle_time = now - st.st_mtime;
|
||||
if (idle_time >= 0) {
|
||||
builder.appendff("{}s", idle_time);
|
||||
idle_string = builder.to_string();
|
||||
idle_string = builder.to_deprecated_string();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ static Optional<Wasm::Module> parse(StringView filename)
|
|||
auto parse_result = Wasm::Module::parse(stream);
|
||||
if (parse_result.is_error()) {
|
||||
warnln("Something went wrong, either the file is invalid, or there's a bug with LibWasm!");
|
||||
warnln("The parse error was {}", Wasm::parse_error_to_string(parse_result.error()));
|
||||
warnln("The parse error was {}", Wasm::parse_error_to_deprecated_string(parse_result.error()));
|
||||
return {};
|
||||
}
|
||||
return parse_result.release_value();
|
||||
|
|
@ -405,7 +405,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
ByteBuffer buffer = stream.copy_into_contiguous_buffer();
|
||||
argument_builder.append(StringView(buffer).trim_whitespace());
|
||||
}
|
||||
dbgln("[wasm runtime] Stub function {} was called with the following arguments: {}", name, argument_builder.to_string());
|
||||
dbgln("[wasm runtime] Stub function {} was called with the following arguments: {}", name, argument_builder.to_deprecated_string());
|
||||
Vector<Wasm::Value> result;
|
||||
result.ensure_capacity(type.results().size());
|
||||
for (auto& result_type : type.results())
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ bool run_command(Vector<char*>&& child_argv, bool verbose, bool is_stdin, int de
|
|||
if (verbose) {
|
||||
StringBuilder builder;
|
||||
builder.join(' ', child_argv);
|
||||
warnln("xargs: {}", builder.to_string());
|
||||
warnln("xargs: {}", builder.to_deprecated_string());
|
||||
}
|
||||
|
||||
auto pid = fork();
|
||||
|
|
@ -266,6 +266,6 @@ void ParsedInitialArguments::for_each_joined_argument(StringView separator, Func
|
|||
for (auto& parts : m_all_parts) {
|
||||
builder.clear();
|
||||
builder.join(separator, parts);
|
||||
callback(builder.to_string());
|
||||
callback(builder.to_deprecated_string());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ static void do_run_tests(XML::Document& document)
|
|||
path_builder.append(entry);
|
||||
path_builder.append('/');
|
||||
}
|
||||
auto test_base_path = path_builder.to_string();
|
||||
auto test_base_path = path_builder.to_deprecated_string();
|
||||
|
||||
path_builder.append(suite.attributes.find("URI")->value);
|
||||
auto url = URL::create_with_file_scheme(path_builder.string_view());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue