[gnome-builder] use g_return_val_if_reached() over g_assert_not_reached()



commit 4cead7b114519293e4f29d03ff89afad029c7230
Author: Christian Hergert <chergert redhat com>
Date:   Sat Jul 22 17:46:30 2017 -0700

    use g_return_val_if_reached() over g_assert_not_reached()
    
    Not quite as ideal for us as the assertions, but gets the job
    done and lets external compiler tooling have a default value
    returned from the function.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=785287

 contrib/gstyle/gstyle-color-plane.c           |    2 +-
 plugins/color-picker/gb-color-picker-prefs.c  |    2 +-
 plugins/xml-pack/ide-xml-rng-define.c         |    2 +-
 plugins/xml-pack/ide-xml-tree-builder-utils.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/contrib/gstyle/gstyle-color-plane.c b/contrib/gstyle/gstyle-color-plane.c
index 7128ccf..1adf410 100644
--- a/contrib/gstyle/gstyle-color-plane.c
+++ b/contrib/gstyle/gstyle-color-plane.c
@@ -987,7 +987,7 @@ get_adj_id (GstyleColorPlane *self,
     if (adj == priv->comp [i].adj)
       return i;
 
-  g_assert_not_reached ();
+  g_return_val_if_reached (0);
 }
 
 static void
diff --git a/plugins/color-picker/gb-color-picker-prefs.c b/plugins/color-picker/gb-color-picker-prefs.c
index c8b597d..4bffc89 100644
--- a/plugins/color-picker/gb-color-picker-prefs.c
+++ b/plugins/color-picker/gb-color-picker-prefs.c
@@ -116,7 +116,7 @@ gb_color_picker_prefs_get_page (GbColorPickerPrefs    *self,
   else if (prefs_type == GSTYLE_COLOR_PANEL_PREFS_PALETTES_LIST)
     return self->palettes_list_page;
   else
-    g_assert_not_reached ();
+    g_return_val_if_reached (NULL);
 }
 
 static GVariant *
diff --git a/plugins/xml-pack/ide-xml-rng-define.c b/plugins/xml-pack/ide-xml-rng-define.c
index 9e60f74..061b8b1 100644
--- a/plugins/xml-pack/ide-xml-rng-define.c
+++ b/plugins/xml-pack/ide-xml-rng-define.c
@@ -286,5 +286,5 @@ ide_xml_rng_define_is_nameclass_match (IdeXmlRngDefine  *define,
       return FALSE;
     }
   else
-    g_assert_not_reached ();
+    g_return_val_if_reached (FALSE);
 }
diff --git a/plugins/xml-pack/ide-xml-tree-builder-utils.c b/plugins/xml-pack/ide-xml-tree-builder-utils.c
index c49c20c..481bb80 100644
--- a/plugins/xml-pack/ide-xml-tree-builder-utils.c
+++ b/plugins/xml-pack/ide-xml-tree-builder-utils.c
@@ -78,7 +78,7 @@ get_schema_kind_string (IdeXmlSchemaKind kind)
   else if (kind == SCHEMA_KIND_XML_SCHEMA)
     return "XML schema (.xsd)";
 
-  g_assert_not_reached ();
+  g_return_val_if_reached (NULL);
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]