Add asserts to verify reliability

Signed-off-by: Jacki <jacki@thejackimonster.de>

1 files changed, 59 insertions, 42 deletions

diff --git a/src/ui/contacts.c b/src/ui/contacts.c
index 5898fde..75b1870 100644
--- a/src/ui/contacts.c
+++ b/src/ui/contacts.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2021--2022 GNUnet e.V.
+   Copyright (C) 2021--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -24,14 +24,15 @@
 
 #include "contacts.h"
 
-#include "chat_entry.h"
 #include "contact_entry.h"
 #include "../application.h"
 
 static void
 handle_close_button_click(UNUSED GtkButton *button,
-                          gpointer user_data)
+                          gpointer user_data)
 {
+  g_assert(user_data);
+
   GtkDialog *dialog = GTK_DIALOG(user_data);
   gtk_window_close(GTK_WINDOW(dialog));
 }
@@ -39,6 +40,8 @@ handle_close_button_click(UNUSED GtkButton *button,
 static gboolean
 _open_new_contact_dialog(gpointer user_data)
 {
+  g_assert(user_data);
+
   MESSENGER_Application *app = (MESSENGER_Application*) user_data;
 
   ui_new_contact_dialog_init(app, &(app->ui.new_contact));
@@ -49,9 +52,11 @@ _open_new_contact_dialog(gpointer user_data)
 
 static void
 handle_contacts_listbox_row_activated(UNUSED GtkListBox* listbox,
-                                      GtkListBoxRow* row,
-                                      gpointer user_data)
+                                      GtkListBoxRow* row,
+                                      gpointer user_data)
 {
+  g_assert((row) && (user_data));
+
   MESSENGER_Application *app = (MESSENGER_Application*) user_data;
 
   if (!gtk_list_box_row_get_selectable(row))
@@ -84,11 +89,13 @@ close_dialog:
 
 static gboolean
 handle_contacts_listbox_filter_func(GtkListBoxRow *row,
-                                    gpointer user_data)
+                                    gpointer user_data)
 {
+  g_assert((row) && (user_data));
+
   MESSENGER_Application *app = (MESSENGER_Application*) user_data;
 
-  if ((!row) || (!gtk_list_box_row_get_selectable(row)))
+  if (!gtk_list_box_row_get_selectable(row))
     return TRUE;
 
   const gchar *filter = gtk_entry_get_text(
@@ -115,8 +122,10 @@ handle_contacts_listbox_filter_func(GtkListBoxRow *row,
 
 static void
 handle_contact_search_entry_search_changed(UNUSED GtkSearchEntry* search_entry,
-                                           gpointer user_data)
+                                           gpointer user_data)
 {
+  g_assert(user_data);
+
   GtkListBox *listbox = GTK_LIST_BOX(user_data);
 
   gtk_list_box_invalidate_filter(listbox);
@@ -124,16 +133,20 @@ handle_contact_search_entry_search_changed(UNUSED GtkSearchEntry* search_entry,
 
 static void
 handle_dialog_destroy(UNUSED GtkWidget *window,
-                      gpointer user_data)
+                      gpointer user_data)
 {
+  g_assert(user_data);
+
   ui_contacts_dialog_cleanup((UI_CONTACTS_Handle*) user_data);
 }
 
 static int
 _iterate_contacts(void *cls,
-                  UNUSED struct GNUNET_CHAT_Handle *handle,
-                  struct GNUNET_CHAT_Contact *contact)
+                  UNUSED struct GNUNET_CHAT_Handle *handle,
+                  struct GNUNET_CHAT_Contact *contact)
 {
+  g_assert((cls) && (contact));
+
   if (GNUNET_YES == GNUNET_CHAT_contact_is_owned(contact))
     return GNUNET_YES;
 
@@ -165,72 +178,74 @@ _iterate_contacts(void *cls,
 
 void
 ui_contacts_dialog_init(MESSENGER_Application *app,
-                        UI_CONTACTS_Handle *handle)
+                        UI_CONTACTS_Handle *handle)
 {
+  g_assert((app) && (handle));
+
   handle->builder = gtk_builder_new_from_resource(
-      application_get_resource_path(app, "ui/contacts.ui")
+    application_get_resource_path(app, "ui/contacts.ui")
   );
 
   handle->dialog = GTK_DIALOG(
-      gtk_builder_get_object(handle->builder, "contacts_dialog")
+    gtk_builder_get_object(handle->builder, "contacts_dialog")
   );
 
   gtk_window_set_transient_for(
-      GTK_WINDOW(handle->dialog),
-      GTK_WINDOW(app->ui.messenger.main_window)
+    GTK_WINDOW(handle->dialog),
+    GTK_WINDOW(app->ui.messenger.main_window)
   );
 
   handle->contact_search_entry = GTK_SEARCH_ENTRY(
-      gtk_builder_get_object(handle->builder, "contact_search_entry")
+    gtk_builder_get_object(handle->builder, "contact_search_entry")
   );
 
   handle->contacts_listbox = GTK_LIST_BOX(
-      gtk_builder_get_object(handle->builder, "contacts_listbox")
+    gtk_builder_get_object(handle->builder, "contacts_listbox")
   );
 
   gtk_list_box_set_filter_func(
-      handle->contacts_listbox,
-      handle_contacts_listbox_filter_func,
-      app,
-      NULL
+    handle->contacts_listbox,
+    handle_contacts_listbox_filter_func,
+    app,
+    NULL
   );
 
   g_signal_connect(
-      handle->contact_search_entry,
-      "search-changed",
-      G_CALLBACK(handle_contact_search_entry_search_changed),
-      handle->contacts_listbox
+    handle->contact_search_entry,
+    "search-changed",
+    G_CALLBACK(handle_contact_search_entry_search_changed),
+    handle->contacts_listbox
   );
 
   g_signal_connect(
-      handle->contacts_listbox,
-      "row-activated",
-      G_CALLBACK(handle_contacts_listbox_row_activated),
-      app
+    handle->contacts_listbox,
+    "row-activated",
+    G_CALLBACK(handle_contacts_listbox_row_activated),
+    app
   );
 
   handle->close_button = GTK_BUTTON(
-      gtk_builder_get_object(handle->builder, "close_button")
+    gtk_builder_get_object(handle->builder, "close_button")
   );
 
   g_signal_connect(
-      handle->close_button,
-      "clicked",
-      G_CALLBACK(handle_close_button_click),
-      handle->dialog
+    handle->close_button,
+    "clicked",
+    G_CALLBACK(handle_close_button_click),
+    handle->dialog
   );
 
   g_signal_connect(
-      handle->dialog,
-      "destroy",
-      G_CALLBACK(handle_dialog_destroy),
-      handle
+    handle->dialog,
+    "destroy",
+    G_CALLBACK(handle_dialog_destroy),
+    handle
   );
 
   GNUNET_CHAT_iterate_contacts(
-      app->chat.messenger.handle,
-      _iterate_contacts,
-      app
+    app->chat.messenger.handle,
+    _iterate_contacts,
+    app
   );
 
   gtk_list_box_invalidate_filter(handle->contacts_listbox);
@@ -239,6 +254,8 @@ ui_contacts_dialog_init(MESSENGER_Application *app,
 void
 ui_contacts_dialog_cleanup(UI_CONTACTS_Handle *handle)
 {
+  g_assert(handle);
+
   g_object_unref(handle->builder);
 
   memset(handle, 0, sizeof(*handle));