aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capture_opts.c2
-rw-r--r--dumpcap.c2
-rw-r--r--editcap.c2
-rw-r--r--mergecap.c2
-rw-r--r--randpkt.c2
-rw-r--r--rawshark.c2
-rw-r--r--sharkd.c2
-rw-r--r--tfshark.c2
-rw-r--r--tshark.c2
-rw-r--r--ui/CMakeLists.txt1
-rw-r--r--ui/commandline.c2
-rw-r--r--ui/dissect_opts.c2
-rw-r--r--ui/logray/logray_main.cpp2
-rw-r--r--ui/qt/main.cpp2
-rw-r--r--wsutil/CMakeLists.txt2
-rw-r--r--wsutil/clopts_common.c (renamed from ui/clopts_common.c)0
-rw-r--r--wsutil/clopts_common.h (renamed from ui/clopts_common.h)18
17 files changed, 25 insertions, 22 deletions
diff --git a/capture_opts.c b/capture_opts.c
index 88c2bfc162..84b880caf5 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -30,7 +30,7 @@
#include "capture_opts.h"
#include "ringbuffer.h"
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/file_util.h>
#include <wsutil/ws_pipe.h>
diff --git a/dumpcap.c b/dumpcap.c
index 626f2c88b8..ce3303bbb8 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -60,7 +60,7 @@
#include <sys/un.h>
#endif
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/privileges.h>
#include "sync_pipe.h"
diff --git a/editcap.c b/editcap.c
index d5f880497d..39ef2e766e 100644
--- a/editcap.c
+++ b/editcap.c
@@ -47,7 +47,7 @@
#include <winsock2.h>
#endif
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/filesystem.h>
#include <wsutil/file_util.h>
diff --git a/mergecap.c b/mergecap.c
index 5828461eb9..beacd3e8a0 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -25,7 +25,7 @@
#include <wiretap/wtap.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/filesystem.h>
#include <wsutil/file_util.h>
diff --git a/randpkt.c b/randpkt.c
index 627a313ed5..c0692ee8b7 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <ws_exit_codes.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <ui/failure_message.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/file_util.h>
diff --git a/rawshark.c b/rawshark.c
index 2ccb16b297..ca89404501 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -51,7 +51,7 @@
#include <wsutil/report_message.h>
#include <wsutil/please_report_bug.h>
#include <wsutil/wslog.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#ifdef _WIN32
#include <wsutil/unicode-utils.h>
diff --git a/sharkd.c b/sharkd.c
index f0905cbef4..bd58c0ab69 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -24,7 +24,7 @@
#include <epan/exceptions.h>
#include <epan/epan.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/filesystem.h>
#include <wsutil/file_util.h>
diff --git a/tfshark.c b/tfshark.c
index 8c355a81d5..130ced6770 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -29,7 +29,7 @@
#include <epan/exceptions.h>
#include <epan/epan.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <ui/urls.h>
#include <wsutil/filesystem.h>
diff --git a/tshark.c b/tshark.c
index 9c992e3b1b..6b2c2230db 100644
--- a/tshark.c
+++ b/tshark.c
@@ -38,7 +38,7 @@
#include <epan/epan.h>
#include <ws_exit_codes.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <ui/urls.h>
#include <wsutil/filesystem.h>
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 59fdd64054..92de384004 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -11,7 +11,6 @@ set(NONGENERATED_UI_SRC
alert_box.c
capture.c
capture_ui_utils.c
- clopts_common.c
commandline.c
decode_as_utils.c
dissect_opts.c
diff --git a/ui/commandline.c b/ui/commandline.c
index fe0da010fd..73cbc27de8 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -21,7 +21,7 @@
#include <wsutil/version_info.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/filesystem.h>
#include <wsutil/ws_assert.h>
diff --git a/ui/dissect_opts.c b/ui/dissect_opts.c
index f03ae281fa..23564a5983 100644
--- a/ui/dissect_opts.c
+++ b/ui/dissect_opts.c
@@ -30,7 +30,7 @@
#include <epan/dissectors/read_keytab_file.h>
#endif
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/file_util.h>
#include <wsutil/ws_assert.h>
diff --git a/ui/logray/logray_main.cpp b/ui/logray/logray_main.cpp
index edccee9aab..4a30a8e431 100644
--- a/ui/logray/logray_main.cpp
+++ b/ui/logray/logray_main.cpp
@@ -23,7 +23,7 @@
#endif
#include <ws_exit_codes.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <ui/urls.h>
#include <wsutil/filesystem.h>
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 0a0165ba48..b52635fb08 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -23,7 +23,7 @@
#endif
#include <ws_exit_codes.h>
-#include <ui/clopts_common.h>
+#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <ui/urls.h>
#include <wsutil/filesystem.h>
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index b72bbb54df..4f511b6bb2 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -32,6 +32,7 @@ set(WSUTIL_PUBLIC_HEADERS
bits_ctz.h
bitswap.h
buffer.h
+ clopts_common.h
cmdarg_err.h
codecs.h
color.h
@@ -104,6 +105,7 @@ set(WSUTIL_COMMON_FILES
base32.c
bitswap.c
buffer.c
+ clopts_common.c
cmdarg_err.c
codecs.c
crash_info.c
diff --git a/ui/clopts_common.c b/wsutil/clopts_common.c
index 8145bfb8b5..8145bfb8b5 100644
--- a/ui/clopts_common.c
+++ b/wsutil/clopts_common.c
diff --git a/ui/clopts_common.h b/wsutil/clopts_common.h
index 04ff5ed56c..e622f2eb45 100644
--- a/ui/clopts_common.h
+++ b/wsutil/clopts_common.h
@@ -9,8 +9,10 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef __UI_CLOPTS_COMMON_H__
-#define __UI_CLOPTS_COMMON_H__
+#ifndef __CLOPTS_COMMON_H__
+#define __CLOPTS_COMMON_H__
+
+#include <wireshark.h>
#ifdef __cplusplus
extern "C" {
@@ -32,23 +34,23 @@ extern "C" {
// Base value for GUI specific long options
#define LONGOPT_BASE_GUI 4000
-extern int
+WS_DLL_PUBLIC int
get_natural_int(const char *string, const char *name);
-extern int
+WS_DLL_PUBLIC int
get_positive_int(const char *string, const char *name);
-extern guint32
+WS_DLL_PUBLIC guint32
get_guint32(const char *string, const char *name);
-extern guint32
+WS_DLL_PUBLIC guint32
get_nonzero_guint32(const char *string, const char *name);
-extern double
+WS_DLL_PUBLIC double
get_positive_double(const char *string, const char *name);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* __UI_CLOPTS_COMMON_H__ */
+#endif /* __CLOPTS_COMMON_H__ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 06:15:12 +0000