Create accessors for possibility values

src/rugby-app-window.c

@@ -90,9 +90,7 @@ header_label_cb (GtkListItem *item)
     if (!possibility)
       return NULL;
 
-    int tries = rugby_possibility_get_tries (possibility);
-    int utries = rugby_possibility_get_utries (possibility);
-    int total_tries = tries + utries;
+    int total_tries = rugby_possibility_total_tries (possibility);
 
     return g_strdup_printf (ngettext ("%d try", "%d tries", total_tries), total_tries);
 }

src/rugby-list-store.c

 /*
- * SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk>
+ * SPDX-FileCopyrightText: 2018-2024 Bruce Cowan <bruce@bcowan.me.uk>
  *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -106,13 +106,6 @@ process_data (RugbyListStore *self)
                                 g_list_model_get_n_items (G_LIST_MODEL (self->items)));
 }
 
-static int
-get_total_tries (RugbyPossibility *possibility)
-{
-    return rugby_possibility_get_tries (possibility) +
-           rugby_possibility_get_utries (possibility);
-}
-
 // GListModel implementation
 
 static GType
@@ -166,13 +159,13 @@ rugby_list_store_get_section (GtkSectionModel *model,
         return;
     }
 
-    int target_tries = get_total_tries (possibility);
+    int target_tries = rugby_possibility_total_tries (possibility);
 
     // Find start
     for (unsigned i = 0; i < n_items; i++)
     {
         possibility = g_list_model_get_item (G_LIST_MODEL (self->items), i);
-        int total = get_total_tries (possibility);
+        int total = rugby_possibility_total_tries (possibility);
 
         if (total == target_tries)
         {
@@ -185,7 +178,7 @@ rugby_list_store_get_section (GtkSectionModel *model,
     for (unsigned i = *out_start + 1; i < n_items; i++)
     {
         possibility = g_list_model_get_item (G_LIST_MODEL (self->items), i);
-        int total = get_total_tries (possibility);
+        int total = rugby_possibility_total_tries (possibility);
 
         if (total != target_tries)
         {

src/rugby-possibility.c

@@ -123,7 +123,7 @@ rugby_possibility_new (int tries,
 int
 rugby_possibility_get_tries (RugbyPossibility *self)
 {
-    g_return_val_if_fail (RUGBY_IS_POSSIBILITY (self), 0);
+    g_assert (RUGBY_IS_POSSIBILITY (self));
 
     return self->tries;
 }
@@ -131,7 +131,7 @@ rugby_possibility_get_tries (RugbyPossibility *self)
 int
 rugby_possibility_get_utries (RugbyPossibility *self)
 {
-    g_return_val_if_fail (RUGBY_IS_POSSIBILITY (self), 0);
+    g_assert (RUGBY_IS_POSSIBILITY (self));
 
     return self->utries;
 }
@@ -139,7 +139,15 @@ rugby_possibility_get_utries (RugbyPossibility *self)
 int
 rugby_possibility_get_kicks (RugbyPossibility *self)
 {
-    g_return_val_if_fail (RUGBY_IS_POSSIBILITY (self), 0);
+    g_assert (RUGBY_IS_POSSIBILITY (self));
 
     return self->kicks;
 }
+
+int
+rugby_possibility_total_tries (RugbyPossibility *self)
+{
+    g_assert (RUGBY_IS_POSSIBILITY (self));
+
+    return self->tries + self->utries;
+}

src/rugby-possibility.h

@@ -22,4 +22,6 @@ int rugby_possibility_get_tries  (RugbyPossibility *self);
 int rugby_possibility_get_utries (RugbyPossibility *self);
 int rugby_possibility_get_kicks  (RugbyPossibility *self);
 
+int rugby_possibility_total_tries (RugbyPossibility *self);
+
 G_END_DECLS