RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 17:57:35 +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

14
Userland/Services/ConfigServer/ConfigClient.ipc
View file

@ -1,10 +1,10 @@
endpoint ConfigClient
{
notify_changed_string_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, DeprecatedString value) =|
notify_changed_i32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, i32 value) =|
notify_changed_u32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, u32 value) =|
notify_changed_bool_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, bool value) =|
notify_removed_key(DeprecatedString domain, DeprecatedString group, DeprecatedString key) =|
notify_removed_group(DeprecatedString domain, DeprecatedString group) =|
notify_added_group(DeprecatedString domain, DeprecatedString group) =|
notify_changed_string_value(ByteString domain, ByteString group, ByteString key, ByteString value) =|
notify_changed_i32_value(ByteString domain, ByteString group, ByteString key, i32 value) =|
notify_changed_u32_value(ByteString domain, ByteString group, ByteString key, u32 value) =|
notify_changed_bool_value(ByteString domain, ByteString group, ByteString key, bool value) =|
notify_removed_key(ByteString domain, ByteString group, ByteString key) =|
notify_removed_group(ByteString domain, ByteString group) =|
notify_added_group(ByteString domain, ByteString group) =|
}

30
Userland/Services/ConfigServer/ConfigServer.ipc
View file

@ -1,22 +1,22 @@
endpoint ConfigServer
{
pledge_domains(Vector<DeprecatedString> domains) =|
pledge_domains(Vector<ByteString> domains) =|
monitor_domain(DeprecatedString domain) =|
monitor_domain(ByteString domain) =|
list_config_groups(DeprecatedString domain) => (Vector<DeprecatedString> groups)
list_config_keys(DeprecatedString domain, DeprecatedString group) => (Vector<DeprecatedString> keys)
list_config_groups(ByteString domain) => (Vector<ByteString> groups)
list_config_keys(ByteString domain, ByteString group) => (Vector<ByteString> keys)
read_string_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => (Optional<DeprecatedString> value)
read_i32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => (Optional<i32> value)
read_u32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => (Optional<u32> value)
read_bool_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => (Optional<bool> value)
read_string_value(ByteString domain, ByteString group, ByteString key) => (Optional<ByteString> value)
read_i32_value(ByteString domain, ByteString group, ByteString key) => (Optional<i32> value)
read_u32_value(ByteString domain, ByteString group, ByteString key) => (Optional<u32> value)
read_bool_value(ByteString domain, ByteString group, ByteString key) => (Optional<bool> value)
write_string_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, DeprecatedString value) => ()
write_i32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, i32 value) => ()
write_u32_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, u32 value) => ()
write_bool_value(DeprecatedString domain, DeprecatedString group, DeprecatedString key, bool value) => ()
remove_key_entry(DeprecatedString domain, DeprecatedString group, DeprecatedString key) => ()
remove_group_entry(DeprecatedString domain, DeprecatedString group) => ()
add_group_entry(DeprecatedString domain, DeprecatedString group) => ()
write_string_value(ByteString domain, ByteString group, ByteString key, ByteString value) => ()
write_i32_value(ByteString domain, ByteString group, ByteString key, i32 value) => ()
write_u32_value(ByteString domain, ByteString group, ByteString key, u32 value) => ()
write_bool_value(ByteString domain, ByteString group, ByteString key, bool value) => ()
remove_key_entry(ByteString domain, ByteString group, ByteString key) => ()
remove_group_entry(ByteString domain, ByteString group) => ()
add_group_entry(ByteString domain, ByteString group) => ()
}

50
Userland/Services/ConfigServer/ConnectionFromClient.cpp
View file

@ -15,15 +15,15 @@ namespace ConfigServer {
static HashMap<int, RefPtr<ConnectionFromClient>> s_connections;
struct CachedDomain {
DeprecatedString domain;
ByteString domain;
NonnullRefPtr<Core::ConfigFile> config;
RefPtr<Core::FileWatcher> watcher;
};
static HashMap<DeprecatedString, NonnullOwnPtr<CachedDomain>> s_cache;
static HashMap<ByteString, NonnullOwnPtr<CachedDomain>> s_cache;
static constexpr int s_disk_sync_delay_ms = 5'000;
static void for_each_monitoring_connection(DeprecatedString const& domain, ConnectionFromClient* excluded_connection, Function<void(ConnectionFromClient&)> callback)
static void for_each_monitoring_connection(ByteString const& domain, ConnectionFromClient* excluded_connection, Function<void(ConnectionFromClient&)> callback)
{
for (auto& it : s_connections) {
if (it.value->is_monitoring_domain(domain) && (!excluded_connection || it.value != excluded_connection))
@ -31,7 +31,7 @@ static void for_each_monitoring_connection(DeprecatedString const& domain, Conne
}
}
static Core::ConfigFile& ensure_domain_config(DeprecatedString const& domain)
static Core::ConfigFile& ensure_domain_config(ByteString const& domain)
{
auto it = s_cache.find(domain);
if (it != s_cache.end())
@ -88,7 +88,7 @@ void ConnectionFromClient::die()
sync_dirty_domains_to_disk();
}
void ConnectionFromClient::pledge_domains(Vector<DeprecatedString> const& domains)
void ConnectionFromClient::pledge_domains(Vector<ByteString> const& domains)
{
if (m_has_pledged) {
did_misbehave("Tried to pledge domains twice.");
@ -99,7 +99,7 @@ void ConnectionFromClient::pledge_domains(Vector<DeprecatedString> const& domain
m_pledged_domains.set(domain);
}
void ConnectionFromClient::monitor_domain(DeprecatedString const& domain)
void ConnectionFromClient::monitor_domain(ByteString const& domain)
{
if (m_has_pledged && !m_pledged_domains.contains(domain)) {
did_misbehave("Attempt to monitor non-pledged domain");
@ -109,13 +109,13 @@ void ConnectionFromClient::monitor_domain(DeprecatedString const& domain)
m_monitored_domains.set(domain);
}
bool ConnectionFromClient::validate_access(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
bool ConnectionFromClient::validate_access(ByteString const& domain, ByteString const& group, ByteString const& key)
{
if (!m_has_pledged)
return true;
if (m_pledged_domains.contains(domain))
return true;
did_misbehave(DeprecatedString::formatted("Blocked attempt to access domain '{}', group={}, key={}", domain, group, key).characters());
did_misbehave(ByteString::formatted("Blocked attempt to access domain '{}', group={}, key={}", domain, group, key).characters());
return false;
}
@ -135,34 +135,34 @@ void ConnectionFromClient::sync_dirty_domains_to_disk()
}
}
Messages::ConfigServer::ListConfigKeysResponse ConnectionFromClient::list_config_keys(DeprecatedString const& domain, DeprecatedString const& group)
Messages::ConfigServer::ListConfigKeysResponse ConnectionFromClient::list_config_keys(ByteString const& domain, ByteString const& group)
{
if (!validate_access(domain, group, ""))
return Vector<DeprecatedString> {};
return Vector<ByteString> {};
auto& config = ensure_domain_config(domain);
return { config.keys(group) };
}
Messages::ConfigServer::ListConfigGroupsResponse ConnectionFromClient::list_config_groups(DeprecatedString const& domain)
Messages::ConfigServer::ListConfigGroupsResponse ConnectionFromClient::list_config_groups(ByteString const& domain)
{
if (!validate_access(domain, "", ""))
return Vector<DeprecatedString> {};
return Vector<ByteString> {};
auto& config = ensure_domain_config(domain);
return { config.groups() };
}
Messages::ConfigServer::ReadStringValueResponse ConnectionFromClient::read_string_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
Messages::ConfigServer::ReadStringValueResponse ConnectionFromClient::read_string_value(ByteString const& domain, ByteString const& group, ByteString const& key)
{
if (!validate_access(domain, group, key))
return nullptr;
auto& config = ensure_domain_config(domain);
if (!config.has_key(group, key))
return Optional<DeprecatedString> {};
return Optional<DeprecatedString> { config.read_entry(group, key) };
return Optional<ByteString> {};
return Optional<ByteString> { config.read_entry(group, key) };
}
Messages::ConfigServer::ReadI32ValueResponse ConnectionFromClient::read_i32_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
Messages::ConfigServer::ReadI32ValueResponse ConnectionFromClient::read_i32_value(ByteString const& domain, ByteString const& group, ByteString const& key)
{
if (!validate_access(domain, group, key))
return nullptr;
@ -173,7 +173,7 @@ Messages::ConfigServer::ReadI32ValueResponse ConnectionFromClient::read_i32_valu
return Optional<i32> { config.read_num_entry(group, key) };
}
Messages::ConfigServer::ReadU32ValueResponse ConnectionFromClient::read_u32_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
Messages::ConfigServer::ReadU32ValueResponse ConnectionFromClient::read_u32_value(ByteString const& domain, ByteString const& group, ByteString const& key)
{
if (!validate_access(domain, group, key))
return nullptr;
@ -184,7 +184,7 @@ Messages::ConfigServer::ReadU32ValueResponse ConnectionFromClient::read_u32_valu
return Optional<u32> { config.read_num_entry<u32>(group, key) };
}
Messages::ConfigServer::ReadBoolValueResponse ConnectionFromClient::read_bool_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
Messages::ConfigServer::ReadBoolValueResponse ConnectionFromClient::read_bool_value(ByteString const& domain, ByteString const& group, ByteString const& key)
{
if (!validate_access(domain, group, key))
return nullptr;
@ -203,7 +203,7 @@ void ConnectionFromClient::start_or_restart_sync_timer()
m_sync_timer->start();
}
void ConnectionFromClient::write_string_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, DeprecatedString const& value)
void ConnectionFromClient::write_string_value(ByteString const& domain, ByteString const& group, ByteString const& key, ByteString const& value)
{
if (!validate_access(domain, group, key))
return;
@ -222,7 +222,7 @@ void ConnectionFromClient::write_string_value(DeprecatedString const& domain, De
});
}
void ConnectionFromClient::write_i32_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, i32 value)
void ConnectionFromClient::write_i32_value(ByteString const& domain, ByteString const& group, ByteString const& key, i32 value)
{
if (!validate_access(domain, group, key))
return;
@ -241,7 +241,7 @@ void ConnectionFromClient::write_i32_value(DeprecatedString const& domain, Depre
});
}
void ConnectionFromClient::write_u32_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, u32 value)
void ConnectionFromClient::write_u32_value(ByteString const& domain, ByteString const& group, ByteString const& key, u32 value)
{
if (!validate_access(domain, group, key))
return;
@ -260,7 +260,7 @@ void ConnectionFromClient::write_u32_value(DeprecatedString const& domain, Depre
});
}
void ConnectionFromClient::write_bool_value(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key, bool value)
void ConnectionFromClient::write_bool_value(ByteString const& domain, ByteString const& group, ByteString const& key, bool value)
{
if (!validate_access(domain, group, key))
return;
@ -279,7 +279,7 @@ void ConnectionFromClient::write_bool_value(DeprecatedString const& domain, Depr
});
}
void ConnectionFromClient::remove_key_entry(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key)
void ConnectionFromClient::remove_key_entry(ByteString const& domain, ByteString const& group, ByteString const& key)
{
if (!validate_access(domain, group, key))
return;
@ -297,7 +297,7 @@ void ConnectionFromClient::remove_key_entry(DeprecatedString const& domain, Depr
});
}
void ConnectionFromClient::remove_group_entry(DeprecatedString const& domain, DeprecatedString const& group)
void ConnectionFromClient::remove_group_entry(ByteString const& domain, ByteString const& group)
{
if (!validate_access(domain, group, {}))
return;
@ -315,7 +315,7 @@ void ConnectionFromClient::remove_group_entry(DeprecatedString const& domain, De
});
}
void ConnectionFromClient::add_group_entry(DeprecatedString const& domain, DeprecatedString const& group)
void ConnectionFromClient::add_group_entry(ByteString const& domain, ByteString const& group)
{
if (!validate_access(domain, group, {}))
return;

40
Userland/Services/ConfigServer/ConnectionFromClient.h
View file

@ -20,38 +20,38 @@ public:
virtual void die() override;
bool is_monitoring_domain(DeprecatedString const& domain) const { return m_monitored_domains.contains(domain); }
bool is_monitoring_domain(ByteString const& domain) const { return m_monitored_domains.contains(domain); }
private:
explicit ConnectionFromClient(NonnullOwnPtr<Core::LocalSocket>, int client_id);
virtual void pledge_domains(Vector<DeprecatedString> const&) override;
virtual void monitor_domain(DeprecatedString const&) override;
virtual Messages::ConfigServer::ListConfigGroupsResponse list_config_groups([[maybe_unused]] DeprecatedString const& domain) override;
virtual Messages::ConfigServer::ListConfigKeysResponse list_config_keys([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group) override;
virtual Messages::ConfigServer::ReadStringValueResponse read_string_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
virtual Messages::ConfigServer::ReadI32ValueResponse read_i32_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
virtual Messages::ConfigServer::ReadU32ValueResponse read_u32_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
virtual Messages::ConfigServer::ReadBoolValueResponse read_bool_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
virtual void write_string_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key, [[maybe_unused]] DeprecatedString const& value) override;
virtual void write_i32_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key, [[maybe_unused]] i32 value) override;
virtual void write_u32_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key, [[maybe_unused]] u32 value) override;
virtual void write_bool_value([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key, [[maybe_unused]] bool value) override;
virtual void remove_key_entry([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group, [[maybe_unused]] DeprecatedString const& key) override;
virtual void remove_group_entry([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group) override;
virtual void add_group_entry([[maybe_unused]] DeprecatedString const& domain, [[maybe_unused]] DeprecatedString const& group) override;
virtual void pledge_domains(Vector<ByteString> const&) override;
virtual void monitor_domain(ByteString const&) override;
virtual Messages::ConfigServer::ListConfigGroupsResponse list_config_groups([[maybe_unused]] ByteString const& domain) override;
virtual Messages::ConfigServer::ListConfigKeysResponse list_config_keys([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group) override;
virtual Messages::ConfigServer::ReadStringValueResponse read_string_value([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key) override;
virtual Messages::ConfigServer::ReadI32ValueResponse read_i32_value([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key) override;
virtual Messages::ConfigServer::ReadU32ValueResponse read_u32_value([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key) override;
virtual Messages::ConfigServer::ReadBoolValueResponse read_bool_value([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key) override;
virtual void write_string_value([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key, [[maybe_unused]] ByteString const& value) override;
virtual void write_i32_value([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key, [[maybe_unused]] i32 value) override;
virtual void write_u32_value([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key, [[maybe_unused]] u32 value) override;
virtual void write_bool_value([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key, [[maybe_unused]] bool value) override;
virtual void remove_key_entry([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group, [[maybe_unused]] ByteString const& key) override;
virtual void remove_group_entry([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group) override;
virtual void add_group_entry([[maybe_unused]] ByteString const& domain, [[maybe_unused]] ByteString const& group) override;
bool validate_access(DeprecatedString const& domain, DeprecatedString const& group, DeprecatedString const& key);
bool validate_access(ByteString const& domain, ByteString const& group, ByteString const& key);
void sync_dirty_domains_to_disk();
void start_or_restart_sync_timer();
bool m_has_pledged { false };
HashTable<DeprecatedString> m_pledged_domains;
HashTable<ByteString> m_pledged_domains;
HashTable<DeprecatedString> m_monitored_domains;
HashTable<ByteString> m_monitored_domains;
NonnullRefPtr<Core::Timer> m_sync_timer;
HashTable<DeprecatedString> m_dirty_domains;
HashTable<ByteString> m_dirty_domains;
};
}