mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 19:17:44 +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
|
@ -287,7 +287,7 @@ Service::Service(Core::ConfigFile const& config, StringView name)
|
|||
VERIFY(config.has_group(name));
|
||||
|
||||
set_name(name);
|
||||
m_executable_path = config.read_entry(name, "Executable", DeprecatedString::formatted("/bin/{}", this->name()));
|
||||
m_executable_path = config.read_entry(name, "Executable", ByteString::formatted("/bin/{}", this->name()));
|
||||
m_extra_arguments = config.read_entry(name, "Arguments");
|
||||
m_stdio_file_path = config.read_entry_optional(name, "StdIO");
|
||||
|
||||
|
@ -321,12 +321,12 @@ Service::Service(Core::ConfigFile const& config, StringView name)
|
|||
m_multi_instance = config.read_bool_entry(name, "MultiInstance");
|
||||
m_accept_socket_connections = config.read_bool_entry(name, "AcceptSocketConnections");
|
||||
|
||||
DeprecatedString socket_entry = config.read_entry(name, "Socket");
|
||||
DeprecatedString socket_permissions_entry = config.read_entry(name, "SocketPermissions", "0600");
|
||||
ByteString socket_entry = config.read_entry(name, "Socket");
|
||||
ByteString socket_permissions_entry = config.read_entry(name, "SocketPermissions", "0600");
|
||||
|
||||
if (!socket_entry.is_empty()) {
|
||||
Vector<DeprecatedString> socket_paths = socket_entry.split(',');
|
||||
Vector<DeprecatedString> socket_perms = socket_permissions_entry.split(',');
|
||||
Vector<ByteString> socket_paths = socket_entry.split(',');
|
||||
Vector<ByteString> socket_perms = socket_permissions_entry.split(',');
|
||||
m_sockets.ensure_capacity(socket_paths.size());
|
||||
|
||||
// Need i here to iterate along with all other vectors.
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/RefPtr.h>
|
||||
#include <LibCore/Account.h>
|
||||
#include <LibCore/ElapsedTimer.h>
|
||||
|
@ -42,7 +42,7 @@ private:
|
|||
/// requested by a service.
|
||||
struct SocketDescriptor {
|
||||
/// The path of the socket.
|
||||
DeprecatedString path;
|
||||
ByteString path;
|
||||
/// File descriptor of the socket. -1 if the socket hasn't been opened.
|
||||
int fd { -1 };
|
||||
/// File permissions of the socket.
|
||||
|
@ -50,11 +50,11 @@ private:
|
|||
};
|
||||
|
||||
// Path to the executable. By default this is /bin/{m_name}.
|
||||
DeprecatedString m_executable_path;
|
||||
ByteString m_executable_path;
|
||||
// Extra arguments, starting from argv[1], to pass when exec'ing.
|
||||
DeprecatedString m_extra_arguments;
|
||||
ByteString m_extra_arguments;
|
||||
// File path to open as stdio fds.
|
||||
Optional<DeprecatedString> m_stdio_file_path;
|
||||
Optional<ByteString> m_stdio_file_path;
|
||||
int m_priority { 1 };
|
||||
// Whether we should re-launch it if it exits.
|
||||
bool m_keep_alive { false };
|
||||
|
@ -65,15 +65,15 @@ private:
|
|||
// Whether we should only spawn this service once somebody connects to the socket.
|
||||
bool m_lazy;
|
||||
// The name of the user we should run this service as.
|
||||
Optional<DeprecatedString> m_user;
|
||||
Optional<ByteString> m_user;
|
||||
// The working directory in which to spawn the service.
|
||||
Optional<DeprecatedString> m_working_directory;
|
||||
Optional<ByteString> m_working_directory;
|
||||
// System modes in which to run this service. By default, this is the graphical mode.
|
||||
Vector<DeprecatedString> m_system_modes;
|
||||
Vector<ByteString> m_system_modes;
|
||||
// Whether several instances of this service can run at once.
|
||||
bool m_multi_instance { false };
|
||||
// Environment variables to pass to the service.
|
||||
DeprecatedString m_environment;
|
||||
ByteString m_environment;
|
||||
// Socket descriptors for this service.
|
||||
Vector<SocketDescriptor> m_sockets;
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
static constexpr StringView text_system_mode = "text"sv;
|
||||
static constexpr StringView selftest_system_mode = "self-test"sv;
|
||||
static constexpr StringView graphical_system_mode = "graphical"sv;
|
||||
DeprecatedString g_system_mode = graphical_system_mode;
|
||||
ByteString g_system_mode = graphical_system_mode;
|
||||
Vector<NonnullRefPtr<Service>> g_services;
|
||||
|
||||
// NOTE: This handler ensures that the destructor of g_services is called.
|
||||
|
@ -91,7 +91,7 @@ static ErrorOr<void> determine_system_mode()
|
|||
// Continue and assume "text" mode.
|
||||
return {};
|
||||
}
|
||||
DeprecatedString const system_mode = DeprecatedString::copy(system_mode_buf_or_error.value(), Chomp);
|
||||
ByteString const system_mode = ByteString::copy(system_mode_buf_or_error.value(), Chomp);
|
||||
|
||||
g_system_mode = system_mode;
|
||||
declare_text_mode_on_failure.disarm();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue