[beast: 12/43] GXK: only use Bse::assert_return{_unreached}
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 12/43] GXK: only use Bse::assert_return{_unreached}
- Date: Mon, 26 Jun 2017 23:28:18 +0000 (UTC)
commit 7ec881fefed151fbc2f4c31965377c9a6cc97f6d
Author: Tim Janik <timj gnu org>
Date: Sun Jun 25 16:01:17 2017 +0200
GXK: only use Bse::assert_return{_unreached}
Signed-off-by: Tim Janik <timj gnu org>
beast-gtk/gxk/gxkaction.cc | 2 +-
beast-gtk/gxk/gxkparam.cc | 2 +-
beast-gtk/gxk/gxkrackcovers.cc | 8 ++++----
beast-gtk/gxk/gxkradget.cc | 10 +++++-----
beast-gtk/gxk/gxkradgetfactory.cc | 2 +-
beast-gtk/gxk/gxkspline.cc | 2 +-
beast-gtk/gxk/gxkutils.cc | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/beast-gtk/gxk/gxkaction.cc b/beast-gtk/gxk/gxkaction.cc
index 12cc3db..e38ab51 100644
--- a/beast-gtk/gxk/gxkaction.cc
+++ b/beast-gtk/gxk/gxkaction.cc
@@ -965,7 +965,7 @@ gxk_action_group_dispose (GxkActionGroup *self)
void
gxk_init_actions (void)
{
- assert (action_class_ht == NULL);
+ assert_return (action_class_ht == NULL);
action_class_ht = g_hash_table_new (action_class_hash, action_class_equals);
quark_action_links = g_quark_from_static_string ("gxk-action-links");
quark_action_factories = g_quark_from_static_string ("GxkActionFactory-list");
diff --git a/beast-gtk/gxk/gxkparam.cc b/beast-gtk/gxk/gxkparam.cc
index f532e97..1e1b5f3 100644
--- a/beast-gtk/gxk/gxkparam.cc
+++ b/beast-gtk/gxk/gxkparam.cc
@@ -805,7 +805,7 @@ guint
gxk_param_create_size_group (void)
{
guint i;
- assert (n_size_groups < 0xff);
+ assert_return (n_size_groups < 0xff, 0xff);
i = n_size_groups++;
size_groups = g_renew (GxkParamEditorSizes, size_groups, n_size_groups);
size_groups[i] = param_editor_default_sizes;
diff --git a/beast-gtk/gxk/gxkrackcovers.cc b/beast-gtk/gxk/gxkrackcovers.cc
index f1ddba0..c8b52eb 100644
--- a/beast-gtk/gxk/gxkrackcovers.cc
+++ b/beast-gtk/gxk/gxkrackcovers.cc
@@ -174,10 +174,10 @@ rack_cover_add_plates (GxkRackTable *rtable)
{
cover = rack_cover_create (GTK_WIDGET (rtable));
plate_list = g_slist_prepend (plate_list, cover);
- assert (k < GTK_TABLE (rtable)->ncols);
- assert (l < GTK_TABLE (rtable)->nrows);
- assert (k + m <= GTK_TABLE (rtable)->ncols);
- assert (l + n <= GTK_TABLE (rtable)->nrows);
+ assert_return (k < GTK_TABLE (rtable)->ncols, NULL);
+ assert_return (l < GTK_TABLE (rtable)->nrows, NULL);
+ assert_return (k + m <= GTK_TABLE (rtable)->ncols, NULL);
+ assert_return (l + n <= GTK_TABLE (rtable)->nrows, NULL);
gxk_rack_table_attach (rtable, cover, k, l, m, n);
}
}
diff --git a/beast-gtk/gxk/gxkradget.cc b/beast-gtk/gxk/gxkradget.cc
index 31877b6..f7b610f 100644
--- a/beast-gtk/gxk/gxkradget.cc
+++ b/beast-gtk/gxk/gxkradget.cc
@@ -199,7 +199,7 @@ clone_node_intern (Node *source,
}
if (source->xdef_node)
{
- assert (!inherit);
+ assert_return (!inherit, NULL);
node->xdef_node = clone_list_find (clist, source->xdef_node);
node->xdef_depth = source->xdef_depth;
}
@@ -228,7 +228,7 @@ clone_node_intern (Node *source,
else
node->children = last = g_slist_new (child);
}
- assert (source->call_stack == NULL);
+ assert_return (source->call_stack == NULL, NULL);
return node;
}
@@ -680,7 +680,7 @@ node_define (Domain *domain,
{
node = clone_node (source, domain->domain, node_name, inherit);
node->xdef_node = xdef_node;
- assert (xdef_node && !xdef_node->xdef_node);
+ assert_return (xdef_node && !xdef_node->xdef_node, NULL);
node->xdef_depth = node->xdef_node->depth;
}
else for (i = 0; attribute_names[i]; i++) /* node inheritance */
@@ -1011,7 +1011,7 @@ radget_widget_hierarchy_changed (GtkWidget *widget,
if (!hgroup && !vgroup && !bgroup)
return;
GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
- assert (GTK_WIDGET_TOPLEVEL (toplevel));
+ assert_return (GTK_WIDGET_TOPLEVEL (toplevel));
if (hgroup)
{
GtkSizeGroup *sg = toplevel_get_size_group (toplevel, hgroup, 'h');
@@ -1850,7 +1850,7 @@ void
gxk_init_radget_types (void)
{
GType types[1024], *t = types;
- assert (quark_radget_type == 0);
+ assert_return (quark_radget_type == 0);
quark_id = g_quark_from_static_string ("id");
quark_name = g_quark_from_static_string ("name");
quark_radget_type = g_quark_from_static_string ("GxkRadget-type");
diff --git a/beast-gtk/gxk/gxkradgetfactory.cc b/beast-gtk/gxk/gxkradgetfactory.cc
index 06ee915..5cd37cc 100644
--- a/beast-gtk/gxk/gxkradgetfactory.cc
+++ b/beast-gtk/gxk/gxkradgetfactory.cc
@@ -129,7 +129,7 @@ gxk_radget_factory_finalize (GObject *object)
{
GxkRadgetFactory *self = GXK_RADGET_FACTORY (object);
- assert (self->window == NULL);
+ assert_return (self->window == NULL);
g_datalist_clear (&self->branch_widgets);
g_free (self->action_root);
g_free (self->per_action);
diff --git a/beast-gtk/gxk/gxkspline.cc b/beast-gtk/gxk/gxkspline.cc
index ac64c9e..3316d12 100644
--- a/beast-gtk/gxk/gxkspline.cc
+++ b/beast-gtk/gxk/gxkspline.cc
@@ -197,7 +197,7 @@ gxk_spline_eval (const GxkSpline *spline,
else
first = i;
}
- assert (first + 1 == last);
+ assert_return (first + 1 == last, 0);
/* eval polynomials */
double y = segment_eval (spline->segs + first, x, yd1);
return y;
diff --git a/beast-gtk/gxk/gxkutils.cc b/beast-gtk/gxk/gxkutils.cc
index f872eea..82f59b8 100644
--- a/beast-gtk/gxk/gxkutils.cc
+++ b/beast-gtk/gxk/gxkutils.cc
@@ -641,7 +641,7 @@ gxk_color_dots_interpolate (GxkColorDots *cdots,
else
offset = i;
}
- assert (offset == 0 || value >= cdots->colors[offset].value);
+ assert_return (offset == 0 || value >= cdots->colors[offset].value, 0);
if (value >= cdots->colors[offset].value && offset + 1 < cdots->n_colors)
{ /* linear interpolation */
guint c1 = cdots->colors[offset].rgb;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]