Move ui/cmdarg_err.[ch] to wsutil

32 files changed, 29 insertions, 141 deletions

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/cmdarg_err.c b/ui/cmdarg_err.c
deleted file mode 100644
index 85a4d8d45c..0000000000
--- a/ui/cmdarg_err.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* cmdarg_err.c
- * Routines to report command-line argument errors.
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#include "config.h"
-
-#include "cmdarg_err.h"
-
-static void (*print_err)(const char *, va_list ap);
-static void (*print_err_cont)(const char *, va_list ap);
-
-/*
- * Set the reporting functions for error messages.
- */
-void
-cmdarg_err_init(void (*err)(const char *, va_list),
-                void (*err_cont)(const char *, va_list))
-{
-    print_err = err;
-    print_err_cont = err_cont;
-}
-
-/*
- * Report an error in command-line arguments.
- */
-void
-vcmdarg_err(const char *fmt, va_list ap)
-{
-    print_err(fmt, ap);
-}
-
-void
-cmdarg_err(const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    print_err(fmt, ap);
-    va_end(ap);
-}
-
-/*
- * Report additional information for an error in command-line arguments.
- */
-void
-cmdarg_err_cont(const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    print_err_cont(fmt, ap);
-    va_end(ap);
-}
diff --git a/ui/cmdarg_err.h b/ui/cmdarg_err.h
deleted file mode 100644
index ed5d83d674..0000000000
--- a/ui/cmdarg_err.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/** @file
- *
- * Declarations of routines to report command-line argument errors.
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#ifndef __UI_CMDARG_ERR_H__
-#define __UI_CMDARG_ERR_H__
-
-#include <stdarg.h>
-
-#include <glib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * Set the reporting functions for error messages.
- */
-extern 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
-vcmdarg_err(const char *fmt, va_list ap)
-    G_GNUC_PRINTF(1, 0);
-
-extern void
-cmdarg_err(const char *fmt, ...)
-    G_GNUC_PRINTF(1, 2);
-
-/*
- * Report additional information for an error in command-line arguments.
- */
-extern void
-cmdarg_err_cont(const char *fmt, ...)
-    G_GNUC_PRINTF(1, 2);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __UI_CMDARG_ERR_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>