mirror of
https://github.com/RGBCube/serenity
synced 2025-05-14 09:14:58 +00:00
Everywhere: Rename {Deprecated => Byte}String
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:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -4,8 +4,8 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/CharacterTypes.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/GenericLexer.h>
|
||||
#include <AK/JsonArray.h>
|
||||
#include <AK/JsonObject.h>
|
||||
|
@ -22,10 +22,10 @@
|
|||
struct OpenFile {
|
||||
int fd;
|
||||
int pid;
|
||||
DeprecatedString type;
|
||||
DeprecatedString name;
|
||||
DeprecatedString state;
|
||||
DeprecatedString full_name;
|
||||
ByteString type;
|
||||
ByteString name;
|
||||
ByteString state;
|
||||
ByteString full_name;
|
||||
};
|
||||
|
||||
static bool parse_name(StringView name, OpenFile& file)
|
||||
|
@ -66,7 +66,7 @@ static bool parse_name(StringView name, OpenFile& file)
|
|||
|
||||
static Vector<OpenFile> get_open_files_by_pid(pid_t pid)
|
||||
{
|
||||
auto file = Core::File::open(DeprecatedString::formatted("/proc/{}/fds", pid), Core::File::OpenMode::Read);
|
||||
auto file = Core::File::open(ByteString::formatted("/proc/{}/fds", pid), Core::File::OpenMode::Read);
|
||||
if (file.is_error()) {
|
||||
outln("lsof: PID {}: {}", pid, file.error());
|
||||
return Vector<OpenFile>();
|
||||
|
@ -90,7 +90,7 @@ static Vector<OpenFile> get_open_files_by_pid(pid_t pid)
|
|||
open_file.pid = pid;
|
||||
open_file.fd = object.as_object().get_integer<int>("fd"sv).value();
|
||||
|
||||
DeprecatedString name = object.as_object().get_deprecated_string("absolute_path"sv).value_or({});
|
||||
ByteString name = object.as_object().get_byte_string("absolute_path"sv).value_or({});
|
||||
VERIFY(parse_name(name, open_file));
|
||||
open_file.full_name = name;
|
||||
|
||||
|
@ -136,7 +136,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
}
|
||||
{
|
||||
// try convert UID to int
|
||||
auto arg = DeprecatedString(arg_uid).to_int();
|
||||
auto arg = ByteString(arg_uid).to_int();
|
||||
if (arg.has_value())
|
||||
arg_uid_int = arg.value();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue