aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2021-06-24 21:20:25 +0100
committerJoão Valverde <j@v6e.pt>2021-06-26 00:18:26 +0100
commitc6a920686ce59ea8b29f7a61f8197077baedf304 (patch)
treeda6268c7e6fce9e38f99190f08fe3c08b5301b38 /mergecap.c
parentc2c256f0d8afa76599d7c3f3dcfac23c02069209 (diff)
wslog: Check environment initialization for errors
Initialiaze the cmdarg error stream earlier. Dumpcap also needs to know earlier if it is running in capture child mode.
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mergecap.c b/mergecap.c
index 5c670a2f00..50e5c3481d 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -228,11 +228,11 @@ main(int argc, char *argv[])
idb_merge_mode mode = IDB_MERGE_MODE_MAX;
merge_progress_callback_t cb;
- /* Initialize log handler early so we can have proper logging during startup. */
- ws_log_init("mergecap", NULL);
-
cmdarg_err_init(mergecap_cmdarg_err, mergecap_cmdarg_err_cont);
+ /* Initialize log handler early so we can have proper logging during startup. */
+ ws_log_init("mergecap", vcmdarg_err);
+
/* Early logging command-line initialization. */
ws_log_parse_args(&argc, argv, vcmdarg_err, 1);