diff options
author | Andreas Kling <kling@serenityos.org> | 2021-02-23 20:42:32 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-02-23 20:56:54 +0100 |
commit | 5d180d1f996ead27f9c5cb3db7f91e293de34d9d (patch) | |
tree | e881854dac5d749518562970d6194a0ef65736ec /Userland/Libraries/LibDesktop | |
parent | b33a6a443e700cd80325d312f21c985b0687bb97 (diff) | |
download | serenity-5d180d1f996ead27f9c5cb3db7f91e293de34d9d.zip |
Everywhere: Rename ASSERT => VERIFY
(...and ASSERT_NOT_REACHED => VERIFY_NOT_REACHED)
Since all of these checks are done in release builds as well,
let's rename them to VERIFY to prevent confusion, as everyone is
used to assertions being compiled out in release.
We can introduce a new ASSERT macro that is specifically for debug
checks, but I'm doing this wholesale conversion first since we've
accumulated thousands of these already, and it's not immediately
obvious which ones are suitable for ASSERT.
Diffstat (limited to 'Userland/Libraries/LibDesktop')
-rw-r--r-- | Userland/Libraries/LibDesktop/AppFile.cpp | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibDesktop/Launcher.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Userland/Libraries/LibDesktop/AppFile.cpp b/Userland/Libraries/LibDesktop/AppFile.cpp index 41958328f5..8951bf75b0 100644 --- a/Userland/Libraries/LibDesktop/AppFile.cpp +++ b/Userland/Libraries/LibDesktop/AppFile.cpp @@ -82,14 +82,14 @@ bool AppFile::validate() const String AppFile::name() const { auto name = m_config->read_entry("App", "Name").trim_whitespace(); - ASSERT(!name.is_empty()); + VERIFY(!name.is_empty()); return name; } String AppFile::executable() const { auto executable = m_config->read_entry("App", "Executable").trim_whitespace(); - ASSERT(!executable.is_empty()); + VERIFY(!executable.is_empty()); return executable; } diff --git a/Userland/Libraries/LibDesktop/Launcher.cpp b/Userland/Libraries/LibDesktop/Launcher.cpp index 06e1caff01..c81eff8a46 100644 --- a/Userland/Libraries/LibDesktop/Launcher.cpp +++ b/Userland/Libraries/LibDesktop/Launcher.cpp @@ -38,7 +38,7 @@ auto Launcher::Details::from_details_str(const String& details_str) -> NonnullRe { auto details = adopt(*new Details); auto json = JsonValue::from_string(details_str); - ASSERT(json.has_value()); + VERIFY(json.has_value()); auto obj = json.value().as_object(); details->executable = obj.get("executable").to_string(); details->name = obj.get("name").to_string(); @@ -124,7 +124,7 @@ bool Launcher::open(const URL& url, const String& handler_name) bool Launcher::open(const URL& url, const Details& details) { - ASSERT(details.launcher_type != LauncherType::Application); // Launcher should not be used to execute arbitrary applications + VERIFY(details.launcher_type != LauncherType::Application); // Launcher should not be used to execute arbitrary applications return open(url, details.executable); } |