From 0cea64a632167e497a8a56757b1e4a70e9202e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt>
Date: Mon, 6 Feb 2023 22:46:45 +0000
Subject: [PATCH] Move ui/cmdarg_err.[ch] to wsutil

---
 capinfos.c                    |  2 +-
 capture_opts.c                |  2 +-
 captype.c                     |  2 +-
 dftest.c                      |  2 +-
 dumpcap.c                     |  2 +-
 editcap.c                     |  2 +-
 extcap/androiddump.c          |  2 +-
 extcap/etwdump.c              |  2 +-
 extcap/randpktdump.c          |  2 +-
 fuzz/fuzzshark.c              |  2 +-
 mergecap.c                    |  2 +-
 randpkt.c                     |  2 +-
 rawshark.c                    |  2 +-
 reordercap.c                  |  2 +-
 sharkd.c                      |  2 +-
 text2pcap.c                   |  2 +-
 tfshark.c                     |  2 +-
 tshark.c                      |  2 +-
 ui/CMakeLists.txt             |  1 -
 ui/cli/tap-camelsrt.c         |  2 +-
 ui/cli/tap-credentials.c      |  2 +-
 ui/cli/tap-diameter-avp.c     |  2 +-
 ui/cli/tap-endpoints.c        |  2 +-
 ui/cli/tap-exportobject.c     |  2 +-
 ui/cli/tap-hosts.c            |  2 +-
 ui/cli/tap-httpstat.c         |  2 +-
 ui/cli/tap-icmpstat.c         |  2 +-
 ui/cli/tap-icmpv6stat.c       |  2 +-
 ui/cli/tap-iousers.c          |  2 +-
 ui/cli/tap-protocolinfo.c     |  2 +-
 ui/cli/tap-protohierstat.c    |  2 +-
 ui/cli/tap-rpcprogs.c         |  2 +-
 ui/cli/tap-rtd.c              |  2 +-
 ui/cli/tap-rtspstat.c         |  2 +-
 ui/cli/tap-sctpchunkstat.c    |  2 +-
 ui/cli/tap-simple_stattable.c |  2 +-
 ui/cli/tap-sipstat.c          |  2 +-
 ui/cli/tap-smbsids.c          |  2 +-
 ui/cli/tap-srt.c              |  2 +-
 ui/cli/tap-sv.c               |  2 +-
 ui/cli/tap-wspstat.c          |  2 +-
 ui/clopts_common.c            |  2 +-
 ui/commandline.c              |  2 +-
 ui/decode_as_utils.c          |  2 +-
 ui/dissect_opts.c             |  2 +-
 ui/failure_message.c          |  2 +-
 ui/logray/logray_main.cpp     |  2 +-
 ui/qt/main.cpp                |  2 +-
 wsutil/CMakeLists.txt         |  2 ++
 {ui => wsutil}/cmdarg_err.c   |  0
 {ui => wsutil}/cmdarg_err.h   | 17 ++++++++---------
 51 files changed, 57 insertions(+), 57 deletions(-)
 rename {ui => wsutil}/cmdarg_err.c (100%)
 rename {ui => wsutil}/cmdarg_err.h (82%)

diff --git a/capinfos.c b/capinfos.c
index bb9f2688ec..f0059f4e54 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -58,7 +58,7 @@
 
 #include <wiretap/wtap.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <cli_main.h>
diff --git a/capture_opts.c b/capture_opts.c
index e6f2d4d12e..88c2bfc162 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -31,7 +31,7 @@
 #include "ringbuffer.h"
 
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/file_util.h>
 #include <wsutil/ws_pipe.h>
 #include <wsutil/ws_assert.h>
diff --git a/captype.c b/captype.c
index 6be70c3d6f..20ed504ed6 100644
--- a/captype.c
+++ b/captype.c
@@ -27,7 +27,7 @@
 
 #include <wiretap/wtap.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
diff --git a/dftest.c b/dftest.c
index 9cd2749e1b..71e02b3f85 100644
--- a/dftest.c
+++ b/dftest.c
@@ -38,7 +38,7 @@
 #include <wiretap/wtap.h>
 
 #include "ui/util.h"
-#include "ui/cmdarg_err.h"
+#include "wsutil/cmdarg_err.h"
 #include "ui/failure_message.h"
 #include "wsutil/version_info.h"
 
diff --git a/dumpcap.c b/dumpcap.c
index 3777ddb7a6..626f2c88b8 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -31,7 +31,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/strtoi.h>
 #include <cli_main.h>
 #include <wsutil/version_info.h>
diff --git a/editcap.c b/editcap.c
index e3b8d88788..d5f880497d 100644
--- a/editcap.c
+++ b/editcap.c
@@ -48,7 +48,7 @@
 #endif
 
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/plugins.h>
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 901dc4f1bb..ebec32dcee 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -25,7 +25,7 @@
 #include <wsutil/report_message.h>
 #include <wsutil/please_report_bug.h>
 #include <wsutil/wslog.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/inet_addr.h>
 #include <wsutil/exported_pdu_tlvs.h>
 
diff --git a/extcap/etwdump.c b/extcap/etwdump.c
index fa79891645..615b609b37 100644
--- a/extcap/etwdump.c
+++ b/extcap/etwdump.c
@@ -22,7 +22,7 @@
 #include <wsutil/wslog.h>
 
 #include <cli_main.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include "etl.h"
 
 #include <signal.h>
diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index 55aace8f11..8c6bad007e 100644
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -24,7 +24,7 @@
 #include <wsutil/wslog.h>
 
 #include <cli_main.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 #define RANDPKT_EXTCAP_INTERFACE "randpkt"
 #define RANDPKTDUMP_VERSION_MAJOR "0"
diff --git a/fuzz/fuzzshark.c b/fuzz/fuzzshark.c
index 7742c10a74..22830c01b3 100644
--- a/fuzz/fuzzshark.c
+++ b/fuzz/fuzzshark.c
@@ -21,7 +21,7 @@
 
 #include <epan/epan.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/failure_message.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
diff --git a/mergecap.c b/mergecap.c
index b022c2ec93..5828461eb9 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -26,7 +26,7 @@
 #include <wiretap/wtap.h>
 
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
diff --git a/randpkt.c b/randpkt.c
index 6dea2b8231..627a313ed5 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -20,7 +20,7 @@
 #include <ws_exit_codes.h>
 #include <ui/clopts_common.h>
 #include <ui/failure_message.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
diff --git a/rawshark.c b/rawshark.c
index 242965046a..2ccb16b297 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -42,7 +42,7 @@
 #include <glib.h>
 #include <epan/epan.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/socket.h>
diff --git a/reordercap.c b/reordercap.c
index b7201c27ba..3fdad59414 100644
--- a/reordercap.c
+++ b/reordercap.c
@@ -21,7 +21,7 @@
 
 #include <wiretap/wtap.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
diff --git a/sharkd.c b/sharkd.c
index 4d9d3784a5..f0905cbef4 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -25,7 +25,7 @@
 #include <epan/epan.h>
 
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
diff --git a/text2pcap.c b/text2pcap.c
index 0920c8cae8..7b1c8b34fe 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -72,7 +72,7 @@
 #include <string.h>
 #include <wsutil/file_util.h>
 #include <cli_main.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/text_import.h>
 #include <wsutil/version_info.h>
 #include <ui/failure_message.h>
diff --git a/tfshark.c b/tfshark.c
index 9224274665..8c355a81d5 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -30,7 +30,7 @@
 #include <epan/epan.h>
 
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/urls.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
diff --git a/tshark.c b/tshark.c
index 98dc641e7c..9c992e3b1b 100644
--- a/tshark.c
+++ b/tshark.c
@@ -39,7 +39,7 @@
 
 #include <ws_exit_codes.h>
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/urls.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index d741aad7c7..59fdd64054 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -12,7 +12,6 @@ set(NONGENERATED_UI_SRC
 	capture.c
 	capture_ui_utils.c
 	clopts_common.c
-	cmdarg_err.c
 	commandline.c
 	decode_as_utils.c
 	dissect_opts.c
diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index b1c50f6aec..935731ac34 100644
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -24,7 +24,7 @@
 #include "epan/timestats.h"
 #include "epan/stat_tap_ui.h"
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_camelsrt(void);
 
diff --git a/ui/cli/tap-credentials.c b/ui/cli/tap-credentials.c
index b369194d06..9a54a7eb28 100644
--- a/ui/cli/tap-credentials.c
+++ b/ui/cli/tap-credentials.c
@@ -21,7 +21,7 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/tap-credentials.h>
 
 void register_tap_listener_credentials(void);
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index b8adea521e..9cdf0f81f5 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -31,7 +31,7 @@
 #include <glib.h>
 
 #include <wsutil/strtoi.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 #include <epan/packet_info.h>
 #include <epan/tap.h>
diff --git a/ui/cli/tap-endpoints.c b/ui/cli/tap-endpoints.c
index 557811b677..e97dcf85f2 100644
--- a/ui/cli/tap-endpoints.c
+++ b/ui/cli/tap-endpoints.c
@@ -18,7 +18,7 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/conversation_table.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _endpoints_t {
diff --git a/ui/cli/tap-exportobject.c b/ui/cli/tap-exportobject.c
index d97f99e966..0a37366447 100644
--- a/ui/cli/tap-exportobject.c
+++ b/ui/cli/tap-exportobject.c
@@ -19,7 +19,7 @@
 
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 #include <epan/packet_info.h>
 #include <epan/packet.h>
diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c
index fcf134363a..c854e9e911 100644
--- a/ui/cli/tap-hosts.c
+++ b/ui/cli/tap-hosts.c
@@ -21,7 +21,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/addr_resolv.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_hosts(void);
 
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index 9fa72b3ee5..335577b4f9 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -24,7 +24,7 @@
 
 #include <wsutil/wslog.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_httpstat(void);
 
diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index 0eb2ce39ee..ac0f642329 100644
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -28,7 +28,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-icmp.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_icmpstat(void);
 
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index a4b257d9ae..94f8692acb 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -29,7 +29,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-icmp.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_icmpv6stat(void);
 
diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c
index 33b5eb392e..742f984c96 100644
--- a/ui/cli/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
@@ -17,7 +17,7 @@
 #include <epan/packet.h>
 #include <epan/timestamp.h>
 #include <wsutil/str_util.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _io_users_t {
diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index c4f726ee2d..ea47ae52d2 100644
--- a/ui/cli/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
@@ -21,7 +21,7 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_protocolinfo(void);
 
diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
index 2e04446ec2..bb045bd44c 100644
--- a/ui/cli/tap-protohierstat.c
+++ b/ui/cli/tap-protohierstat.c
@@ -20,7 +20,7 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_protohierstat(void);
 
diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index 90ed04d370..e64c93bc05 100644
--- a/ui/cli/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
@@ -25,7 +25,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rpc.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 #define MICROSECS_PER_SEC   1000000
 #define NANOSECS_PER_SEC    1000000000
diff --git a/ui/cli/tap-rtd.c b/ui/cli/tap-rtd.c
index d8d23c22a2..f81d1357b8 100644
--- a/ui/cli/tap-rtd.c
+++ b/ui/cli/tap-rtd.c
@@ -19,7 +19,7 @@
 #include <epan/rtd_table.h>
 #include <epan/timestamp.h>
 #include <epan/stat_tap_ui.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _rtd_t {
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index 312c5db838..a42be6067e 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -27,7 +27,7 @@
 
 #include <wsutil/wslog.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_rtspstat(void);
 
diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index 071f87ef05..21e081eb65 100644
--- a/ui/cli/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
@@ -24,7 +24,7 @@
 #include <epan/dissectors/packet-sctp.h>
 #include <epan/to_str.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_sctpstat(void);
 
diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c
index 74fe904a98..54235c5954 100644
--- a/ui/cli/tap-simple_stattable.c
+++ b/ui/cli/tap-simple_stattable.c
@@ -16,7 +16,7 @@
 #include <epan/packet.h>
 #include <epan/timestamp.h>
 #include <epan/stat_tap_ui.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _table_stat_t {
diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index c8ca9e832f..92d1463d2d 100644
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
@@ -26,7 +26,7 @@
 
 #include <wsutil/wslog.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_sipstat(void);
 
diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c
index fa1ee545fa..f92037c99f 100644
--- a/ui/cli/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
@@ -23,7 +23,7 @@
 #include <epan/value_string.h>
 #include <epan/dissectors/packet-smb.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_smbsids(void);
 
diff --git a/ui/cli/tap-srt.c b/ui/cli/tap-srt.c
index d79d88f78d..167e2dba65 100644
--- a/ui/cli/tap-srt.c
+++ b/ui/cli/tap-srt.c
@@ -17,7 +17,7 @@
 #include <epan/srt_table.h>
 #include <epan/timestamp.h>
 #include <epan/stat_tap_ui.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 #define NANOSECS_PER_SEC 1000000000
diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c
index c014403619..d724c0d4eb 100644
--- a/ui/cli/tap-sv.c
+++ b/ui/cli/tap-sv.c
@@ -22,7 +22,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-sv.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_sv(void);
 
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 0594132ccc..89daed3171 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -27,7 +27,7 @@
 #include <epan/value_string.h>
 #include <epan/dissectors/packet-wsp.h>
 
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 void register_tap_listener_wspstat(void);
 
diff --git a/ui/clopts_common.c b/ui/clopts_common.c
index bf84e07653..8145bfb8b5 100644
--- a/ui/clopts_common.c
+++ b/ui/clopts_common.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 
 #include <wsutil/strtoi.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 #include "clopts_common.h"
 
diff --git a/ui/commandline.c b/ui/commandline.c
index 1a1aca9575..fe0da010fd 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -22,7 +22,7 @@
 #include <wsutil/version_info.h>
 
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/ws_assert.h>
 #ifdef _WIN32
diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index af2295f604..bb2013dad4 100644
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -24,7 +24,7 @@
 #include "wsutil/file_util.h"
 #include "wsutil/filesystem.h"
 #include <wsutil/ws_assert.h>
-#include "ui/cmdarg_err.h"
+#include "wsutil/cmdarg_err.h"
 
 /* XXX - We might want to switch this to a UAT */
 
diff --git a/ui/dissect_opts.c b/ui/dissect_opts.c
index b40e569c16..f03ae281fa 100644
--- a/ui/dissect_opts.c
+++ b/ui/dissect_opts.c
@@ -31,7 +31,7 @@
 #endif
 
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <wsutil/file_util.h>
 #include <wsutil/ws_assert.h>
 
diff --git a/ui/failure_message.c b/ui/failure_message.c
index ebfddbd06c..84a19e1cb5 100644
--- a/ui/failure_message.c
+++ b/ui/failure_message.c
@@ -17,7 +17,7 @@
 #include <wiretap/wtap.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/report_message.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 
 #include "ui/failure_message.h"
 
diff --git a/ui/logray/logray_main.cpp b/ui/logray/logray_main.cpp
index c18354a8ed..edccee9aab 100644
--- a/ui/logray/logray_main.cpp
+++ b/ui/logray/logray_main.cpp
@@ -24,7 +24,7 @@
 
 #include <ws_exit_codes.h>
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/urls.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 1e9ee62ebf..0a0165ba48 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -24,7 +24,7 @@
 
 #include <ws_exit_codes.h>
 #include <ui/clopts_common.h>
-#include <ui/cmdarg_err.h>
+#include <wsutil/cmdarg_err.h>
 #include <ui/urls.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 0935fcaba7..b72bbb54df 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -32,6 +32,7 @@ set(WSUTIL_PUBLIC_HEADERS
 	bits_ctz.h
 	bitswap.h
 	buffer.h
+	cmdarg_err.h
 	codecs.h
 	color.h
 	cpu_info.h
@@ -103,6 +104,7 @@ set(WSUTIL_COMMON_FILES
 	base32.c
 	bitswap.c
 	buffer.c
+	cmdarg_err.c
 	codecs.c
 	crash_info.c
 	crc10.c
diff --git a/ui/cmdarg_err.c b/wsutil/cmdarg_err.c
similarity index 100%
rename from ui/cmdarg_err.c
rename to wsutil/cmdarg_err.c
diff --git a/ui/cmdarg_err.h b/wsutil/cmdarg_err.h
similarity index 82%
rename from ui/cmdarg_err.h
rename to wsutil/cmdarg_err.h
index ed5d83d674..daa50524e7 100644
--- a/ui/cmdarg_err.h
+++ b/wsutil/cmdarg_err.h
@@ -9,13 +9,12 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef __UI_CMDARG_ERR_H__
-#define __UI_CMDARG_ERR_H__
+#ifndef __CMDARG_ERR_H__
+#define __CMDARG_ERR_H__
 
+#include <wireshark.h>
 #include <stdarg.h>
 
-#include <glib.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -23,25 +22,25 @@ extern "C" {
 /*
  * Set the reporting functions for error messages.
  */
-extern void
+WS_DLL_PUBLIC void
 cmdarg_err_init(void (*err)(const char *, va_list),
                 void (*err_cont)(const char *, va_list));
 
 /*
  * Report an error in command-line arguments.
  */
-extern void
+WS_DLL_PUBLIC void
 vcmdarg_err(const char *fmt, va_list ap)
     G_GNUC_PRINTF(1, 0);
 
-extern void
+WS_DLL_PUBLIC void
 cmdarg_err(const char *fmt, ...)
     G_GNUC_PRINTF(1, 2);
 
 /*
  * Report additional information for an error in command-line arguments.
  */
-extern void
+WS_DLL_PUBLIC void
 cmdarg_err_cont(const char *fmt, ...)
     G_GNUC_PRINTF(1, 2);
 
@@ -49,4 +48,4 @@ cmdarg_err_cont(const char *fmt, ...)
 }
 #endif /* __cplusplus */
 
-#endif /* __UI_CMDARG_ERR_H__ */
+#endif /* __CMDARG_ERR_H__ */