Replace g_assert() with ws_assert()

1 files changed, 12 insertions, 11 deletions

diff --git a/ui/capture.c b/ui/capture.c
index 44e3b02202..b88c86efdd 100644
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -42,6 +42,7 @@
 #include "wsutil/str_util.h"
 #include <wsutil/filesystem.h>
 #include <wsutil/wslog.h>
+#include <wsutil/ws_assert.h>
 
 typedef struct if_stat_cache_item_s {
     char *name;
@@ -69,7 +70,7 @@ capture_callback_invoke(int event, capture_session *cap_session)
     GList *cb_item = capture_callbacks;
 
     /* there should be at least one interested */
-    g_assert(cb_item != NULL);
+    ws_assert(cb_item != NULL);
 
     while(cb_item != NULL) {
         cb = (capture_callback_data_t *)cb_item->data;
@@ -107,7 +108,7 @@ capture_callback_remove(capture_callback_t func, gpointer user_data)
         cb_item = g_list_next(cb_item);
     }
 
-    g_assert_not_reached();
+    ws_assert_not_reached();
 }
 
 /**
@@ -383,7 +384,7 @@ capture_input_new_file(capture_session *cap_session, gchar *new_file)
     }
     ws_message("File: \"%s\"", new_file);
 
-    g_assert(cap_session->state == CAPTURE_PREPARING || cap_session->state == CAPTURE_RUNNING);
+    ws_assert(cap_session->state == CAPTURE_PREPARING || cap_session->state == CAPTURE_RUNNING);
 
     /* free the old filename */
     if(capture_opts->save_file != NULL) {
@@ -515,7 +516,7 @@ capture_input_new_packets(capture_session *cap_session, int to_read)
     capture_options *capture_opts = cap_session->capture_opts;
     int  err;
 
-    g_assert(capture_opts->save_file);
+    ws_assert(capture_opts->save_file);
 
     if(capture_opts->real_time_mode) {
         /* Read from the capture file the number of records the child told us it added. */
@@ -560,7 +561,7 @@ capture_input_drops(capture_session *cap_session, guint32 dropped, const char* i
         ws_info("%u packet%s dropped", dropped, plurality(dropped, "", "s"));
     }
 
-    g_assert(cap_session->state == CAPTURE_RUNNING);
+    ws_assert(cap_session->state == CAPTURE_RUNNING);
 
     cf_set_drops_known((capture_file *)cap_session->cf, TRUE);
     cf_set_drops((capture_file *)cap_session->cf, dropped);
@@ -574,7 +575,7 @@ capture_input_drops(capture_session *cap_session, guint32 dropped, const char* i
    The secondary message might be a null string.
  */
 static void
-capture_input_error(capture_session *cap_session, char *error_msg,
+capture_input_error(capture_session *cap_session _U_, char *error_msg,
                     char *secondary_error_msg)
 {
     gchar *safe_error_msg;
@@ -582,7 +583,7 @@ capture_input_error(capture_session *cap_session, char *error_msg,
 
     ws_message("Error message from child: \"%s\", \"%s\"", error_msg, secondary_error_msg);
 
-    g_assert(cap_session->state == CAPTURE_PREPARING || cap_session->state == CAPTURE_RUNNING);
+    ws_assert(cap_session->state == CAPTURE_PREPARING || cap_session->state == CAPTURE_RUNNING);
 
     safe_error_msg = simple_dialog_format_message(error_msg);
     if (*secondary_error_msg != '\0') {
@@ -619,8 +620,8 @@ capture_input_cfilter_error(capture_session *cap_session, guint i,
 
     ws_message("Capture filter error message from child: \"%s\"", error_message);
 
-    g_assert(cap_session->state == CAPTURE_PREPARING || cap_session->state == CAPTURE_RUNNING);
-    g_assert(i < capture_opts->ifaces->len);
+    ws_assert(cap_session->state == CAPTURE_PREPARING || cap_session->state == CAPTURE_RUNNING);
+    ws_assert(i < capture_opts->ifaces->len);
 
     interface_opts = &g_array_index(capture_opts->ifaces, interface_options, i);
     safe_cfilter = simple_dialog_format_message(interface_opts->cfilter);
@@ -665,7 +666,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg)
     int  err;
 
     ws_message("Capture stopped.");
-    g_assert(cap_session->state == CAPTURE_PREPARING || cap_session->state == CAPTURE_RUNNING);
+    ws_assert(cap_session->state == CAPTURE_PREPARING || cap_session->state == CAPTURE_RUNNING);
 
     if (msg != NULL)
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", msg);
@@ -822,7 +823,7 @@ capture_stat_start(capture_options *capture_opts)
             device = &g_array_index(capture_opts->all_ifaces, interface_t, i);
             if (device->type != IF_PIPE) {
                 sc_item = g_new0(if_stat_cache_item_t, 1);
-                g_assert(device->if_info.name);
+                ws_assert(device->if_info.name);
                 sc_item->name = g_strdup(device->if_info.name);
                 sc->cache_list = g_list_prepend(sc->cache_list, sc_item);
             }