[epiphany/mcatanzaro/g_return: 7/7] Remove some uses of g_return_*()
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mcatanzaro/g_return: 7/7] Remove some uses of g_return_*()
- Date: Sun, 3 May 2020 15:28:03 +0000 (UTC)
commit 936af4aa0ee1bf71912c8b6645d92f3e447c0ff9
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun May 3 10:04:18 2020 -0500
Remove some uses of g_return_*()
g_return is not allowed in Ephy. We use g_assert() instead.
Most of these cases are out of place and can just be removed. I kept the
use in EphyEmbedShell just because surrounding functions are using
g_assert(). The paranoia there is probably unwarranted, but it's
harmless.
embed/ephy-embed-shell.c | 2 +-
embed/ephy-filters-manager.c | 1 -
src/ephy-pages-button.c | 4 ----
3 files changed, 1 insertion(+), 6 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 9b4c1f712..29efccd38 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -629,7 +629,7 @@ ephy_embed_shell_get_global_gsb_service (EphyEmbedShell *shell)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
- g_return_val_if_fail (EPHY_IS_EMBED_SHELL (shell), NULL);
+ g_assert (EPHY_IS_EMBED_SHELL (shell));
if (!priv->global_gsb_service) {
g_autofree char *api_key = NULL;
diff --git a/embed/ephy-filters-manager.c b/embed/ephy-filters-manager.c
index 5887e847f..32c00ed0b 100644
--- a/embed/ephy-filters-manager.c
+++ b/embed/ephy-filters-manager.c
@@ -1092,7 +1092,6 @@ ephy_filters_manager_get_adblock_filters_dir (EphyFiltersManager *manager)
gboolean
ephy_filters_manager_get_is_initialized (EphyFiltersManager *manager)
{
- g_return_val_if_fail (EPHY_IS_FILTERS_MANAGER (manager), FALSE);
return manager->is_initialized;
}
diff --git a/src/ephy-pages-button.c b/src/ephy-pages-button.c
index e08c4f911..d7c47c351 100644
--- a/src/ephy-pages-button.c
+++ b/src/ephy-pages-button.c
@@ -104,8 +104,6 @@ ephy_pages_button_new (void)
int
ephy_pages_button_get_n_pages (EphyPagesButton *self)
{
- g_return_val_if_fail (EPHY_IS_PAGES_BUTTON (self), 0);
-
return self->n_pages;
}
@@ -113,8 +111,6 @@ void
ephy_pages_button_set_n_pages (EphyPagesButton *self,
int n_pages)
{
- g_return_if_fail (EPHY_IS_PAGES_BUTTON (self));
-
self->n_pages = n_pages;
update_icon (self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]