aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2021-06-18 19:21:42 +0100
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2021-06-19 01:23:31 +0000
commit0e50979b3f45250ee1dacd5c826a281ad9a9c460 (patch)
treecfaf2f2221f9ebd948fab14b180cd3219dcc3523 /mergecap.c
parentb4eddd32c18816b7b5f9e074b88559d88f28123c (diff)
Replace g_assert() with ws_assert()
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c
index e27c7afdaa..cee3834d69 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -41,6 +41,7 @@
#include <wsutil/file_util.h>
#include <wsutil/privileges.h>
#include <wsutil/strnatcmp.h>
+#include <wsutil/ws_assert.h>
#include <cli_main.h>
#include <version_info.h>
@@ -388,7 +389,7 @@ main(int argc, char *argv[])
case MERGE_USER_ABORTED:
/* we don't catch SIGINT/SIGTERM (yet?), so we couldn't have aborted */
- g_assert_not_reached();
+ ws_assert_not_reached();
break;
case MERGE_ERR_CANT_OPEN_INFILE: