RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:34:59 +00:00
Code Issues Activity Actions

Everywhere: Rename {Deprecated => Byte}String

Browse source 
This commit un-deprecates DeprecatedString, and repurposes it as a byte
string.
As the null state has already been removed, there are no other
particularly hairy blockers in repurposing this type as a byte string
(what it _really_ is).

This commit is auto-generated:
  $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \
    Meta Ports Ladybird Tests Kernel)
  $ perl -pie 's/\bDeprecatedString\b/ByteString/g;
    s/deprecated_string/byte_string/g' $xs
  $ clang-format --style=file -i \
    $(git diff --name-only | grep \.cpp\|\.h)
  $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
Ali Mohammad Pur 2023-12-16 17:49:34 +03:30 • committed by Ali Mohammad Pur
parent 38d62563b3
commit 5e1499d104
1615 changed files with 10257 additions and 10257 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Utilities/xargs.cpp
View file

@ -28,9 +28,9 @@ bool read_items(FILE* fp, char entry_separator, Function<Decision(StringView)>);
class ParsedInitialArguments {
public:
ParsedInitialArguments(Vector<DeprecatedString>&, StringView placeholder);
ParsedInitialArguments(Vector<ByteString>&, StringView placeholder);
void for_each_joined_argument(StringView, Function<void(DeprecatedString const&)>) const;
void for_each_joined_argument(StringView, Function<void(ByteString const&)>) const;
size_t size() const { return m_all_parts.size(); }
@ -44,10 +44,10 @@ ErrorOr<int> serenity_main(Main::Arguments main_arguments)
StringView placeholder;
bool split_with_nulls = false;
DeprecatedString specified_delimiter = "\n"sv;
Vector<DeprecatedString> arguments;
ByteString specified_delimiter = "\n"sv;
Vector<ByteString> arguments;
bool verbose = false;
DeprecatedString file_to_read = "-"sv;
ByteString file_to_read = "-"sv;
int max_lines_for_one_command = 0;
int max_bytes_for_one_command = ARG_MAX;
@ -121,7 +121,7 @@ ErrorOr<int> serenity_main(Main::Arguments main_arguments)
if (items_used_for_this_command == 0) {
child_argv.ensure_capacity(initial_arguments.size());
initial_arguments.for_each_joined_argument(item, [&](const DeprecatedString& string) {
initial_arguments.for_each_joined_argument(item, [&](const ByteString& string) {
total_command_length += string.length();
child_argv.append(strdup(string.characters()));
});
@ -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_deprecated_string());
warnln("xargs: {}", builder.to_byte_string());
}
auto pid = fork();
@ -236,7 +236,7 @@ bool run_command(Vector<char*>&& child_argv, bool verbose, bool is_stdin, int de
return true;
}
ParsedInitialArguments::ParsedInitialArguments(Vector<DeprecatedString>& arguments, StringView placeholder)
ParsedInitialArguments::ParsedInitialArguments(Vector<ByteString>& arguments, StringView placeholder)
{
m_all_parts.ensure_capacity(arguments.size());
bool some_argument_has_placeholder = false;
@ -260,12 +260,12 @@ ParsedInitialArguments::ParsedInitialArguments(Vector<DeprecatedString>& argumen
}
}
void ParsedInitialArguments::for_each_joined_argument(StringView separator, Function<void(DeprecatedString const&)> callback) const
void ParsedInitialArguments::for_each_joined_argument(StringView separator, Function<void(ByteString const&)> callback) const
{
StringBuilder builder;
for (auto& parts : m_all_parts) {
builder.clear();
builder.join(separator, parts);
callback(builder.to_deprecated_string());
callback(builder.to_byte_string());
}
}