forked from osmocom/wireshark
Move ui/clopts_common.[ch] to wsutil
This commit is contained in:
parent
0cea64a632
commit
cf8107eb2a
|
@ -30,7 +30,7 @@
|
||||||
#include "capture_opts.h"
|
#include "capture_opts.h"
|
||||||
#include "ringbuffer.h"
|
#include "ringbuffer.h"
|
||||||
|
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <wsutil/file_util.h>
|
#include <wsutil/file_util.h>
|
||||||
#include <wsutil/ws_pipe.h>
|
#include <wsutil/ws_pipe.h>
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/privileges.h>
|
#include <wsutil/privileges.h>
|
||||||
|
|
||||||
#include "sync_pipe.h"
|
#include "sync_pipe.h"
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <wsutil/filesystem.h>
|
#include <wsutil/filesystem.h>
|
||||||
#include <wsutil/file_util.h>
|
#include <wsutil/file_util.h>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#include <wiretap/wtap.h>
|
#include <wiretap/wtap.h>
|
||||||
|
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <wsutil/filesystem.h>
|
#include <wsutil/filesystem.h>
|
||||||
#include <wsutil/file_util.h>
|
#include <wsutil/file_util.h>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <ws_exit_codes.h>
|
#include <ws_exit_codes.h>
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <ui/failure_message.h>
|
#include <ui/failure_message.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <wsutil/file_util.h>
|
#include <wsutil/file_util.h>
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
#include <wsutil/report_message.h>
|
#include <wsutil/report_message.h>
|
||||||
#include <wsutil/please_report_bug.h>
|
#include <wsutil/please_report_bug.h>
|
||||||
#include <wsutil/wslog.h>
|
#include <wsutil/wslog.h>
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <wsutil/unicode-utils.h>
|
#include <wsutil/unicode-utils.h>
|
||||||
|
|
2
sharkd.c
2
sharkd.c
|
@ -24,7 +24,7 @@
|
||||||
#include <epan/exceptions.h>
|
#include <epan/exceptions.h>
|
||||||
#include <epan/epan.h>
|
#include <epan/epan.h>
|
||||||
|
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <wsutil/filesystem.h>
|
#include <wsutil/filesystem.h>
|
||||||
#include <wsutil/file_util.h>
|
#include <wsutil/file_util.h>
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include <epan/exceptions.h>
|
#include <epan/exceptions.h>
|
||||||
#include <epan/epan.h>
|
#include <epan/epan.h>
|
||||||
|
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <ui/urls.h>
|
#include <ui/urls.h>
|
||||||
#include <wsutil/filesystem.h>
|
#include <wsutil/filesystem.h>
|
||||||
|
|
2
tshark.c
2
tshark.c
|
@ -38,7 +38,7 @@
|
||||||
#include <epan/epan.h>
|
#include <epan/epan.h>
|
||||||
|
|
||||||
#include <ws_exit_codes.h>
|
#include <ws_exit_codes.h>
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <ui/urls.h>
|
#include <ui/urls.h>
|
||||||
#include <wsutil/filesystem.h>
|
#include <wsutil/filesystem.h>
|
||||||
|
|
|
@ -11,7 +11,6 @@ set(NONGENERATED_UI_SRC
|
||||||
alert_box.c
|
alert_box.c
|
||||||
capture.c
|
capture.c
|
||||||
capture_ui_utils.c
|
capture_ui_utils.c
|
||||||
clopts_common.c
|
|
||||||
commandline.c
|
commandline.c
|
||||||
decode_as_utils.c
|
decode_as_utils.c
|
||||||
dissect_opts.c
|
dissect_opts.c
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <wsutil/version_info.h>
|
#include <wsutil/version_info.h>
|
||||||
|
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <wsutil/filesystem.h>
|
#include <wsutil/filesystem.h>
|
||||||
#include <wsutil/ws_assert.h>
|
#include <wsutil/ws_assert.h>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <epan/dissectors/read_keytab_file.h>
|
#include <epan/dissectors/read_keytab_file.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <wsutil/file_util.h>
|
#include <wsutil/file_util.h>
|
||||||
#include <wsutil/ws_assert.h>
|
#include <wsutil/ws_assert.h>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <ws_exit_codes.h>
|
#include <ws_exit_codes.h>
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <ui/urls.h>
|
#include <ui/urls.h>
|
||||||
#include <wsutil/filesystem.h>
|
#include <wsutil/filesystem.h>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <ws_exit_codes.h>
|
#include <ws_exit_codes.h>
|
||||||
#include <ui/clopts_common.h>
|
#include <wsutil/clopts_common.h>
|
||||||
#include <wsutil/cmdarg_err.h>
|
#include <wsutil/cmdarg_err.h>
|
||||||
#include <ui/urls.h>
|
#include <ui/urls.h>
|
||||||
#include <wsutil/filesystem.h>
|
#include <wsutil/filesystem.h>
|
||||||
|
|
|
@ -32,6 +32,7 @@ set(WSUTIL_PUBLIC_HEADERS
|
||||||
bits_ctz.h
|
bits_ctz.h
|
||||||
bitswap.h
|
bitswap.h
|
||||||
buffer.h
|
buffer.h
|
||||||
|
clopts_common.h
|
||||||
cmdarg_err.h
|
cmdarg_err.h
|
||||||
codecs.h
|
codecs.h
|
||||||
color.h
|
color.h
|
||||||
|
@ -104,6 +105,7 @@ set(WSUTIL_COMMON_FILES
|
||||||
base32.c
|
base32.c
|
||||||
bitswap.c
|
bitswap.c
|
||||||
buffer.c
|
buffer.c
|
||||||
|
clopts_common.c
|
||||||
cmdarg_err.c
|
cmdarg_err.c
|
||||||
codecs.c
|
codecs.c
|
||||||
crash_info.c
|
crash_info.c
|
||||||
|
|
|
@ -9,8 +9,10 @@
|
||||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __UI_CLOPTS_COMMON_H__
|
#ifndef __CLOPTS_COMMON_H__
|
||||||
#define __UI_CLOPTS_COMMON_H__
|
#define __CLOPTS_COMMON_H__
|
||||||
|
|
||||||
|
#include <wireshark.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -32,23 +34,23 @@ extern "C" {
|
||||||
// Base value for GUI specific long options
|
// Base value for GUI specific long options
|
||||||
#define LONGOPT_BASE_GUI 4000
|
#define LONGOPT_BASE_GUI 4000
|
||||||
|
|
||||||
extern int
|
WS_DLL_PUBLIC int
|
||||||
get_natural_int(const char *string, const char *name);
|
get_natural_int(const char *string, const char *name);
|
||||||
|
|
||||||
extern int
|
WS_DLL_PUBLIC int
|
||||||
get_positive_int(const char *string, const char *name);
|
get_positive_int(const char *string, const char *name);
|
||||||
|
|
||||||
extern guint32
|
WS_DLL_PUBLIC guint32
|
||||||
get_guint32(const char *string, const char *name);
|
get_guint32(const char *string, const char *name);
|
||||||
|
|
||||||
extern guint32
|
WS_DLL_PUBLIC guint32
|
||||||
get_nonzero_guint32(const char *string, const char *name);
|
get_nonzero_guint32(const char *string, const char *name);
|
||||||
|
|
||||||
extern double
|
WS_DLL_PUBLIC double
|
||||||
get_positive_double(const char *string, const char *name);
|
get_positive_double(const char *string, const char *name);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#endif /* __UI_CLOPTS_COMMON_H__ */
|
#endif /* __CLOPTS_COMMON_H__ */
|
Loading…
Reference in New Issue