Move ui/cmdarg_err.[ch] to wsutil

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>

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>

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>

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"
 

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>

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>

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>
 

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>

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"

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>

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>

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>

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>

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>

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>

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>

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>

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>

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

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);
 

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);

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>

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 {

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>

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);
 

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);
 

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);
 

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);
 

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 {

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);
 

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);
 

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

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 {

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);
 

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);
 

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 {

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);
 

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);
 

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

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);
 

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);
 

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"
 

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

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 */
 

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>
 

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"
 

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>

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>

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

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__ */